From dd53920754fbc7a89922f985770240d52a4b4488 Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Mon, 23 Sep 2019 12:28:59 +0300 Subject: [android] Change getPackageName to application context. --- .../main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java | 2 +- .../java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 b557fd5f6c..5384a29fca 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 @@ -164,7 +164,7 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt cameraPosition.zoom, cameraPosition.bearing, (int) cameraPosition.tilt)); } - String packageName = context.getPackageName(); + String packageName = context.getApplicationContext().getPackageName(); if (packageName != null) { builder.appendQueryParameter("referrer", packageName); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java index 42dfecf492..9b4eeb27aa 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/AttributionDialogManagerTest.java @@ -61,6 +61,7 @@ public class AttributionDialogManagerTest { @Test public void testBuildMapFeedbackMapUrl() { + when(context.getApplicationContext()).thenReturn(context); when(context.getPackageName()).thenReturn(ASSERT_MAPBOX_PACKAGE_NAME); when(style.getUri()).thenReturn(ASSERT_MAPBOX_STYLE_URI); when(mapboxMap.getCameraPosition()).thenReturn(cameraPosition); @@ -72,6 +73,7 @@ public class AttributionDialogManagerTest { @Test public void testBuildMapFeedbackMapUrlWithLocalStyleJson() { + when(context.getApplicationContext()).thenReturn(context); when(context.getPackageName()).thenReturn(ASSERT_MAPBOX_PACKAGE_NAME); when(style.getUri()).thenReturn(ASSERT_MAPBOX_LOCAL_STYLE_URI); when(mapboxMap.getCameraPosition()).thenReturn(cameraPosition); @@ -83,6 +85,7 @@ public class AttributionDialogManagerTest { @Test public void testBuildMapFeedbackMapUrlWithNullCameraPosition() { + when(context.getApplicationContext()).thenReturn(context); when(context.getPackageName()).thenReturn(ASSERT_MAPBOX_PACKAGE_NAME); when(style.getUri()).thenReturn(ASSERT_MAPBOX_LOCAL_STYLE_URI); when(mapboxMap.getCameraPosition()).thenReturn(null); -- cgit v1.2.1