diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main')
3 files changed, 7 insertions, 10 deletions
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 025207cc2d..16020891b1 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 @@ -241,13 +241,17 @@ public class AttributionParser { * </p> */ public static class Options { - private WeakReference<Context> context; + private final WeakReference<Context> context; private boolean withImproveMap = true; private boolean withCopyrightSign = true; private boolean withTelemetryAttribution = false; private boolean withMapboxAttribution = true; private String[] attributionDataStringArray; + public Options(@NonNull Context context) { + this.context = new WeakReference<>(context); + } + @NonNull public Options withAttributionData(String... attributionData) { this.attributionDataStringArray = attributionData; @@ -279,12 +283,6 @@ public class AttributionParser { } @NonNull - public Options withContext(Context context) { - this.context = new WeakReference<>(context); - return this; - } - - @NonNull public AttributionParser build() { if (attributionDataStringArray == null) { throw new IllegalStateException("Using builder without providing attribution data"); 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 d4d51b24da..c27dbd7517 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 @@ -187,10 +187,9 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt } } - return new AttributionParser.Options() + return new AttributionParser.Options(context) .withCopyrightSign(true) .withImproveMap(true) - .withContext(context) .withTelemetryAttribution(true) .withAttributionData(attributions.toArray(new String[attributions.size()])) .build().getAttributions(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java index 411f44f284..bc25da025d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java @@ -447,7 +447,7 @@ public class MapSnapshotter { */ @NonNull private String createAttributionString(MapSnapshot mapSnapshot, boolean shortText) { - AttributionParser attributionParser = new AttributionParser.Options() + AttributionParser attributionParser = new AttributionParser.Options(context) .withAttributionData(mapSnapshot.getAttributions()) .withCopyrightSign(false) .withImproveMap(false) |