From d5659aa6647f1fc77159567bd22029a2dc9cd7a3 Mon Sep 17 00:00:00 2001 From: Antonio Zugaldia Date: Thu, 17 Jan 2019 17:00:56 -0800 Subject: [core,ios,android] Update feedback URL in code and tests (#13710) * [core,ios] rename all occurrence of www.mapbox.com/map-feedback to apps.mapbox.com/feedback * [ios,android] rename all occurrence of www.mapbox.com/feedback to apps.mapbox.com/feedback --- .../java/com/mapbox/mapboxsdk/attribution/Attribution.java | 1 + .../mapbox/mapboxsdk/maps/AttributionDialogManager.java | 2 +- .../mapbox/mapboxsdk/attribution/AttributionParseTest.java | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK/src') diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java index e7ee5b6130..035614a90c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java @@ -18,6 +18,7 @@ public class Attribution { // Using a List makes URL backwards compatible IMPROVE_MAP_URLS.add("https://www.mapbox.com/feedback/"); IMPROVE_MAP_URLS.add("https://www.mapbox.com/map-feedback/"); + IMPROVE_MAP_URLS.add("https://apps.mapbox.com/feedback/"); } private String title; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java index 15ddfe644e..4f523948da 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java @@ -37,7 +37,7 @@ import java.util.Set; */ public class AttributionDialogManager implements View.OnClickListener, DialogInterface.OnClickListener { - private static final String MAP_FEEDBACK_URL = "https://www.mapbox.com/feedback"; + private static final String MAP_FEEDBACK_URL = "https://apps.mapbox.com/feedback"; private static final String MAP_FEEDBACK_LOCATION_FORMAT = MAP_FEEDBACK_URL + "/#/%f/%f/%d"; @NonNull diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java index f20244aca9..cd58442e02 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java @@ -15,8 +15,8 @@ import static junit.framework.Assert.assertEquals; @Config(constants = BuildConfig.class) public class AttributionParseTest { - private static final String STREETS_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map\n"; - private static final String SATELLITE_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map © DigitalGlobe\n"; + private static final String STREETS_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map\n"; + private static final String SATELLITE_ATTRIBUTION = "© Mapbox © OpenStreetMap Improve this map © DigitalGlobe\n"; @Test public void testParseAttributionStringSatellite() throws Exception { @@ -39,7 +39,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://apps.mapbox.com/feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; case 3: @@ -72,7 +72,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://apps.mapbox.com/feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; } @@ -98,7 +98,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 1: - assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://apps.mapbox.com/feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; } @@ -126,7 +126,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "© OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://apps.mapbox.com/feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; case 3: @@ -188,7 +188,7 @@ public class AttributionParseTest { assertEquals("Title openstreetmap should match", "OpenStreetMap", attribution.getTitle()); break; case 2: - assertEquals("URL improve map should match", "https://www.mapbox.com/map-feedback/", attribution.getUrl()); + assertEquals("URL improve map should match", "https://apps.mapbox.com/feedback/", attribution.getUrl()); assertEquals("Title improve map should match", "Improve This Map", attribution.getTitle()); break; case 3: -- cgit v1.2.1