diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-15 14:12:01 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-01-15 14:43:25 +0100 |
| commit | a736fb6ecb45b010a93a3d8237f5a67c3ad72a79 (patch) | |
| tree | 6cf28ec06ffdad837d451e58f5ee754ff6e8f4ed | |
| parent | 72f807bc51441b78f6e8303d53f3a1a3cdcd0a7d (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-snapshot-attribution.tar.gz | |
[android] - makes improve map url backwards compatibleupstream/tvn-snapshot-attribution
2 files changed, 11 insertions, 3 deletions
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 561ce5bf1a..e7ee5b6130 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 @@ -2,15 +2,23 @@ package com.mapbox.mapboxsdk.attribution; import android.support.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class Attribution { private static final String OPENSTREETMAP = "OpenStreetMap"; private static final String OPENSTREETMAP_ABBR = "OSM"; static final String TELEMETRY = "Telemetry Settings"; - - static final String IMPROVE_MAP_URL = "https://www.mapbox.com/map-feedback/"; static final String MAPBOX_URL = "https://www.mapbox.com/about/maps/"; static final String TELEMETRY_URL = "https://www.mapbox.com/telemetry/"; + static final List<String> IMPROVE_MAP_URLS = new ArrayList<>(); + + static { + // 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/"); + } private String title; private String url; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java index 16020891b1..ff59dbdf92 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionParser.java @@ -157,7 +157,7 @@ public class AttributionParser { * @return if the url is valid for improve this map */ private boolean isValidForImproveThisMap(@NonNull String url) { - return withImproveMap || !url.equals(Attribution.IMPROVE_MAP_URL); + return withImproveMap || !(Attribution.IMPROVE_MAP_URLS.contains(url)); } /** |