diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 7491a4f3d..0137723f9 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -6,7 +6,7 @@ on: tags-ignore: - '**' paths-ignore: - - "parform/ios/**" + - "platform/ios/**" - ".github/**" - "README.md" branches: diff --git a/.gitignore b/.gitignore index 670cd2f89..eb124e516 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /platform/android/x86_64 /.idea /cmake-build-debug +/platform/android/.idea diff --git a/.gitmodules b/.gitmodules index 52ba48274..0f24d947d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,15 +46,9 @@ [submodule "platform/android/vendor/mapbox-gestures-android"] path = platform/android/vendor/mapbox-gestures-android url = https://github.com/mapbox/mapbox-gestures-android.git -[submodule "platform/ios/platform/ios/vendor/mapbox-events-ios"] - path = platform/ios/platform/ios/vendor/mapbox-events-ios - url = https://github.com/mapbox/mapbox-events-ios.git [submodule "platform/ios/platform/darwin/docs/theme"] path = platform/ios/platform/darwin/docs/theme url = https://github.com/mapbox/jazzy-theme.git -[submodule "platform/android/vendor/mapbox-events-android"] - path = platform/android/vendor/mapbox-events-android - url = https://github.com/mapbox/mapbox-events-android.git [submodule "maplibre-gl-js"] path = maplibre-gl-js url = https://github.com/maplibre/maplibre-gl-js.git diff --git a/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java b/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java index 795ca4973..f16ac0ca8 100644 --- a/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java +++ b/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java @@ -1,14 +1,15 @@ package android.app; +import android.util.Log; + import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import androidx.test.rule.ActivityTestRule; +import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.junit.Assert; import org.junit.runner.RunWith; -import android.util.Log; @LargeTest @RunWith(AndroidJUnit4.class) diff --git a/platform/android/LICENSE.md b/platform/android/LICENSE.md index af6e18d36..f0394e48e 100644 --- a/platform/android/LICENSE.md +++ b/platform/android/LICENSE.md @@ -190,12 +190,6 @@ License: [BSD](https://opensource.org/licenses/BSD-2-Clause) =========================================================================== -Mapbox GL uses portions of Mapbox Android Telemetry Library. -URL: [https://github.com/mapbox/mapbox-events-android](https://github.com/mapbox/mapbox-events-android) -License: [The MIT License](https://opensource.org/licenses/MIT) - -=========================================================================== - Mapbox GL uses portions of Mapbox Java SDK. URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 6b0c153bf..4cd2c6d72 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -6,20 +6,23 @@ apply plugin: 'com.mapbox.android.sdk.versions' dependencies { lintChecks project(":MapboxGLAndroidSDKLint") - api dependenciesList.mapboxAndroidTelemetry api dependenciesList.mapboxJavaGeoJSON api dependenciesList.mapboxAndroidGestures api dependenciesList.mapboxAndroidAccounts + implementation dependenciesList.mapboxJavaTurf implementation dependenciesList.supportAnnotations implementation dependenciesList.supportFragmentV4 implementation dependenciesList.okhttp3 + implementation dependenciesList.gmsLocation + testImplementation dependenciesList.junit testImplementation dependenciesList.mockito testImplementation dependenciesList.mockk testImplementation dependenciesList.robolectric testImplementation dependenciesList.kotlinLib testImplementation dependenciesList.commonsIO + testImplementation dependenciesList.assertjcore } android { diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index 39ee13d85..926abbcb6 100644 --- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro @@ -16,7 +16,7 @@ -dontnote com.mapbox.mapboxsdk.maps.MapboxMap -dontnote com.mapbox.mapboxsdk.maps.MapboxMapOptions -dontnote com.mapbox.mapboxsdk.log.LoggerDefinition --dontnote com.mapbox.android.core.location.LocationEnginePriority +-dontnote com.mapbox.mapboxsdk.location.engine.LocationEnginePriority # config for okhttp 3.11.0, https://github.com/square/okhttp/pull/3354 -dontwarn javax.annotation.** @@ -27,9 +27,6 @@ -keep class com.mapbox.geojson.** { *; } -dontwarn com.google.auto.value.** -# config for telemetry events --keep class com.mapbox.mapboxsdk.module.telemetry.** { *; } - # config for additional notes -dontnote org.robolectric.Robolectric -dontnote libcore.io.Memory diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java index 3bcb2a1e1..3de11c416 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/AccountsManager.java @@ -4,17 +4,16 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.text.format.DateUtils; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.mapbox.android.accounts.v1.MapboxAccounts; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.log.Logger; -import static com.mapbox.mapboxsdk.constants.MapboxConstants.KEY_PREFERENCE_SKU_TOKEN; - /** * REMOVAL OR MODIFICATION OF THE FOLLOWING CODE VIOLATES THE MAPBOX TERMS * OF SERVICE @@ -39,45 +38,19 @@ class AccountsManager { private SharedPreferences sharedPreferences; private String userId; - private String skuToken; private long timestamp; - private boolean isManaged; AccountsManager() { - isManaged = isSkuTokenManaged(); initialize(); } @VisibleForTesting - AccountsManager(SharedPreferences sharedPreferences, boolean isManaged) { + AccountsManager(SharedPreferences sharedPreferences) { this.sharedPreferences = sharedPreferences; - this.isManaged = isManaged; initialize(); } private void initialize() { - retrieveSkuTokenAndTimestamp(); - if (isManaged) { - validateRotation(); - } - } - - private boolean isSkuTokenManaged() { - boolean value = MapboxConstants.DEFAULT_MANAGE_SKU_TOKEN; - try { - // Try getting a custom value from the app Manifest - ApplicationInfo appInfo = retrieveApplicationInfo(); - if (appInfo.metaData != null) { - value = appInfo.metaData.getBoolean( - MapboxConstants.KEY_META_DATA_MANAGE_SKU_TOKEN, - MapboxConstants.DEFAULT_MANAGE_SKU_TOKEN - ); - } - } catch (Exception exception) { - Logger.e(TAG, "Failed to read the package metadata: ", exception); - } - - return value; } private ApplicationInfo retrieveApplicationInfo() throws PackageManager.NameNotFoundException { @@ -86,33 +59,6 @@ class AccountsManager { PackageManager.GET_META_DATA); } - private void retrieveSkuTokenAndTimestamp() { - SharedPreferences sharedPreferences = getSharedPreferences(); - skuToken = sharedPreferences.getString(KEY_PREFERENCE_SKU_TOKEN, ""); - timestamp = sharedPreferences.getLong(PREFERENCE_TIMESTAMP, 0L); - } - - private void validateRotation() { - if (TextUtils.isEmpty(skuToken) || timestamp == 0L) { - skuToken = generateSkuToken(getUserId()); - timestamp = persistRotation(skuToken); - } - } - - String getSkuToken() { - if (isManaged) { - if (isExpired()) { - skuToken = generateSkuToken(getUserId()); - timestamp = persistRotation(skuToken); - } - } else { - SharedPreferences sharedPreferences = getSharedPreferences(); - String notManagedSkuToken = sharedPreferences.getString(KEY_PREFERENCE_SKU_TOKEN, ""); - skuToken = notManagedSkuToken; - } - return skuToken; - } - private boolean isExpired() { return isExpired(getNow(), timestamp); } @@ -121,15 +67,6 @@ class AccountsManager { return ((now - then) > DateUtils.HOUR_IN_MILLIS); } - private long persistRotation(String skuToken) { - long now = getNow(); - SharedPreferences.Editor editor = getSharedPreferences().edit(); - editor.putLong(PREFERENCE_TIMESTAMP, now); - editor.putString(KEY_PREFERENCE_SKU_TOKEN, skuToken); - editor.apply(); - return now; - } - @NonNull private SharedPreferences getSharedPreferences() { if (sharedPreferences == null) { @@ -167,9 +104,4 @@ class AccountsManager { private String generateUserId() { return MapboxAccounts.obtainEndUserId(); } - - @NonNull - private String generateSkuToken(String userId) { - return MapboxAccounts.obtainMapsSkuUserToken(userId); - } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java index c8b6701bb..439829f39 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk; import android.annotation.SuppressLint; import android.content.Context; import android.content.res.AssetManager; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -10,8 +11,6 @@ import androidx.annotation.UiThread; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.exceptions.MapboxConfigurationException; -import com.mapbox.mapboxsdk.log.Logger; -import com.mapbox.mapboxsdk.maps.TelemetryDefinition; import com.mapbox.mapboxsdk.net.ConnectivityReceiver; import com.mapbox.mapboxsdk.storage.FileSource; import com.mapbox.mapboxsdk.utils.ThreadUtils; @@ -37,8 +36,6 @@ public final class Mapbox { @Nullable private String accessToken; @Nullable - private TelemetryDefinition telemetry; - @Nullable private AccountsManager accounts; /** @@ -61,7 +58,6 @@ public final class Mapbox { FileSource.initializeFileDirsPaths(appContext); INSTANCE = new Mapbox(appContext, accessToken); if (isAccessTokenValid(accessToken)) { - initializeTelemetry(); INSTANCE.accounts = new AccountsManager(); } ConnectivityReceiver.instance(appContext); @@ -92,15 +88,8 @@ public final class Mapbox { validateMapbox(); INSTANCE.accessToken = accessToken; - // cleanup telemetry which is dependent on an access token - if (INSTANCE.telemetry != null) { - INSTANCE.telemetry.disableTelemetrySession(); - INSTANCE.telemetry = null; - } - // initialize components dependent on a token if (isAccessTokenValid(accessToken)) { - initializeTelemetry(); INSTANCE.accounts = new AccountsManager(); } else { INSTANCE.accounts = null; @@ -108,23 +97,6 @@ public final class Mapbox { FileSource.getInstance(getApplicationContext()).setAccessToken(accessToken); } - /** - * Returns a SKU token, refreshed if necessary. This method is meant for internal SDK - * usage only. - * - * @return the SKU token - */ - public static String getSkuToken() { - if (!hasInstance() || INSTANCE.accounts == null) { - throw new MapboxConfigurationException( - "A valid access token parameter is required when using a Mapbox service." - + "\nPlease see https://www.mapbox.com/help/create-api-access-token/ to learn how to create one." - + "\nMore information in this guide https://www.mapbox.com/help/first-steps-android-sdk/#access-tokens." - + "Currently provided token is: " + INSTANCE.accessToken); - } - return INSTANCE.accounts.getSkuToken(); - } - /** * Application context * @@ -159,29 +131,6 @@ public final class Mapbox { return ConnectivityReceiver.instance(INSTANCE.context).isConnected(); } - /** - * Initializes telemetry - */ - private static void initializeTelemetry() { - try { - INSTANCE.telemetry = getModuleProvider().obtainTelemetry(); - } catch (Exception exception) { - String message = "Error occurred while initializing telemetry"; - Logger.e(TAG, message, exception); - MapStrictMode.strictModeViolation(message, exception); - } - } - - /** - * Get an instance of Telemetry if initialised - * - * @return instance of telemetry - */ - @Nullable - public static TelemetryDefinition getTelemetry() { - return hasInstance() ? INSTANCE.telemetry : null; - } - /** * Get the module provider * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java index 63e325404..3258bc4ab 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProvider.java @@ -1,9 +1,8 @@ package com.mapbox.mapboxsdk; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.http.HttpRequest; -import com.mapbox.mapboxsdk.maps.TelemetryDefinition; /** * Injects concrete instances of configurable abstractions @@ -18,15 +17,6 @@ public interface ModuleProvider { @NonNull HttpRequest createHttpRequest(); - /** - * Get the concrete implementation of TelemetryDefinition - * - * @return a single instance of Telemetry - */ - @Nullable - TelemetryDefinition obtainTelemetry(); - - /** * Get the concrete implementation of LibraryLoaderProvider * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java index 68497811a..dce686505 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/ModuleProviderImpl.java @@ -1,12 +1,10 @@ package com.mapbox.mapboxsdk; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.http.HttpRequest; -import com.mapbox.mapboxsdk.maps.TelemetryDefinition; import com.mapbox.mapboxsdk.module.http.HttpRequestImpl; import com.mapbox.mapboxsdk.module.loader.LibraryLoaderProviderImpl; -import com.mapbox.mapboxsdk.module.telemetry.TelemetryImpl; public class ModuleProviderImpl implements ModuleProvider { @@ -16,12 +14,6 @@ public class ModuleProviderImpl implements ModuleProvider { return new HttpRequestImpl(); } - @Override - @Nullable - public TelemetryDefinition obtainTelemetry() { - return new TelemetryImpl(); - } - @NonNull @Override public LibraryLoaderProvider createLibraryLoaderProvider() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java index c71b9dcf0..324c4ae49 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Annotation.java @@ -1,7 +1,6 @@ package com.mapbox.mapboxsdk.annotations; import androidx.annotation.NonNull; - import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.maps.MapView; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java index 6ba14ba4e..0c2c858bf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BasePointCollection.java @@ -1,8 +1,8 @@ package com.mapbox.mapboxsdk.annotations; import androidx.annotation.Keep; - import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java index e048e1b22..6f7612f3c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Bubble.java @@ -8,6 +8,7 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; + import androidx.annotation.NonNull; @Deprecated diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java index c10e0bbb4..2fecc1552 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java @@ -5,11 +5,12 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.RectF; -import androidx.annotation.NonNull; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.widget.LinearLayout; +import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.R; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java index f4297d432..f10901017 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java @@ -3,10 +3,11 @@ package com.mapbox.mapboxsdk.annotations; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.NonNull; import android.view.ViewGroup; import android.widget.PopupWindow; +import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.R; @Deprecated diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java index eb3d6f5a5..d63c52100 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Icon.java @@ -1,9 +1,10 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Bitmap; +import android.util.DisplayMetrics; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.util.DisplayMetrics; import java.nio.ByteBuffer; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java index 8f8b45696..0b9050e3a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java @@ -7,11 +7,12 @@ import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; import android.util.DisplayMetrics; import android.view.WindowManager; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.exceptions.TooManyIconsException; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java index b5df3678d..19e4ccbd5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java @@ -3,9 +3,6 @@ package com.mapbox.mapboxsdk.annotations; import android.content.res.Resources; import android.graphics.PointF; import android.os.Build; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -13,6 +10,10 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.TextView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index 5bd14a855..5d208afce 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -1,9 +1,10 @@ package com.mapbox.mapboxsdk.annotations; +import android.view.View; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.view.View; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.geometry.LatLng; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java index 494466471..b98806a04 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerOptions.java @@ -6,6 +6,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException; import com.mapbox.mapboxsdk.geometry.LatLng; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java index f35713622..d55081c0b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polygon.java @@ -1,9 +1,10 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; -import androidx.annotation.Keep; +import androidx.annotation.Keep; import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapboxMap; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java index 17ae49778..e89ef7576 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolygonOptions.java @@ -6,6 +6,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java index 36a4d2e9d..5203fc32b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Polyline.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.annotations; import android.graphics.Color; + import androidx.annotation.Keep; import com.mapbox.mapboxsdk.maps.MapboxMap; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java index ff05631c3..69a424d30 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/PolylineOptions.java @@ -5,6 +5,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; 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 159282b7f..eaa2953f4 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 @@ -9,9 +9,7 @@ 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 MAPBOX_URL = "https://www.mapbox.com/about/maps/"; - static final String TELEMETRY_URL = "https://www.mapbox.com/telemetry/"; static final List IMPROVE_MAP_URLS = new ArrayList<>(); static { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java index 242b67647..6c242288e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionLayout.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.attribution; import android.graphics.Bitmap; import android.graphics.PointF; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java index cfd1c1f91..cd6f14ad3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/AttributionMeasure.java @@ -2,9 +2,10 @@ package com.mapbox.mapboxsdk.attribution; import android.graphics.Bitmap; import android.graphics.PointF; +import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.widget.TextView; import java.util.Arrays; import java.util.List; 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 6d26c104a..48e3bdaba 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 @@ -1,12 +1,12 @@ package com.mapbox.mapboxsdk.attribution; import android.content.Context; -import androidx.annotation.NonNull; import android.text.Html; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.URLSpan; -import com.mapbox.mapboxsdk.R; + +import androidx.annotation.NonNull; import java.lang.ref.WeakReference; import java.util.LinkedHashSet; @@ -21,22 +21,19 @@ import java.util.Set; */ public class AttributionParser { - private static final String IMPROVE_THIS_MAP = "Improve this map"; private final WeakReference context; private final Set attributions = new LinkedHashSet<>(); private final String attributionData; private final boolean withImproveMap; private final boolean withCopyrightSign; - private final boolean withTelemetryAttribution; private final boolean withMapboxAttribution; AttributionParser(WeakReference context, String attributionData, boolean withImproveMap, - boolean withCopyrightSign, boolean withTelemetryAttribution, boolean withMapboxAttribution) { + boolean withCopyrightSign, boolean withMapboxAttribution) { this.context = context; this.attributionData = attributionData; this.withImproveMap = withImproveMap; this.withCopyrightSign = withCopyrightSign; - this.withTelemetryAttribution = withTelemetryAttribution; this.withMapboxAttribution = withMapboxAttribution; } @@ -85,7 +82,6 @@ public class AttributionParser { */ protected void parse() { parseAttributions(); - addAdditionalAttributions(); } /** @@ -109,9 +105,6 @@ public class AttributionParser { String url = urlSpan.getURL(); if (isUrlValid(url)) { String anchor = parseAnchorValue(htmlBuilder, urlSpan); - if (isImproveThisMapAnchor(anchor)) { - anchor = translateImproveThisMapAnchor(anchor); - } attributions.add(new Attribution(anchor, url)); } } @@ -126,30 +119,6 @@ public class AttributionParser { return isValidForImproveThisMap(url) && isValidForMapbox(url); } - /** - * Invoked to validate if an anchor is equal to Improve this map coming from tilesets. - * - * @param anchor the anchor to be validated - * @return if the url is valid - */ - private boolean isImproveThisMapAnchor(String anchor) { - return anchor.equals(IMPROVE_THIS_MAP); - } - - /** - * Invoked to replace the english Improve this map with localized variant. - * - * @param anchor the anchor to be translated - * @return the translated anchor - */ - private String translateImproveThisMapAnchor(String anchor) { - Context context = this.context.get(); - if (context != null) { - anchor = context.getString(R.string.mapbox_telemetryImproveMap); - } - return anchor; - } - /** * Invoked to validate if an url is valid for the improve map configuration. * @@ -201,21 +170,6 @@ public class AttributionParser { return anchor; } - /** - * Invoked to manually add attributions - */ - private void addAdditionalAttributions() { - if (withTelemetryAttribution) { - Context context = this.context.get(); - attributions.add( - new Attribution( - context != null ? context.getString(R.string.mapbox_telemetrySettings) : Attribution.TELEMETRY, - Attribution.TELEMETRY_URL - ) - ); - } - } - /** * Convert a string to a spanned html representation. * @@ -236,15 +190,14 @@ public class AttributionParser { * Builder to configure using an AttributionParser. *

* AttributionData, set with {@link #withAttributionData(String...)}, is the only required property to build - * the underlying AttributionParser. Other properties include trimming the copyright sign, adding telemetry - * attribution or hiding attribution as improve this map and Mapbox. + * the underlying AttributionParser. Other properties include trimming the copyright sign, hiding + * attribution as improve this map and Mapbox. *

*/ public static class Options { private final WeakReference context; private boolean withImproveMap = true; private boolean withCopyrightSign = true; - private boolean withTelemetryAttribution = false; private boolean withMapboxAttribution = true; private String[] attributionDataStringArray; @@ -270,12 +223,6 @@ public class AttributionParser { return this; } - @NonNull - public Options withTelemetryAttribution(boolean withTelemetryAttribution) { - this.withTelemetryAttribution = withTelemetryAttribution; - return this; - } - @NonNull public Options withMapboxAttribution(boolean withMapboxAttribution) { this.withMapboxAttribution = withMapboxAttribution; @@ -294,7 +241,6 @@ public class AttributionParser { fullAttributionString, withImproveMap, withCopyrightSign, - withTelemetryAttribution, withMapboxAttribution ); attributionParser.parse(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java index 1a44afcb4..93a593073 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.camera; import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.FloatRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java index 9adacf2e6..caac82012 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdateFactory.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.camera; import android.graphics.Point; import android.graphics.PointF; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java index ce7a919f3..96bb4e8d8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java @@ -37,12 +37,6 @@ public class MapboxConstants { */ public static final boolean DEFAULT_MEASURE_TILE_DOWNLOAD_ON = false; - public static final String KEY_PREFERENCE_SKU_TOKEN = "com.mapbox.mapboxsdk.accounts.skutoken"; - - public static final String KEY_META_DATA_MANAGE_SKU_TOKEN = "com.mapbox.ManageSkuToken"; - - public static final boolean DEFAULT_MANAGE_SKU_TOKEN = true; - /** * Default value for font fallback for local ideograph fonts */ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java deleted file mode 100644 index 3dbae9de4..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/TelemetryConstants.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mapbox.mapboxsdk.constants; - -@Deprecated -public class TelemetryConstants { - - public static final String TWO_FINGER_TAP = "TwoFingerTap"; - public static final String DOUBLE_TAP = "DoubleTap"; - public static final String SINGLE_TAP = "SingleTap"; - public static final String PAN = "Pan"; - public static final String PINCH = "Pinch"; - public static final String ROTATION = "Rotation"; - public static final String PITCH = "Pitch"; - -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java index 04a8ca044..cebe34086 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/exceptions/MapboxConfigurationException.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.exceptions; import android.content.Context; + import androidx.annotation.NonNull; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java index ae1eacc5b..04609810c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.geometry; import android.location.Location; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.FloatRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java index d31fe187f..226e0bfba 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java @@ -2,10 +2,12 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.FloatRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.constants.GeometryConstants; import com.mapbox.mapboxsdk.exceptions.InvalidLatLngBoundsException; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java index 4629d8dad..f6f7fd6c1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngQuad.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java index bbc64fb81..d62794f13 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngSpan.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java index d4e6dc310..a304e0962 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/ProjectedMeters.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java index 09d0bea88..79f6a9213 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/VisibleRegion.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.geometry; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java index 1df2c550f..4fedf8953 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpIdentifier.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.http; import android.content.Context; import android.content.pm.PackageInfo; + import androidx.annotation.NonNull; import com.mapbox.mapboxsdk.MapStrictMode; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java index 2f44694f0..9cf4b0601 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpLogger.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.http; import android.util.Log; + import com.mapbox.mapboxsdk.log.Logger; import static com.mapbox.mapboxsdk.http.HttpRequest.CONNECTION_ERROR; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java index 2a85bdee8..5d04ecb99 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java @@ -2,8 +2,6 @@ package com.mapbox.mapboxsdk.http; import androidx.annotation.NonNull; -import com.mapbox.mapboxsdk.Mapbox; - public class HttpRequestUrl { private HttpRequestUrl() { @@ -31,8 +29,6 @@ public class HttpRequestUrl { // Only add SKU token to requests not tagged as "offline" usage. if (offline) { resourceUrl = resourceUrl + "offline=true"; - } else { - resourceUrl = resourceUrl + "sku=" + Mapbox.getSkuToken(); } } return resourceUrl; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java index f263fa9c0..6f28e14ae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java @@ -5,6 +5,7 @@ import android.os.AsyncTask; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.log.Logger; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java index 47ba2c9fa..6d41b07ad 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.http; import androidx.annotation.Keep; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.Mapbox; import java.util.concurrent.locks.ReentrantLock; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java index 6eccdf49a..53f10cdc4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/IndicatorLocationLayerRenderer.java @@ -2,6 +2,8 @@ package com.mapbox.mapboxsdk.location; import android.graphics.Bitmap; +import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.location.modes.RenderMode; import com.mapbox.mapboxsdk.maps.Style; @@ -10,8 +12,6 @@ import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.utils.BitmapUtils; import com.mapbox.mapboxsdk.utils.ColorUtils; -import androidx.annotation.Nullable; - import static com.mapbox.mapboxsdk.location.LocationComponentConstants.BACKGROUND_ICON; import static com.mapbox.mapboxsdk.location.LocationComponentConstants.BACKGROUND_STALE_ICON; import static com.mapbox.mapboxsdk.location.LocationComponentConstants.BEARING_ICON; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java index 050798062..c4a6efbf8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LatLngEvaluator.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.location; import android.animation.TypeEvaluator; import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.geometry.LatLng; class LatLngEvaluator implements TypeEvaluator { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java index 70aabd867..0e76b1a8c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.location; import android.content.Context; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; + import androidx.annotation.ColorInt; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java index c7792e692..81efc0675 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java @@ -14,18 +14,18 @@ import androidx.annotation.RequiresPermission; import androidx.annotation.StyleRes; import androidx.annotation.VisibleForTesting; -import com.mapbox.android.core.location.LocationEngine; -import com.mapbox.android.core.location.LocationEngineCallback; -import com.mapbox.android.core.location.LocationEngineProvider; -import com.mapbox.android.core.location.LocationEngineRequest; -import com.mapbox.android.core.location.LocationEngineResult; -import com.mapbox.android.core.permissions.PermissionsManager; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdate; import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback; +import com.mapbox.mapboxsdk.location.engine.LocationEngineProvider; +import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest; +import com.mapbox.mapboxsdk.location.engine.LocationEngineResult; import com.mapbox.mapboxsdk.location.modes.CameraMode; import com.mapbox.mapboxsdk.location.modes.RenderMode; +import com.mapbox.mapboxsdk.location.permissions.PermissionsManager; import com.mapbox.mapboxsdk.log.Logger; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -77,10 +77,10 @@ import static com.mapbox.mapboxsdk.location.LocationComponentConstants.TRANSITIO *

* This component offers a default, built-in {@link LocationEngine} with some of the activation methods. * This engine will be obtained by {@link LocationEngineProvider#getBestLocationEngine(Context, boolean)} which defaults - * to the {@link com.mapbox.android.core.location.MapboxFusedLocationEngineImpl}. If you'd like to utilize Google + * to the {@link com.mapbox.mapboxsdk.location.engine.MapboxFusedLocationEngineImpl}. If you'd like to utilize Google * Play Services * for more precise location updates, simply add the Google Play Location Services dependency in your build script. - * This will make the default engine the {@link com.mapbox.android.core.location.GoogleLocationEngineImpl} instead. + * This will make the default engine the {@link com.mapbox.mapboxsdk.location.engine.GoogleLocationEngineImpl} instead. * After a custom engine is passed to the component, or the built-in is initialized, * the location updates are going to be requested with the {@link LocationEngineRequest}, either a default one, * or the one passed during the activation. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java index 07b37c17a..a77f1928c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptions.java @@ -5,8 +5,8 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapbox.android.core.location.LocationEngine; -import com.mapbox.android.core.location.LocationEngineRequest; +import com.mapbox.mapboxsdk.location.engine.LocationEngine; +import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest; import com.mapbox.mapboxsdk.maps.Style; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java index 649ccc267..49307d985 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentCompassEngine.java @@ -5,11 +5,12 @@ import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.os.SystemClock; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.Surface; import android.view.WindowManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.log.Logger; import java.util.ArrayList; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java index 9399c8fa3..6c14d6c32 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationIndicatorLayer.java @@ -5,17 +5,13 @@ package com.mapbox.mapboxsdk.location; import androidx.annotation.ColorInt; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.layers.PropertyValue; +import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java index 367c47091..722f22d9e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationPropertyFactory.java @@ -5,13 +5,13 @@ package com.mapbox.mapboxsdk.location; import androidx.annotation.ColorInt; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.types.Formatted; -import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; import com.mapbox.mapboxsdk.style.layers.LayoutPropertyValue; import com.mapbox.mapboxsdk.style.layers.PaintPropertyValue; import com.mapbox.mapboxsdk.style.layers.Property; import com.mapbox.mapboxsdk.style.layers.PropertyValue; +import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; + /** * Constructs paint/layout properties for Layers * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java index 7d9c658d6..f957a715c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/StaleStateManager.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.location; import android.os.Handler; import android.os.Message; + import androidx.annotation.NonNull; import java.lang.ref.WeakReference; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java index 5389d1062..d0b7fadb0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/Utils.java @@ -7,6 +7,7 @@ import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.LayerDrawable; import android.location.Location; import android.os.Build; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/AndroidLocationEngineImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/AndroidLocationEngineImpl.java new file mode 100644 index 000000000..c51a020cd --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/AndroidLocationEngineImpl.java @@ -0,0 +1,175 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.annotation.SuppressLint; +import android.app.PendingIntent; +import android.content.Context; +import android.location.Criteria; +import android.location.Location; +import android.location.LocationListener; +import android.location.LocationManager; +import android.os.Bundle; +import android.os.Looper; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + +/** + * A location engine that uses core android.location and has no external dependencies + * https://developer.android.com/guide/topics/location/strategies.html + */ +class AndroidLocationEngineImpl implements LocationEngineImpl { + private static final String TAG = "AndroidLocationEngine"; + final LocationManager locationManager; + + String currentProvider = LocationManager.PASSIVE_PROVIDER; + + AndroidLocationEngineImpl(@NonNull Context context) { + locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); + } + + @NonNull + @Override + public LocationListener createListener(LocationEngineCallback callback) { + return new AndroidLocationEngineCallbackTransport(callback); + } + + @Override + public void getLastLocation(@NonNull LocationEngineCallback callback) + throws SecurityException { + Location lastLocation = getLastLocationFor(currentProvider); + if (lastLocation != null) { + callback.onSuccess(LocationEngineResult.create(lastLocation)); + return; + } + + for (String provider : locationManager.getAllProviders()) { + lastLocation = getLastLocationFor(provider); + if (lastLocation != null) { + callback.onSuccess(LocationEngineResult.create(lastLocation)); + return; + } + } + callback.onFailure(new Exception("Last location unavailable")); + } + + @SuppressLint("MissingPermission") + Location getLastLocationFor(String provider) throws SecurityException { + Location location = null; + try { + location = locationManager.getLastKnownLocation(provider); + } catch (IllegalArgumentException iae) { + Log.e(TAG, iae.toString()); + } + return location; + } + + @SuppressLint("MissingPermission") + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull LocationListener listener, + @Nullable Looper looper) throws SecurityException { + // Pick best provider only if user has not explicitly chosen passive mode + currentProvider = getBestProvider(request.getPriority()); + locationManager.requestLocationUpdates(currentProvider, request.getInterval(), request.getDisplacement(), + listener, looper); + } + + @SuppressLint("MissingPermission") + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull PendingIntent pendingIntent) throws SecurityException { + // Pick best provider only if user has not explicitly chosen passive mode + currentProvider = getBestProvider(request.getPriority()); + locationManager.requestLocationUpdates(currentProvider, request.getInterval(), + request.getDisplacement(), pendingIntent); + } + + @SuppressLint("MissingPermission") + @Override + public void removeLocationUpdates(@NonNull LocationListener listener) { + if (listener != null) { + locationManager.removeUpdates(listener); + } + } + + @Override + public void removeLocationUpdates(PendingIntent pendingIntent) { + if (pendingIntent != null) { + locationManager.removeUpdates(pendingIntent); + } + } + + private String getBestProvider(int priority) { + String provider = null; + // Pick best provider only if user has not explicitly chosen passive mode + if (priority != LocationEngineRequest.PRIORITY_NO_POWER) { + provider = locationManager.getBestProvider(getCriteria(priority), true); + } + return provider != null ? provider : LocationManager.PASSIVE_PROVIDER; + } + + @VisibleForTesting + static Criteria getCriteria(int priority) { + Criteria criteria = new Criteria(); + criteria.setAccuracy(priorityToAccuracy(priority)); + criteria.setCostAllowed(true); + criteria.setPowerRequirement(priorityToPowerRequirement(priority)); + return criteria; + } + + private static int priorityToAccuracy(int priority) { + switch (priority) { + case LocationEngineRequest.PRIORITY_HIGH_ACCURACY: + case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY: + return Criteria.ACCURACY_FINE; + case LocationEngineRequest.PRIORITY_LOW_POWER: + case LocationEngineRequest.PRIORITY_NO_POWER: + default: + return Criteria.ACCURACY_COARSE; + } + } + + private static int priorityToPowerRequirement(int priority) { + switch (priority) { + case LocationEngineRequest.PRIORITY_HIGH_ACCURACY: + return Criteria.POWER_HIGH; + case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY: + return Criteria.POWER_MEDIUM; + case LocationEngineRequest.PRIORITY_LOW_POWER: + case LocationEngineRequest.PRIORITY_NO_POWER: + default: + return Criteria.POWER_LOW; + } + } + + @VisibleForTesting + static final class AndroidLocationEngineCallbackTransport implements LocationListener { + private final LocationEngineCallback callback; + + AndroidLocationEngineCallbackTransport(LocationEngineCallback callback) { + this.callback = callback; + } + + @Override + public void onLocationChanged(Location location) { + callback.onSuccess(LocationEngineResult.create(location)); + } + + @Override + public void onStatusChanged(String s, int i, Bundle bundle) { + // noop + } + + @Override + public void onProviderEnabled(String s) { + // noop + } + + @Override + public void onProviderDisabled(String s) { + callback.onFailure(new Exception("Current provider disabled")); + } + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java new file mode 100644 index 000000000..f645940be --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/GoogleLocationEngineImpl.java @@ -0,0 +1,146 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.annotation.SuppressLint; +import android.app.PendingIntent; +import android.content.Context; +import android.location.Location; +import android.os.Looper; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + +import com.google.android.gms.location.FusedLocationProviderClient; +import com.google.android.gms.location.LocationCallback; +import com.google.android.gms.location.LocationRequest; +import com.google.android.gms.location.LocationResult; +import com.google.android.gms.location.LocationServices; +import com.google.android.gms.tasks.OnFailureListener; +import com.google.android.gms.tasks.OnSuccessListener; + +import java.util.Collections; +import java.util.List; + +/** + * Wraps implementation of Fused Location Provider + */ +class GoogleLocationEngineImpl implements LocationEngineImpl { + private final FusedLocationProviderClient fusedLocationProviderClient; + + @VisibleForTesting + GoogleLocationEngineImpl(FusedLocationProviderClient fusedLocationProviderClient) { + this.fusedLocationProviderClient = fusedLocationProviderClient; + } + + GoogleLocationEngineImpl(@NonNull Context context) { + this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context); + } + + @NonNull + @Override + public LocationCallback createListener(LocationEngineCallback callback) { + return new GoogleLocationEngineCallbackTransport(callback); + } + + @SuppressLint("MissingPermission") + @Override + public void getLastLocation(@NonNull LocationEngineCallback callback) + throws SecurityException { + GoogleLastLocationEngineCallbackTransport transport = + new GoogleLastLocationEngineCallbackTransport(callback); + fusedLocationProviderClient.getLastLocation().addOnSuccessListener(transport).addOnFailureListener(transport); + } + + @SuppressLint("MissingPermission") + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull LocationCallback listener, + @Nullable Looper looper) throws SecurityException { + fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), listener, looper); + } + + @SuppressLint("MissingPermission") + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull PendingIntent pendingIntent) throws SecurityException { + fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), pendingIntent); + } + + @Override + public void removeLocationUpdates(@NonNull LocationCallback listener) { + if (listener != null) { + fusedLocationProviderClient.removeLocationUpdates(listener); + } + } + + @Override + public void removeLocationUpdates(PendingIntent pendingIntent) { + if (pendingIntent != null) { + fusedLocationProviderClient.removeLocationUpdates(pendingIntent); + } + } + + private static LocationRequest toGMSLocationRequest(LocationEngineRequest request) { + LocationRequest locationRequest = new LocationRequest(); + locationRequest.setInterval(request.getInterval()); + locationRequest.setFastestInterval(request.getFastestInterval()); + locationRequest.setSmallestDisplacement(request.getDisplacement()); + locationRequest.setMaxWaitTime(request.getMaxWaitTime()); + locationRequest.setPriority(toGMSLocationPriority(request.getPriority())); + return locationRequest; + } + + private static int toGMSLocationPriority(int enginePriority) { + switch (enginePriority) { + case LocationEngineRequest.PRIORITY_HIGH_ACCURACY: + return LocationRequest.PRIORITY_HIGH_ACCURACY; + case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY: + return LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY; + case LocationEngineRequest.PRIORITY_LOW_POWER: + return LocationRequest.PRIORITY_LOW_POWER; + case LocationEngineRequest.PRIORITY_NO_POWER: + default: + return LocationRequest.PRIORITY_NO_POWER; + } + } + + private static final class GoogleLocationEngineCallbackTransport extends LocationCallback { + private final LocationEngineCallback callback; + + GoogleLocationEngineCallbackTransport(LocationEngineCallback callback) { + this.callback = callback; + } + + @Override + public void onLocationResult(LocationResult locationResult) { + super.onLocationResult(locationResult); + List locations = locationResult.getLocations(); + if (!locations.isEmpty()) { + callback.onSuccess(LocationEngineResult.create(locations)); + } else { + callback.onFailure(new Exception("Unavailable location")); + } + } + } + + @VisibleForTesting + static final class GoogleLastLocationEngineCallbackTransport + implements OnSuccessListener, OnFailureListener { + private final LocationEngineCallback callback; + + GoogleLastLocationEngineCallbackTransport(LocationEngineCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(Location location) { + callback.onSuccess(location != null ? LocationEngineResult.create(location) : + LocationEngineResult.create(Collections.emptyList())); + } + + @Override + public void onFailure(@NonNull Exception e) { + callback.onFailure(e); + } + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngine.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngine.java new file mode 100644 index 000000000..cec293145 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngine.java @@ -0,0 +1,82 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.app.PendingIntent; +import android.os.Looper; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresPermission; + +import static android.Manifest.permission.ACCESS_COARSE_LOCATION; +import static android.Manifest.permission.ACCESS_FINE_LOCATION; + +/** + * Generic location engine interface wrapper for the location providers. + * Default providers bundled with Mapbox location library: + * Android location provider and Google Play Services fused location provider + * + * @since 1.0.0 + */ +public interface LocationEngine { + + /** + * Returns the most recent location currently available. + *

+ * If a location is not available, which should happen very rarely, null will be returned. + * + * @param callback {@link LocationEngineCallback} for the location result {@link LocationEngineResult}. + * @throws SecurityException if permission is not granted to access location services. + * @since 1.0.0 + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + void getLastLocation(@NonNull LocationEngineCallback callback) throws SecurityException; + + /** + * Requests location updates with a callback on the specified Looper thread. + * + * @param request {@link LocationEngineRequest} for the updates. + * @param callback {@link LocationEngineCallback} for the location result {@link LocationEngineResult}. + * @param looper The Looper object whose message queue will be used to implement the callback mechanism, + * or null to invoke callbacks on the main thread. + * @throws SecurityException if permission is not granted to access location services. + * @since 1.0.0 + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull LocationEngineCallback callback, + @Nullable Looper looper) throws SecurityException; + + /** + * Requests location updates with callback on the specified PendingIntent. + * + * @param request {@link LocationEngineRequest} for the updates. + * @param pendingIntent {@link PendingIntent} for the location result {@link LocationEngineResult}. + * @throws SecurityException if permission is not granted to access location services. + * @since 1.1.0 + */ + @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION}) + void requestLocationUpdates(@NonNull LocationEngineRequest request, + PendingIntent pendingIntent) throws SecurityException; + + /** + * Removes location updates for the given location engine callback. + *

+ * It is recommended to remove location requests when the activity is in a paused or + * stopped state, doing so helps battery performance. + * + * @param callback {@link LocationEngineCallback} to remove. + * @since 1.0.0 + */ + void removeLocationUpdates(@NonNull LocationEngineCallback callback); + + /** + * Removes location updates for the given pending intent. + *

+ * It is recommended to remove location requests when the activity is in a paused or + * stopped state, doing so helps battery performance. + * + * @param pendingIntent {@link PendingIntent} to remove. + * @since 1.1.0 + */ + void removeLocationUpdates(PendingIntent pendingIntent); +} \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineCallback.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineCallback.java new file mode 100644 index 000000000..b2562bae3 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineCallback.java @@ -0,0 +1,25 @@ +package com.mapbox.mapboxsdk.location.engine; + +import androidx.annotation.NonNull; + +/** + * Invoked for asynchronous notifications when new data + * from engine becomes available. + * + * @param Successful updated data type + */ +public interface LocationEngineCallback { + /** + * Invoked when new data available. + * + * @param result updated data. + */ + void onSuccess(T result); + + /** + * Invoked when engine exception occurs. + * + * @param exception {@link Exception} + */ + void onFailure(@NonNull Exception exception); +} \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineImpl.java new file mode 100644 index 000000000..579d9ad9b --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineImpl.java @@ -0,0 +1,29 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.app.PendingIntent; +import android.os.Looper; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +/** + * Internal location engine implementation interface. + * + * @param location listener object type + */ +interface LocationEngineImpl { + @NonNull + T createListener(LocationEngineCallback callback); + + void getLastLocation(@NonNull LocationEngineCallback callback) throws SecurityException; + + void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull T listener, @Nullable Looper looper) throws SecurityException; + + void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull PendingIntent pendingIntent) throws SecurityException; + + void removeLocationUpdates(T listener); + + void removeLocationUpdates(PendingIntent pendingIntent); +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java new file mode 100644 index 000000000..643dd71cd --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProvider.java @@ -0,0 +1,62 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.content.Context; + +import androidx.annotation.NonNull; + +import com.google.android.gms.common.ConnectionResult; +import com.google.android.gms.common.GoogleApiAvailability; + +import static com.mapbox.mapboxsdk.location.engine.Utils.checkNotNull; +import static com.mapbox.mapboxsdk.location.engine.Utils.isOnClasspath; + +/** + * The main entry point for location engine integration. + */ +public final class LocationEngineProvider { + private static final String GOOGLE_LOCATION_SERVICES = "com.google.android.gms.location.LocationServices"; + private static final String GOOGLE_API_AVAILABILITY = "com.google.android.gms.common.GoogleApiAvailability"; + + private LocationEngineProvider() { + // prevent instantiation + } + + /** + * Returns instance to the best location engine, given the included libraries. + * + * @param context {@link Context}. + * @param background true if background optimized engine is desired (note: parameter deprecated) + * @return a unique instance of {@link LocationEngine} every time method is called. + * @since 1.0.0 + */ + @NonNull + @Deprecated + public static LocationEngine getBestLocationEngine(@NonNull Context context, boolean background) { + return getBestLocationEngine(context); + } + + /** + * Returns instance to the best location engine, given the included libraries. + * + * @param context {@link Context}. + * @return a unique instance of {@link LocationEngine} every time method is called. + * @since 1.1.0 + */ + @NonNull + public static LocationEngine getBestLocationEngine(@NonNull Context context) { + checkNotNull(context, "context == null"); + + boolean hasGoogleLocationServices = isOnClasspath(GOOGLE_LOCATION_SERVICES); + if (isOnClasspath(GOOGLE_API_AVAILABILITY)) { + // Check Google Play services APK is available and up-to-date on this device + hasGoogleLocationServices &= GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) + == ConnectionResult.SUCCESS; + } + return getLocationEngine(context, hasGoogleLocationServices); + } + + private static LocationEngine getLocationEngine(Context context, boolean isGoogle) { + return isGoogle ? new LocationEngineProxy<>(new GoogleLocationEngineImpl(context.getApplicationContext())) : + new LocationEngineProxy<>(new MapboxFusedLocationEngineImpl(context.getApplicationContext())); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProxy.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProxy.java new file mode 100644 index 000000000..a9e12d872 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineProxy.java @@ -0,0 +1,80 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.app.PendingIntent; +import android.os.Looper; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static com.mapbox.mapboxsdk.location.engine.Utils.checkNotNull; + +class LocationEngineProxy implements LocationEngine { + private final LocationEngineImpl locationEngineImpl; + private Map, T> listeners; + + LocationEngineProxy(LocationEngineImpl locationEngineImpl) { + this.locationEngineImpl = locationEngineImpl; + } + + @Override + public void getLastLocation(@NonNull LocationEngineCallback callback) throws SecurityException { + checkNotNull(callback, "callback == null"); + locationEngineImpl.getLastLocation(callback); + } + + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull LocationEngineCallback callback, + @Nullable Looper looper) throws SecurityException { + checkNotNull(request, "request == null"); + checkNotNull(callback, "callback == null"); + locationEngineImpl.requestLocationUpdates(request, getListener(callback), + looper == null ? Looper.getMainLooper() : looper); + } + + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + PendingIntent pendingIntent) throws SecurityException { + checkNotNull(request, "request == null"); + locationEngineImpl.requestLocationUpdates(request, pendingIntent); + } + + @Override + public void removeLocationUpdates(@NonNull LocationEngineCallback callback) { + checkNotNull(callback, "callback == null"); + locationEngineImpl.removeLocationUpdates(removeListener(callback)); + } + + @Override + public void removeLocationUpdates(PendingIntent pendingIntent) { + locationEngineImpl.removeLocationUpdates(pendingIntent); + } + + @VisibleForTesting + int getListenersCount() { + return listeners != null ? listeners.size() : 0; + } + + @VisibleForTesting + T getListener(@NonNull LocationEngineCallback callback) { + if (listeners == null) { + listeners = new ConcurrentHashMap<>(); + } + + T listener = listeners.get(callback); + if (listener == null) { + listener = locationEngineImpl.createListener(callback); + } + listeners.put(callback, listener); + return listener; + } + + @VisibleForTesting + T removeListener(@NonNull LocationEngineCallback callback) { + return listeners != null ? listeners.remove(callback) : null; + } +} \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineRequest.java new file mode 100644 index 000000000..09631fa03 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineRequest.java @@ -0,0 +1,242 @@ +package com.mapbox.mapboxsdk.location.engine; + +/** + * Data model that contains parameters for location + * engine requests. + * + * @since 1.0.0 + */ +public class LocationEngineRequest { + /** + * Used with {@link Builder#setPriority(int)} to request + * the most accurate location. + * + * @since 1.0.0 + */ + public static final int PRIORITY_HIGH_ACCURACY = 0; + + /** + * Used with {@link Builder#setPriority(int)} to request + * coarse location that is battery optimized. + * + * @since 1.0.0 + */ + public static final int PRIORITY_BALANCED_POWER_ACCURACY = 1; + + /** + * Used with {@link Builder#setPriority(int)} to request + * coarse ~ 10 km accuracy location. + * + * @since 1.0.0 + */ + public static final int PRIORITY_LOW_POWER = 2; + + /** + * Used with {@link Builder#setPriority(int)} to request + * passive location: no locations will be returned unless a different client + * has requested location updates. + * + * @since 1.0.0 + */ + public static final int PRIORITY_NO_POWER = 3; + + private final long interval; + private final int priority; + private final float displacement; + private final long maxWaitTime; + private final long fastestInterval; + + private LocationEngineRequest(Builder builder) { + this.interval = builder.interval; + this.priority = builder.priority; + this.displacement = builder.displacement; + this.maxWaitTime = builder.maxWaitTime; + this.fastestInterval = builder.fastestInterval; + } + + /** + * Returns desired interval between location updates + * in milliseconds. + * + * @return desired interval in milliseconds. + * @since 1.0.0 + */ + public long getInterval() { + return interval; + } + + /** + * Returns desired quality of the request. + * + * @return accuracy constant. + * @since 1.0.0 + */ + public int getPriority() { + return priority; + } + + /** + * Returns distance between location updates. + * + * @return distance between location updates in meters. + * @since 1.0.0 + */ + public float getDisplacement() { + return displacement; + } + + /** + * Returns maximum wait time in milliseconds for location updates. + * + * @return maximum wait time in milliseconds. + * @since 1.0.0 + */ + public long getMaxWaitTime() { + return maxWaitTime; + } + + /** + * Returns fastest interval in milliseconds for location updates. + * + * @return fastest interval in milliseconds. + * @since 1.0.0 + */ + public long getFastestInterval() { + return fastestInterval; + } + + /** + * Compares this LocationEngineRequest to the specified object. + * + * @param o locationEngineRequest to compare to. + * @return true when the type and values are equal, false otherwise. + * @since 3.1.1 + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + LocationEngineRequest that = (LocationEngineRequest) o; + + if (interval != that.interval) { + return false; + } + if (priority != that.priority) { + return false; + } + if (Float.compare(that.displacement, displacement) != 0) { + return false; + } + if (maxWaitTime != that.maxWaitTime) { + return false; + } + return fastestInterval == that.fastestInterval; + } + + /** + * Returns a hash code for this object. + * + * @return integer hash of the values. + * @since 3.1.1 + */ + @Override + public int hashCode() { + int result = (int) (interval ^ (interval >>> 32)); + result = 31 * result + priority; + result = 31 * result + (displacement != +0.0f ? Float.floatToIntBits(displacement) : 0); + result = 31 * result + (int) (maxWaitTime ^ (maxWaitTime >>> 32)); + result = 31 * result + (int) (fastestInterval ^ (fastestInterval >>> 32)); + return result; + } + + public static final class Builder { + private final long interval; + + private int priority; + private float displacement; + private long maxWaitTime; + private long fastestInterval; + + /** + * Default builder constructor. + * + * @param interval default interval between location updates + * @since 1.0.0 + */ + public Builder(long interval) { + this.interval = interval; + this.priority = PRIORITY_HIGH_ACCURACY; + this.displacement = 0.0f; + this.maxWaitTime = 0L; + this.fastestInterval = 0L; + } + + /** + * Set priority for request. + * Use priority constant: {@link #PRIORITY_HIGH_ACCURACY} + * + * @param priority constant + * @return reference to builder + * @since 1.0.0 + */ + public Builder setPriority(int priority) { + this.priority = priority; + return this; + } + + /** + * Set distance between location updates. + * + * @param displacement distance between locations in meters. + * @return reference to builder + * @since 1.0.0 + */ + public Builder setDisplacement(float displacement) { + this.displacement = displacement; + return this; + } + + /** + * Sets the maximum wait time in milliseconds for location updates. + *

+ * Locations determined at intervals but delivered in batch based on + * wait time. Batching is not supported by all engines. + * + * @param maxWaitTime wait time in milliseconds. + * @return reference to builder + * @since 1.0.0 + */ + public Builder setMaxWaitTime(long maxWaitTime) { + this.maxWaitTime = maxWaitTime; + return this; + } + + /** + * Sets the fastest interval in milliseconds for location updates. + * + * @param interval fastest interval in milliseconds. + * @return reference to builder + * @since 1.0.0 + */ + public Builder setFastestInterval(long interval) { + this.fastestInterval = interval; + return this; + } + + /** + * Builds request object. + * + * @return instance of location request. + * @since 1.0.0 + */ + public LocationEngineRequest build() { + return new LocationEngineRequest(this); + } + } +} + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java new file mode 100644 index 000000000..c7dd05a90 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/LocationEngineResult.java @@ -0,0 +1,119 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.content.Intent; +import android.location.Location; +import android.location.LocationManager; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.google.android.gms.location.LocationResult; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static com.mapbox.mapboxsdk.location.engine.Utils.isOnClasspath; + +/** + * A wrapper class representing location result from the location engine. + *

+ * TODO: Override default equals(), hashCode() and toString() + * + * @since 1.0.0 + */ +public final class LocationEngineResult { + private static final String GOOGLE_PLAY_LOCATION_RESULT = "com.google.android.gms.location.LocationResult"; + + private final List locations; + + private LocationEngineResult(List locations) { + this.locations = Collections.unmodifiableList(locations); + } + + /** + * Creates {@link LocationEngineResult} instance for location. + * + * @param location default location added to the result. + * @return instance of the new location result. + * @since 1.0.0 + */ + @NonNull + public static LocationEngineResult create(@Nullable Location location) { + List locations = new ArrayList<>(); + if (location != null) { + locations.add(location); + } + return new LocationEngineResult(locations); + } + + /** + * Creates {@link LocationEngineResult} instance for given list of locations. + * + * @param locations list of locations. + * @return instance of the new location result. + * @since 1.0.0 + */ + @NonNull + public static LocationEngineResult create(@Nullable List locations) { + if (locations != null) { + List locationsList = new ArrayList<>(locations); + locationsList.removeAll(Collections.singleton(null)); + return new LocationEngineResult(locationsList); + } + + return new LocationEngineResult(Collections.emptyList()); + } + + /** + * Returns most recent location available in this result. + * + * @return the most recent location {@link Location} or null. + * @since 1.0.0 + */ + @Nullable + public Location getLastLocation() { + return locations.isEmpty() ? null : locations.get(0); + } + + /** + * Returns locations computed, ordered from oldest to newest. + * + * @return ordered list of locations. + * @since 1.0.0 + */ + public List getLocations() { + return Collections.unmodifiableList(locations); + } + + /** + * Extracts location result from intent object + * + * @param intent valid intent object + * @return location result. + * @since 1.1.0 + */ + @Nullable + public static LocationEngineResult extractResult(Intent intent) { + LocationEngineResult result = null; + if (isOnClasspath(GOOGLE_PLAY_LOCATION_RESULT)) { + result = extractGooglePlayResult(intent); + } + return result == null ? extractAndroidResult(intent) : result; + } + + private static LocationEngineResult extractGooglePlayResult(Intent intent) { + LocationResult result = LocationResult.extractResult(intent); + return result != null ? LocationEngineResult.create(result.getLocations()) : null; + } + + private static LocationEngineResult extractAndroidResult(Intent intent) { + return !hasResult(intent) ? null : + LocationEngineResult.create((Location) intent.getExtras() + .getParcelable(LocationManager.KEY_LOCATION_CHANGED)); + } + + private static boolean hasResult(Intent intent) { + return intent != null && intent.hasExtra(LocationManager.KEY_LOCATION_CHANGED); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/MapboxFusedLocationEngineImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/MapboxFusedLocationEngineImpl.java new file mode 100644 index 000000000..0513d0413 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/MapboxFusedLocationEngineImpl.java @@ -0,0 +1,137 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.annotation.SuppressLint; +import android.app.PendingIntent; +import android.content.Context; +import android.location.Location; +import android.location.LocationListener; +import android.location.LocationManager; +import android.os.Bundle; +import android.os.Looper; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import static com.mapbox.mapboxsdk.location.engine.Utils.isBetterLocation; + +/** + * Mapbox replacement for Google Play Services Fused Location Client + *

+ * Note: fusion will not work in background mode. + */ +class MapboxFusedLocationEngineImpl extends AndroidLocationEngineImpl { + private static final String TAG = "MapboxLocationEngine"; + + MapboxFusedLocationEngineImpl(@NonNull Context context) { + super(context); + } + + @NonNull + @Override + public LocationListener createListener(LocationEngineCallback callback) { + return new MapboxLocationEngineCallbackTransport(callback); + } + + @Override + public void getLastLocation(@NonNull LocationEngineCallback callback) throws SecurityException { + Location bestLastLocation = getBestLastLocation(); + if (bestLastLocation != null) { + callback.onSuccess(LocationEngineResult.create(bestLastLocation)); + } else { + callback.onFailure(new Exception("Last location unavailable")); + } + } + + @SuppressLint("MissingPermission") + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull LocationListener listener, + @Nullable Looper looper) throws SecurityException { + super.requestLocationUpdates(request, listener, looper); + + // Start network provider along with gps + if (shouldStartNetworkProvider(request.getPriority())) { + try { + locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, + request.getInterval(), request.getDisplacement(), + listener, looper); + } catch (IllegalArgumentException iae) { + iae.printStackTrace(); + } + } + } + + @SuppressLint("MissingPermission") + @Override + public void requestLocationUpdates(@NonNull LocationEngineRequest request, + @NonNull PendingIntent pendingIntent) throws SecurityException { + super.requestLocationUpdates(request, pendingIntent); + + // Start network provider along with gps + if (shouldStartNetworkProvider(request.getPriority())) { + try { + locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, request.getInterval(), + request.getDisplacement(), pendingIntent); + } catch (IllegalArgumentException iae) { + iae.printStackTrace(); + } + } + } + + private Location getBestLastLocation() { + Location bestLastLocation = null; + for (String provider : locationManager.getAllProviders()) { + Location location = getLastLocationFor(provider); + if (location == null) { + continue; + } + + if (isBetterLocation(location, bestLastLocation)) { + bestLastLocation = location; + } + } + return bestLastLocation; + } + + private boolean shouldStartNetworkProvider(int priority) { + return (priority == LocationEngineRequest.PRIORITY_HIGH_ACCURACY + || priority == LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY) + && currentProvider.equals(LocationManager.GPS_PROVIDER); + } + + private static final class MapboxLocationEngineCallbackTransport implements LocationListener { + private final LocationEngineCallback callback; + private Location currentBestLocation; + + MapboxLocationEngineCallbackTransport(LocationEngineCallback callback) { + this.callback = callback; + } + + @Override + public void onLocationChanged(Location location) { + if (isBetterLocation(location, currentBestLocation)) { + currentBestLocation = location; + } + + if (callback != null) { + callback.onSuccess(LocationEngineResult.create(currentBestLocation)); + } + } + + @Override + public void onStatusChanged(String provider, int status, Bundle extras) { + Log.d(TAG, "onStatusChanged: " + provider); + } + + @Override + public void onProviderEnabled(String provider) { + Log.d(TAG, "onProviderEnabled: " + provider); + } + + @Override + public void onProviderDisabled(String provider) { + Log.d(TAG, "onProviderDisabled: " + provider); + } + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/Utils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/Utils.java new file mode 100644 index 000000000..7160d4543 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/engine/Utils.java @@ -0,0 +1,106 @@ +package com.mapbox.mapboxsdk.location.engine; + +import android.location.Location; + +import androidx.annotation.Nullable; + +final class Utils { + private static final int TWO_MINUTES = 1000 * 60 * 2; + private static final int ACCURACY_THRESHOLD_METERS = 200; + + private Utils() { + // Prevent instantiation + } + + /** + * Ensures that an object reference passed as a parameter to the calling method is not null. + * + * @param reference object reference. + * @param message exception message to use if check fails. + * @param object type. + * @return validated non-null reference. + */ + static T checkNotNull(@Nullable T reference, String message) { + if (reference == null) { + throw new NullPointerException(message); + } + return reference; + } + + /** + * Checks if class is on class path + * @param className of the class to check. + * @return true if class in on class path, false otherwise. + */ + static boolean isOnClasspath(String className) { + boolean isOnClassPath = true; + try { + Class.forName(className); + } catch (ClassNotFoundException exception) { + isOnClassPath = false; + } + return isOnClassPath; + } + + /** + * Determines whether one Location reading is better than the current Location fix + *

+ * (c) https://developer.android.com/guide/topics/location/strategies + * + * @param location The new Location that you want to evaluate + * @param currentBestLocation The current Location fix, to which you want to compare the new one + */ + static boolean isBetterLocation(Location location, Location currentBestLocation) { + if (currentBestLocation == null) { + // A new location is always better than no location + return true; + } + + // Check whether the new location fix is newer or older + long timeDelta = location.getTime() - currentBestLocation.getTime(); + boolean isSignificantlyNewer = timeDelta > TWO_MINUTES; + boolean isSignificantlyOlder = timeDelta < -TWO_MINUTES; + boolean isNewer = timeDelta > 0; + + // If it's been more than two minutes since the current location, use the new location + // because the user has likely moved + if (isSignificantlyNewer) { + return true; + // If the new location is more than two minutes older, it must be worse + } else if (isSignificantlyOlder) { + return false; + } + + // Check whether the new location fix is more or less accurate + int accuracyDelta = (int) (location.getAccuracy() - currentBestLocation.getAccuracy()); + boolean isLessAccurate = accuracyDelta > 0; + boolean isMoreAccurate = accuracyDelta < 0; + boolean isSignificantlyLessAccurate = accuracyDelta > ACCURACY_THRESHOLD_METERS; + + // Check if the old and new location are from the same provider + boolean isFromSameProvider = isSameProvider(location.getProvider(), + currentBestLocation.getProvider()); + + // Determine location quality using a combination of timeliness and accuracy + if (isMoreAccurate) { + return true; + } else if (isNewer && !isLessAccurate) { + return true; + } else if (isNewer && !isSignificantlyLessAccurate && isFromSameProvider) { + return true; + } + return false; + } + + /** + * Checks whether two providers are the same + *

+ * (c) https://developer.android.com/guide/topics/location/strategies + */ + private static boolean isSameProvider(String provider1, String provider2) { + if (provider1 == null) { + return provider2 == null; + } + return provider1.equals(provider2); + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java index 3e280e48d..f86fb7605 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/modes/CameraMode.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.location.modes; import android.location.Location; + import androidx.annotation.IntDef; import com.mapbox.mapboxsdk.location.LocationComponent; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/permissions/PermissionsListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/permissions/PermissionsListener.java new file mode 100644 index 000000000..c525bd7da --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/permissions/PermissionsListener.java @@ -0,0 +1,14 @@ +package com.mapbox.mapboxsdk.location.permissions; + +import java.util.List; + +/** + * Callback used in PermissionsManager + */ + +public interface PermissionsListener { + + void onExplanationNeeded(List permissionsToExplain); + + void onPermissionResult(boolean granted); +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/permissions/PermissionsManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/permissions/PermissionsManager.java new file mode 100644 index 000000000..2c8f19751 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/permissions/PermissionsManager.java @@ -0,0 +1,152 @@ +package com.mapbox.mapboxsdk.location.permissions; + +import android.Manifest; +import android.app.Activity; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.Build; +import android.util.Log; + +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Helps request permissions at runtime. + */ +public class PermissionsManager { + + private static final String LOG_TAG = "PermissionsManager"; + private static final String COARSE_LOCATION_PERMISSION = Manifest.permission.ACCESS_COARSE_LOCATION; + private static final String FINE_LOCATION_PERMISSION = Manifest.permission.ACCESS_FINE_LOCATION; + private static final String BACKGROUND_LOCATION_PERMISSION = "android.permission.ACCESS_BACKGROUND_LOCATION"; + + private final int REQUEST_PERMISSIONS_CODE = 0; + + private PermissionsListener listener; + + public PermissionsManager(PermissionsListener listener) { + this.listener = listener; + } + + public PermissionsListener getListener() { + return listener; + } + + public void setListener(PermissionsListener listener) { + this.listener = listener; + } + + private static boolean isPermissionGranted(Context context, String permission) { + return ContextCompat.checkSelfPermission(context, permission) + == PackageManager.PERMISSION_GRANTED; + } + + private static boolean isCoarseLocationPermissionGranted(Context context) { + return isPermissionGranted(context, COARSE_LOCATION_PERMISSION); + } + + private static boolean isFineLocationPermissionGranted(Context context) { + return isPermissionGranted(context, FINE_LOCATION_PERMISSION); + } + + public static boolean isBackgroundLocationPermissionGranted(Context context) { + if (Build.VERSION.SDK_INT >= 29) { + return isPermissionGranted(context, BACKGROUND_LOCATION_PERMISSION); + } + + return areLocationPermissionsGranted(context); + } + + public static boolean areLocationPermissionsGranted(Context context) { + return isCoarseLocationPermissionGranted(context) + || isFineLocationPermissionGranted(context); + } + + public static boolean areRuntimePermissionsRequired() { + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; + } + + public void requestLocationPermissions(Activity activity) { + try { + PackageInfo packageInfo = activity.getPackageManager().getPackageInfo( + activity.getPackageName(), PackageManager.GET_PERMISSIONS); + + String[] requestedPermissions = packageInfo.requestedPermissions; + if (requestedPermissions != null) { + List permissionList = Arrays.asList(requestedPermissions); + boolean fineLocPermission = permissionList.contains(FINE_LOCATION_PERMISSION); + boolean coarseLocPermission = permissionList.contains(COARSE_LOCATION_PERMISSION); + boolean backgroundLocPermission = permissionList.contains(BACKGROUND_LOCATION_PERMISSION); + + // Request location permissions + if (fineLocPermission) { + requestLocationPermissions(activity, true, backgroundLocPermission); + } else if (coarseLocPermission) { + requestLocationPermissions(activity, false, backgroundLocPermission); + } else { + Log.w(LOG_TAG, "Location permissions are missing"); + } + } + } catch (Exception exception) { + Log.w(LOG_TAG, exception.getMessage()); + } + } + + private void requestLocationPermissions(Activity activity, boolean requestFineLocation, + boolean requestBackgroundLocation) { + List permissions = new ArrayList<>(); + if (requestFineLocation) { + permissions.add(FINE_LOCATION_PERMISSION); + } else { + permissions.add(COARSE_LOCATION_PERMISSION); + } + + if (Build.VERSION.SDK_INT >= 29 && requestBackgroundLocation) { + permissions.add(BACKGROUND_LOCATION_PERMISSION); + } + + requestPermissions(activity, permissions.toArray(new String[permissions.size()])); + } + + private void requestPermissions(Activity activity, String[] permissions) { + ArrayList permissionsToExplain = new ArrayList<>(); + for (String permission : permissions) { + if (ActivityCompat.shouldShowRequestPermissionRationale(activity, permission)) { + permissionsToExplain.add(permission); + } + } + + if (listener != null && permissionsToExplain.size() > 0) { + // The developer should show an explanation to the user asynchronously + listener.onExplanationNeeded(permissionsToExplain); + } + + ActivityCompat.requestPermissions(activity, permissions, REQUEST_PERMISSIONS_CODE); + } + + /** + * You should call this method from your activity onRequestPermissionsResult. + * + * @param requestCode The request code passed in requestPermissions(android.app.Activity, String[], int) + * @param permissions The requested permissions. Never null. + * @param grantResults The grant results for the corresponding permissions which is either + * PERMISSION_GRANTED or PERMISSION_DENIED. Never null. + */ + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + switch (requestCode) { + case REQUEST_PERMISSIONS_CODE: + if (listener != null) { + boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED; + listener.onPermissionResult(granted); + } + break; + default: + // Ignored + } + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java index ae4cac019..12d2989dc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java @@ -1,8 +1,9 @@ package com.mapbox.mapboxsdk.log; +import android.util.Log; + import androidx.annotation.IntDef; import androidx.annotation.Keep; -import android.util.Log; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java index 875b7da5a..a33c40976 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java @@ -4,10 +4,12 @@ import android.graphics.Bitmap; import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.collection.LongSparseArray; -import android.view.View; + import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.annotations.Annotation; 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 bd54d33d9..24ffe199e 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 @@ -7,11 +7,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.View; import android.widget.ArrayAdapter; import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.R; @@ -34,7 +36,6 @@ import java.util.regex.Pattern; *

* When the user clicks the attribution icon, {@link AttributionDialogManager#onClick(View)} will be invoked. * An attribution dialog will be shown to the user with contents based on the attributions found in the map style. - * Additionally an telemetry option item is shown to configure telemetry settings. *

*/ public class AttributionDialogManager implements View.OnClickListener, DialogInterface.OnClickListener { @@ -87,14 +88,10 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt return titles.toArray(new String[titles.size()]); } - // Called when someone selects an attribution or telemetry settings from the dialog + // Called when someone selects an attribution from the dialog @Override public void onClick(DialogInterface dialog, int which) { - if (isLatestEntry(which)) { - showTelemetryDialog(); - } else { - showMapAttributionWebPage(which); - } + showMapAttributionWebPage(which); } public void onStop() { @@ -107,40 +104,6 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt return attributionKeyIndex == getAttributionTitles().length - 1; } - private void showTelemetryDialog() { - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.mapbox_attributionTelemetryTitle); - builder.setMessage(R.string.mapbox_attributionTelemetryMessage); - builder.setPositiveButton(R.string.mapbox_attributionTelemetryPositive, new DialogInterface.OnClickListener() { - @Override - public void onClick(@NonNull DialogInterface dialog, int which) { - TelemetryDefinition telemetry = Mapbox.getTelemetry(); - if (telemetry != null) { - telemetry.setUserTelemetryRequestState(true); - } - dialog.cancel(); - } - }); - builder.setNeutralButton(R.string.mapbox_attributionTelemetryNeutral, new DialogInterface.OnClickListener() { - @Override - public void onClick(@NonNull DialogInterface dialog, int which) { - showWebPage(context.getResources().getString(R.string.mapbox_telemetryLink)); - dialog.cancel(); - } - }); - builder.setNegativeButton(R.string.mapbox_attributionTelemetryNegative, new DialogInterface.OnClickListener() { - @Override - public void onClick(@NonNull DialogInterface dialog, int which) { - TelemetryDefinition telemetry = Mapbox.getTelemetry(); - if (telemetry != null) { - telemetry.setUserTelemetryRequestState(false); - } - dialog.cancel(); - } - }); - builder.show(); - } - private void showMapAttributionWebPage(int which) { Attribution[] attributions = attributionSet.toArray(new Attribution[attributionSet.size()]); String url = attributions[which].getUrl(); @@ -236,7 +199,6 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt return new AttributionParser.Options(context) .withCopyrightSign(true) .withImproveMap(true) - .withTelemetryAttribution(true) .withAttributionData(attributions.toArray(new String[attributions.size()])) .build().getAttributions(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java index 432f68a17..a9a05843c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.maps; import android.os.Handler; import android.os.Message; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java index 10a356047..6bda7752c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.Bitmap; import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.annotations.Icon; import com.mapbox.mapboxsdk.annotations.IconFactory; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java index 0f482b2d1..3527a39ae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/InfoWindowManager.java @@ -1,8 +1,9 @@ package com.mapbox.mapboxsdk.maps; -import androidx.annotation.Nullable; import android.text.TextUtils; +import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.annotations.InfoWindow; import com.mapbox.mapboxsdk.annotations.Marker; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index 36625035e..481063fd5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -3,13 +3,14 @@ package com.mapbox.mapboxsdk.maps; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.utils.MapFragmentUtils; import java.util.ArrayList; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java index 91e03b5f5..f58e16e0c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java @@ -7,14 +7,13 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.PointF; import android.os.Handler; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import android.view.InputDevice; import android.view.MotionEvent; import android.view.animation.DecelerateInterpolator; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.android.gestures.AndroidGesturesManager; import com.mapbox.android.gestures.MoveGestureDetector; import com.mapbox.android.gestures.MultiFingerTapGestureDetector; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java index 8ddb3bbf1..fbb128d4b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java @@ -3,12 +3,13 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.PointF; import android.os.Handler; import android.os.Looper; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.ViewConfiguration; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Manages key events on a MapView. *

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index a57f56164..de33e8fcf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -297,12 +297,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { */ @UiThread public void onCreate(@Nullable Bundle savedInstanceState) { - if (savedInstanceState == null) { - TelemetryDefinition telemetry = Mapbox.getTelemetry(); - if (telemetry != null) { - telemetry.onAppUserTurnstileEvent(); - } - } else if (savedInstanceState.getBoolean(MapboxConstants.STATE_HAS_SAVED_STATE)) { + if (savedInstanceState != null && savedInstanceState.getBoolean(MapboxConstants.STATE_HAS_SAVED_STATE)) { this.savedInstanceState = savedInstanceState; } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index e876f6ad6..19d72ed6b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -8,6 +8,13 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.View; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Size; +import androidx.annotation.UiThread; + import com.mapbox.android.gestures.AndroidGesturesManager; import com.mapbox.android.gestures.MoveGestureDetector; import com.mapbox.android.gestures.RotateGestureDetector; @@ -38,13 +45,6 @@ import com.mapbox.mapboxsdk.style.expressions.Expression; import java.util.ArrayList; import java.util.List; -import androidx.annotation.FloatRange; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.Size; -import androidx.annotation.UiThread; - /** * The general class to interact with in the Android Mapbox SDK. It exposes the entry point for all * methods related to the MapView. You cannot instantiate {@link MapboxMap} object directly, rather, diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index bb136bfbf..dd699c4cf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -7,6 +7,9 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.Gravity; import androidx.annotation.ColorInt; import androidx.annotation.IntRange; @@ -15,10 +18,6 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.core.content.res.ResourcesCompat; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.Gravity; - import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.constants.MapboxConstants; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java index 0358f36b9..92263bfda 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MarkerContainer.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.RectF; + import androidx.annotation.NonNull; import androidx.collection.LongSparseArray; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java index 311e74140..dcb85fa7c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Markers.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.RectF; + import androidx.annotation.NonNull; import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java index 2b93fa8c6..990dfde8f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMap.java @@ -4,6 +4,10 @@ import android.graphics.Bitmap; import android.graphics.PointF; import android.graphics.RectF; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.geojson.Feature; import com.mapbox.geojson.Geometry; import com.mapbox.mapboxsdk.annotations.Marker; @@ -21,10 +25,6 @@ import com.mapbox.mapboxsdk.style.sources.Source; import java.util.List; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - interface NativeMap { // diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 8ff484f10..91c6518ea 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -7,6 +7,11 @@ import android.graphics.RectF; import android.os.Handler; import android.text.TextUtils; +import androidx.annotation.IntRange; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapbox.geojson.Feature; import com.mapbox.geojson.Geometry; import com.mapbox.mapboxsdk.LibraryLoader; @@ -36,11 +41,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.annotation.IntRange; -import androidx.annotation.Keep; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - // Class that wraps the native methods for convenience final class NativeMapView implements NativeMap { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java index 7de543302..b4a497634 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.PointF; + import androidx.annotation.FloatRange; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java index fb06dee1b..b47597dad 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/ShapeAnnotationContainer.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.RectF; + import androidx.annotation.NonNull; import androidx.collection.LongSparseArray; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java index 67f9e3127..d767b5a28 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java @@ -6,6 +6,11 @@ import android.os.AsyncTask; import android.util.DisplayMetrics; import android.util.Pair; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; + import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.layers.TransitionOptions; @@ -23,11 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringDef; - /** * The proxy object for current map style. *

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index 33a0ee000..8fb03b896 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -2,14 +2,15 @@ package com.mapbox.mapboxsdk.maps; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.mapbox.mapboxsdk.utils.MapFragmentUtils; import java.util.ArrayList; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java deleted file mode 100644 index 863d821a1..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TelemetryDefinition.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.mapbox.mapboxsdk.maps; - -import android.os.Bundle; - -import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; - -/** - * Definition of TelemetryImpl collection. - * Use{@link TelemetryDefinition} for posting the event. - */ -public interface TelemetryDefinition { - - /** - * Register the app user turnstile event - */ - void onAppUserTurnstileEvent(); - - /** - * Register an end-user gesture interaction event. - * - * @param eventType type of gesture event occurred - * @param latitude the latitude value of the gesture focal point - * @param longitude the longitude value of the gesture focal point - * @param zoom current zoom of the map - * @deprecated since 7.5.0, this event is no longer supported - */ - @Deprecated - void onGestureInteraction(String eventType, double latitude, double longitude, double zoom); - - /** - * Set the end-user selected state to participate or opt-out in telemetry collection. - */ - void setUserTelemetryRequestState(boolean enabled); - - /** - * Disables a started telemetry service for this session only. - */ - void disableTelemetrySession(); - - /** - * Set the end-user selected state to participate or opt-out in telemetry collection. - */ - void setDebugLoggingEnabled(boolean debugLoggingEnabled); - - /** - * Set the telemetry rotation session id interval - * - * @param interval the selected session interval - * @return true if rotation session id was updated - */ - boolean setSessionIdRotationInterval(int interval); - - /** - * Register an end-user offline download event. - * - * @param offlineDefinition the offline region definition - */ - void onCreateOfflineRegion(OfflineRegionDefinition offlineDefinition); - - /** - * Register a performance event. - * - * @param data performance event data - */ - void onPerformanceEvent(Bundle data); -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java index 126daa336..0323591ae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.maps; import android.graphics.PointF; import android.os.Handler; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java index 08c4c9663..8381a7966 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/MapRenderer.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.maps.renderer; import android.content.Context; + import androidx.annotation.CallSuper; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java index be1adc5fd..eaa389f22 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/egl/EGLConfigChooser.java @@ -8,14 +8,14 @@ import androidx.annotation.NonNull; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.log.Logger; -import javax.microedition.khronos.egl.EGL10; -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.egl.EGLDisplay; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.microedition.khronos.egl.EGL10; +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.egl.EGLDisplay; + import static com.mapbox.mapboxsdk.utils.Compare.compare; import static javax.microedition.khronos.egl.EGL10.EGL_ALPHA_MASK_SIZE; import static javax.microedition.khronos.egl.EGL10.EGL_ALPHA_SIZE; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java index 36441842a..3fdcc01ac 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java @@ -1,9 +1,10 @@ package com.mapbox.mapboxsdk.maps.renderer.textureview; import android.content.Context; -import androidx.annotation.NonNull; import android.view.TextureView; +import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.maps.renderer.MapRenderer; import javax.microedition.khronos.egl.EGLConfig; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java index 9a4d72e03..e35d778ee 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewRenderThread.java @@ -1,13 +1,12 @@ package com.mapbox.mapboxsdk.maps.renderer.textureview; import android.graphics.SurfaceTexture; +import android.view.TextureView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import android.view.TextureView; - import com.mapbox.mapboxsdk.log.Logger; import com.mapbox.mapboxsdk.maps.renderer.egl.EGLConfigChooser; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java index 551aad36f..77e086482 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java @@ -2,15 +2,16 @@ package com.mapbox.mapboxsdk.maps.widgets; import android.content.Context; import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.core.view.ViewPropertyAnimatorCompat; import androidx.core.view.ViewPropertyAnimatorListenerAdapter; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; import com.mapbox.mapboxsdk.maps.MapboxMap; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java index e3199ed5a..bbd2ac8dd 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java @@ -4,6 +4,10 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import com.mapbox.mapboxsdk.BuildConfig; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.http.HttpIdentifier; @@ -21,9 +25,6 @@ import java.net.UnknownHostException; import javax.net.ssl.SSLException; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; import okhttp3.Call; import okhttp3.Callback; import okhttp3.Dispatcher; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java index 25a96f759..e2ac8ffde 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.module.http; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import okhttp3.OkHttpClient; import okio.Buffer; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java deleted file mode 100644 index 130217fea..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapBaseEvent.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.annotation.SuppressLint; -import android.os.Parcel; - -import com.mapbox.android.telemetry.Event; - -/** - * Base event class for telemetry events. - */ -@SuppressLint("ParcelCreator") -abstract class MapBaseEvent extends Event { - private final String event; - private final String created; - - MapBaseEvent(PhoneState phoneState) { - this.event = getEventName(); - this.created = phoneState.getCreated(); - } - - abstract String getEventName(); - - String getEvent() { - return event; - } - - String getCreated() { - return created; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - } -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java deleted file mode 100644 index 1a4419a20..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapEventFactory.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.os.Bundle; -import androidx.annotation.FloatRange; -import androidx.annotation.NonNull; - -import com.mapbox.android.telemetry.TelemetryUtils; -import com.mapbox.mapboxsdk.constants.MapboxConstants; -import com.mapbox.mapboxsdk.offline.OfflineRegion; - -class MapEventFactory { - - static MapLoadEvent buildMapLoadEvent(@NonNull PhoneState phoneState) { - String userId = TelemetryUtils.retrieveVendorId(); - return new MapLoadEvent(userId, phoneState); - } - - static OfflineDownloadStartEvent buildOfflineDownloadStartEvent(PhoneState phoneState, - String shapeForOfflineRegion, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double minZoom, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double maxZoom, - String styleURL) { - - OfflineDownloadStartEvent offlineEvent = - new OfflineDownloadStartEvent(phoneState, shapeForOfflineRegion, minZoom, maxZoom); - offlineEvent.setStyleURL(styleURL); - return offlineEvent; - } - - static OfflineDownloadEndEvent buildOfflineDownloadCompleteEvent(PhoneState phoneState, - String shapeForOfflineRegion, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double minZoom, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double maxZoom, - String styleURL, - long sizeOfResourcesCompleted, - long numberOfTilesCompleted, - @OfflineRegion.DownloadState int state) { - - OfflineDownloadEndEvent offlineEvent = - new OfflineDownloadEndEvent(phoneState, shapeForOfflineRegion, minZoom, maxZoom); - offlineEvent.setStyleURL(styleURL); - offlineEvent.setSizeOfResourcesCompleted(sizeOfResourcesCompleted); - offlineEvent.setNumberOfTilesCompleted(numberOfTilesCompleted); - offlineEvent.setState(state); - return offlineEvent; - } - - static PerformanceEvent buildPerformanceEvent(@NonNull PhoneState phoneState, @NonNull String sessionId, - @NonNull Bundle data) { - return new PerformanceEvent(phoneState, sessionId, data); - } - -} \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java deleted file mode 100644 index b12a10b8c..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.annotation.SuppressLint; -import android.os.Build; - -import com.mapbox.mapboxsdk.BuildConfig; - -/** - * Event will be sent while map is loaded. - */ -@SuppressLint("ParcelCreator") -class MapLoadEvent extends MapBaseEvent { - private static final String EVENT_NAME = "map.load"; - private final String operatingSystem = "Android - " + Build.VERSION.RELEASE; - private final String sdkIdentifier = BuildConfig.MAPBOX_SDK_IDENTIFIER; - private final String sdkVersion = BuildConfig.MAPBOX_SDK_VERSION; - private final String model = Build.MODEL; - private final String userId; - private final String carrier; - private final String cellularNetworkType; - private final String orientation; - private final float resolution; - private final float accessibilityFontScale; - private final int batteryLevel; - private final boolean pluggedIn; - private final boolean wifi; - - MapLoadEvent(String userId, PhoneState phoneState) { - super(phoneState); - this.userId = userId; - this.batteryLevel = phoneState.getBatteryLevel(); - this.pluggedIn = phoneState.isPluggedIn(); - this.cellularNetworkType = phoneState.getCellularNetworkType(); - this.carrier = phoneState.getCarrier(); - this.resolution = phoneState.getResolution(); - this.accessibilityFontScale = phoneState.getAccessibilityFontScale(); - this.wifi = phoneState.isWifi(); - this.orientation = phoneState.getOrientation(); - } - - @Override - String getEventName() { - return EVENT_NAME; - } - - String getOperatingSystem() { - return operatingSystem; - } - - String getSdkIdentifier() { - return sdkIdentifier; - } - - String getSdkVersion() { - return sdkVersion; - } - - String getModel() { - return model; - } - - String getUserId() { - return userId; - } - - String getCarrier() { - return carrier; - } - - String getCellularNetworkType() { - return cellularNetworkType; - } - - String getOrientation() { - return orientation; - } - - float getResolution() { - return resolution; - } - - float getAccessibilityFontScale() { - return accessibilityFontScale; - } - - int getBatteryLevel() { - return batteryLevel; - } - - boolean isPluggedIn() { - return pluggedIn; - } - - boolean isWifi() { - return wifi; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - MapLoadEvent that = (MapLoadEvent) o; - - if (Float.compare(that.resolution, resolution) != 0) { - return false; - } - if (Float.compare(that.accessibilityFontScale, accessibilityFontScale) != 0) { - return false; - } - if (batteryLevel != that.batteryLevel) { - return false; - } - if (pluggedIn != that.pluggedIn) { - return false; - } - if (wifi != that.wifi) { - return false; - } - if (!operatingSystem.equals(that.operatingSystem)) { - return false; - } - if (model != null ? !model.equals(that.model) : that.model != null) { - return false; - } - if (userId != null ? !userId.equals(that.userId) : that.userId != null) { - return false; - } - if (carrier != null ? !carrier.equals(that.carrier) : that.carrier != null) { - return false; - } - if (cellularNetworkType != null ? !cellularNetworkType.equals(that.cellularNetworkType) : - that.cellularNetworkType != null) { - return false; - } - return orientation != null ? orientation.equals(that.orientation) : that.orientation == null; - } - - @Override - public int hashCode() { - int result = operatingSystem != null ? operatingSystem.hashCode() : 0; - result = 31 * result + sdkIdentifier.hashCode(); - result = 31 * result + sdkVersion.hashCode(); - result = 31 * result + (model != null ? model.hashCode() : 0); - result = 31 * result + (userId != null ? userId.hashCode() : 0); - result = 31 * result + (carrier != null ? carrier.hashCode() : 0); - result = 31 * result + (cellularNetworkType != null ? cellularNetworkType.hashCode() : 0); - result = 31 * result + (orientation != null ? orientation.hashCode() : 0); - result = 31 * result + (resolution != +0.0f ? Float.floatToIntBits(resolution) : 0); - result = 31 * result + (accessibilityFontScale != +0.0f ? Float.floatToIntBits(accessibilityFontScale) : 0); - result = 31 * result + batteryLevel; - result = 31 * result + (pluggedIn ? 1 : 0); - result = 31 * result + (wifi ? 1 : 0); - return result; - } - - @Override - public String toString() { - return "MapLoadEvent{" - + ", operatingSystem='" + operatingSystem + '\'' - + ", sdkIdentifier='" + sdkIdentifier + '\'' - + ", sdkVersion='" + sdkVersion + '\'' - + ", model='" + model + '\'' - + ", userId='" + userId + '\'' - + ", carrier='" + carrier + '\'' - + ", cellularNetworkType='" + cellularNetworkType + '\'' - + ", orientation='" + orientation + '\'' - + ", resolution=" + resolution - + ", accessibilityFontScale=" + accessibilityFontScale - + ", batteryLevel=" + batteryLevel - + ", pluggedIn=" + pluggedIn - + ", wifi=" + wifi - + '}'; - } -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java deleted file mode 100644 index 0a85b143a..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadEndEvent.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.annotation.SuppressLint; -import androidx.annotation.FloatRange; - -import com.mapbox.mapboxsdk.constants.MapboxConstants; -import com.mapbox.mapboxsdk.offline.OfflineRegion; - -/** - * Event will be sent while offline download end. - */ -@SuppressLint("ParcelCreator") -public class OfflineDownloadEndEvent extends MapBaseEvent { - private static final String EVENT_NAME = "map.offlineDownload.end"; - private final Double minZoom; - private final Double maxZoom; - private final String shapeForOfflineRegion; - private String styleURL; - private String state; - private long sizeOfResourcesCompleted; - private long numberOfTilesCompleted; - - OfflineDownloadEndEvent(PhoneState phoneState, String shapeForOfflineRegion, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double minZoom, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double maxZoom) { - super(phoneState); - this.shapeForOfflineRegion = shapeForOfflineRegion; - this.minZoom = minZoom; - this.maxZoom = maxZoom; - } - - @Override - String getEventName() { - return EVENT_NAME; - } - - Double getMinZoom() { - return minZoom; - } - - Double getMaxZoom() { - return maxZoom; - } - - String getShapeForOfflineRegion() { - return shapeForOfflineRegion; - } - - String getStyleURL() { - return styleURL; - } - - void setStyleURL(String styleURL) { - this.styleURL = styleURL; - } - - long getSizeOfResourcesCompleted() { - return sizeOfResourcesCompleted; - } - - void setSizeOfResourcesCompleted(long sizeOfResourcesCompleted) { - this.sizeOfResourcesCompleted = sizeOfResourcesCompleted; - } - - long getNumberOfTilesCompleted() { - return numberOfTilesCompleted; - } - - void setNumberOfTilesCompleted(long numberOfTilesCompleted) { - this.numberOfTilesCompleted = numberOfTilesCompleted; - } - - String getState() { - return state; - } - - void setState(@OfflineRegion.DownloadState int state) { - this.state = String.valueOf(state); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - OfflineDownloadEndEvent that = (OfflineDownloadEndEvent) o; - - if (sizeOfResourcesCompleted != that.sizeOfResourcesCompleted) { - return false; - } - if (numberOfTilesCompleted != that.numberOfTilesCompleted) { - return false; - } - if (minZoom != null ? !minZoom.equals(that.minZoom) : that.minZoom != null) { - return false; - } - if (maxZoom != null ? !maxZoom.equals(that.maxZoom) : that.maxZoom != null) { - return false; - } - if (shapeForOfflineRegion != null ? !shapeForOfflineRegion.equals(that.shapeForOfflineRegion) - : that.shapeForOfflineRegion != null) { - return false; - } - if (styleURL != null ? !styleURL.equals(that.styleURL) : that.styleURL != null) { - return false; - } - return state != null ? state.equals(that.state) : that.state == null; - } - - @Override - public int hashCode() { - int result = minZoom != null ? minZoom.hashCode() : 0; - result = 31 * result + (maxZoom != null ? maxZoom.hashCode() : 0); - result = 31 * result + (shapeForOfflineRegion != null ? shapeForOfflineRegion.hashCode() : 0); - result = 31 * result + (styleURL != null ? styleURL.hashCode() : 0); - result = 31 * result + (state != null ? state.hashCode() : 0); - result = 31 * result + (int) (sizeOfResourcesCompleted ^ (sizeOfResourcesCompleted >>> 32)); - result = 31 * result + (int) (numberOfTilesCompleted ^ (numberOfTilesCompleted >>> 32)); - return result; - } - - @Override - public String toString() { - return "OfflineDownloadEndEvent{" - + ", minZoom=" + minZoom - + ", maxZoom=" + maxZoom - + ", shapeForOfflineRegion='" + shapeForOfflineRegion + '\'' - + ", styleURL='" + styleURL + '\'' - + ", sizeOfResourcesCompleted=" + sizeOfResourcesCompleted - + ", numberOfTilesCompleted=" + numberOfTilesCompleted - + ", state=" + state - + '}'; - } -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java deleted file mode 100644 index 31f41ffc7..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/OfflineDownloadStartEvent.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.annotation.SuppressLint; -import androidx.annotation.FloatRange; - -import com.mapbox.mapboxsdk.constants.MapboxConstants; - -/** - * Event will be sent while offline download start. - */ -@SuppressLint("ParcelCreator") -public class OfflineDownloadStartEvent extends MapBaseEvent { - private static final String EVENT_NAME = "map.offlineDownload.start"; - private final Double minZoom; - private final Double maxZoom; - private final String shapeForOfflineRegion; - private String styleURL; - - OfflineDownloadStartEvent(PhoneState phoneState, String shapeForOfflineRegion, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double minZoom, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) Double maxZoom) { - super(phoneState); - this.shapeForOfflineRegion = shapeForOfflineRegion; - this.minZoom = minZoom; - this.maxZoom = maxZoom; - } - - @Override - String getEventName() { - return EVENT_NAME; - } - - Double getMinZoom() { - return minZoom; - } - - Double getMaxZoom() { - return maxZoom; - } - - String getShapeForOfflineRegion() { - return shapeForOfflineRegion; - } - - String getStyleURL() { - return styleURL; - } - - void setStyleURL(String styleURL) { - this.styleURL = styleURL; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - OfflineDownloadStartEvent that = (OfflineDownloadStartEvent) o; - - if (minZoom != null ? !minZoom.equals(that.minZoom) : that.minZoom != null) { - return false; - } - if (maxZoom != null ? !maxZoom.equals(that.maxZoom) : that.maxZoom != null) { - return false; - } - if (shapeForOfflineRegion != null ? !shapeForOfflineRegion.equals(that.shapeForOfflineRegion) : - that.shapeForOfflineRegion != null) { - return false; - } - return styleURL != null ? styleURL.equals(that.styleURL) : that.styleURL == null; - } - - @Override - public int hashCode() { - int result = minZoom != null ? minZoom.hashCode() : 0; - result = 31 * result + (maxZoom != null ? maxZoom.hashCode() : 0); - result = 31 * result + (shapeForOfflineRegion != null ? shapeForOfflineRegion.hashCode() : 0); - result = 31 * result + (styleURL != null ? styleURL.hashCode() : 0); - return result; - } - - @Override - public String toString() { - return "OfflineDownloadStartEvent{" - + ", minZoom=" + minZoom - + ", maxZoom=" + maxZoom - + ", shapeForOfflineRegion='" + shapeForOfflineRegion + '\'' - + ", styleURL='" + styleURL + '\'' - + '}'; - } - -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java deleted file mode 100644 index 81079c2d9..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PerformanceEvent.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.annotation.SuppressLint; -import android.os.Bundle; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generic Performance Event that can be used for performance measurements. - * Customer measurements can be added to the bundle. - *

- * Bundle is expected to have following properties: - * "attributes", "counters", and "metadata" with String values. - *

- *

- * Attributes: a string representing an array of name/string value pair objects. - * Counters: a string representing an array of name/number value pair objects. - * Metadata is a string representation of a JsonObject with string values. - *

- *

- * Here is an example of a Performance event bundle data: - *

- *

- * "attributes": [{ "name": "style_id", "value": "mapbox://styles/mapbox/streets-v10"}] - *

- *

- * "counters": [{"name": "fps_average", "value": 90.7655486547093}, - * {"name": "fps_deviation", "value": 29.301809631465574}] - * “metadata”: { - * “version”: “9”, - * “screenSize”: “1080x1794”, - * “country”: “US”, - * “device”: “Pixel 2”, - * “abi”: “arm64-v8a”, - * “brand”: “google”, - * “ram”: “3834167296”, - * “os”: “android”, - * “gpu”: “Qualcomm, Adreno (TM) 540, OpenGL ES 3.2 V@313.0 (GIT@7bf2852, Ie32bfa6f6f)“, - * “manufacturer”: “Google” - * } - *

- */ -@SuppressLint("ParcelCreator") -class PerformanceEvent extends MapBaseEvent { - private static final String PERFORMANCE_TRACE = "mobile.performance_trace"; - private final String sessionId; - private final List> attributes; - private final List> counters; - private final JsonObject metadata; - - PerformanceEvent(PhoneState phoneState, String sessionId, Bundle bundle) { - super(phoneState); - this.sessionId = sessionId; - this.attributes = initList(bundle.getString("attributes"), - new TypeToken>>() { - }); - this.counters = initList(bundle.getString("counters"), - new TypeToken>>() { - }); - this.metadata = initMetaData(bundle.getString("metadata")); - } - - private ArrayList> initList(String fromString, TypeToken typeToken) { - if (fromString == null || fromString.isEmpty()) { - return new ArrayList<>(); - } - return new Gson().fromJson(fromString, typeToken.getType()); - } - - private JsonObject initMetaData(String fromString) { - if (fromString == null) { - return new JsonObject(); - } else { - return new Gson().fromJson(fromString, JsonObject.class); - } - } - - @Override - String getEventName() { - return PERFORMANCE_TRACE; - } - - String getSessionId() { - return sessionId; - } - - List> getAttributes() { - return attributes; - } - - List> getCounters() { - return counters; - } - - JsonObject getMetadata() { - return metadata; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - PerformanceEvent that = (PerformanceEvent) o; - - if (sessionId != null ? !sessionId.equals(that.sessionId) : that.sessionId != null) { - return false; - } - if (attributes != null ? !attributes.equals(that.attributes) : that.attributes != null) { - return false; - } - if (counters != null ? !counters.equals(that.counters) : that.counters != null) { - return false; - } - return metadata != null ? metadata.equals(that.metadata) : that.metadata == null; - } - - @Override - public int hashCode() { - int result = sessionId != null ? sessionId.hashCode() : 0; - result = 31 * result + (attributes != null ? attributes.hashCode() : 0); - result = 31 * result + (counters != null ? counters.hashCode() : 0); - result = 31 * result + (metadata != null ? metadata.hashCode() : 0); - return result; - } - - @Override - public String toString() { - return "PerformanceEvent{" - + "sessionId='" + sessionId + '\'' - + ", attributes=" + attributes - + ", counters=" + counters - + ", metadata=" + metadata - + '}'; - } - - static class PerformanceAttribute { - private final String name; - private final T value; - - PerformanceAttribute(String name, T value) { - this.name = name; - this.value = value; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - PerformanceAttribute that = (PerformanceAttribute) o; - - if (name != null ? !name.equals(that.name) : that.name != null) { - return false; - } - return value != null ? value.equals(that.value) : that.value == null; - } - - @Override - public int hashCode() { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + (value != null ? value.hashCode() : 0); - return result; - } - } -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java deleted file mode 100644 index ec0e1e17a..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/PhoneState.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.content.Context; -import android.content.res.Configuration; -import android.net.wifi.WifiInfo; -import android.net.wifi.WifiManager; -import androidx.annotation.NonNull; -import android.telephony.TelephonyManager; -import android.text.TextUtils; -import android.util.DisplayMetrics; -import android.view.WindowManager; - -import com.mapbox.android.telemetry.TelemetryUtils; - -/** - * Class that holds kinds of states of the current phone. - */ -class PhoneState { - private static final String NO_CARRIER = "EMPTY_CARRIER"; - private static final int NO_NETWORK = -1; - private String created; - private String cellularNetworkType; - private Orientation orientation; - private String carrier; - private int batteryLevel; - private boolean pluggedIn; - private boolean wifi; - private float accessibilityFontScale; - private float resolution; - - PhoneState() { - - } - - PhoneState(@NonNull Context context) { - this.created = TelemetryUtils.obtainCurrentDate(); - this.batteryLevel = TelemetryUtils.obtainBatteryLevel(context); - this.pluggedIn = TelemetryUtils.isPluggedIn(context); - this.cellularNetworkType = TelemetryUtils.obtainCellularNetworkType(context); - this.orientation = Orientation.getOrientation(context.getResources().getConfiguration().orientation); - this.accessibilityFontScale = context.getResources().getConfiguration().fontScale; - this.carrier = obtainCellularCarrier(context); - this.resolution = obtainDisplayDensity(context); - this.wifi = isConnectedToWifi(context); - } - - private String obtainCellularCarrier(@NonNull Context context) { - TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - if (manager == null) { - return NO_CARRIER; - } - String carrierName = manager.getNetworkOperatorName(); - if (TextUtils.isEmpty(carrierName)) { - return NO_CARRIER; - } - return carrierName; - } - - private float obtainDisplayDensity(@NonNull Context context) { - DisplayMetrics displayMetrics = new DisplayMetrics(); - ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getMetrics(displayMetrics); - return displayMetrics.density; - } - - private boolean isConnectedToWifi(@NonNull Context context) { - try { - WifiManager wifiMgr = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE); - if (wifiMgr == null) { - return false; - } - //noinspection MissingPermission - WifiInfo wifiInfo = wifiMgr.getConnectionInfo(); - return wifiMgr.isWifiEnabled() && wifiInfo.getNetworkId() != NO_NETWORK; - } catch (Exception exception) { - return false; - } - } - - String getCreated() { - return created; - } - - void setCreated(String created) { - this.created = created; - } - - int getBatteryLevel() { - return batteryLevel; - } - - void setBatteryLevel(int batteryLevel) { - this.batteryLevel = batteryLevel; - } - - boolean isPluggedIn() { - return pluggedIn; - } - - void setPluggedIn(boolean pluggedIn) { - this.pluggedIn = pluggedIn; - } - - String getCellularNetworkType() { - return cellularNetworkType; - } - - void setCellularNetworkType(String cellularNetworkType) { - this.cellularNetworkType = cellularNetworkType; - } - - String getOrientation() { - return orientation.getOrientation(); - } - - void setOrientation(Orientation orientation) { - this.orientation = orientation; - } - - String getCarrier() { - return carrier; - } - - void setCarrier(String carrier) { - this.carrier = carrier; - } - - boolean isWifi() { - return wifi; - } - - void setWifi(boolean wifi) { - this.wifi = wifi; - } - - float getAccessibilityFontScale() { - return accessibilityFontScale; - } - - void setAccessibilityFontScale(float accessibilityFontScale) { - this.accessibilityFontScale = accessibilityFontScale; - } - - float getResolution() { - return resolution; - } - - void setResolution(float resolution) { - this.resolution = resolution; - } - - enum Orientation { - ORIENTATION_PORTRAIT("Portrait"), - ORIENTATION_LANDSCAPE("Landscape"); - private String orientation; - - Orientation(String orientation) { - this.orientation = orientation; - } - - public static Orientation getOrientation(int index) { - if (Configuration.ORIENTATION_PORTRAIT == index) { - return ORIENTATION_PORTRAIT; - } - return ORIENTATION_LANDSCAPE; - } - - public String getOrientation() { - return orientation; - } - } -} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java deleted file mode 100644 index 0b0a26254..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/TelemetryImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.mapbox.mapboxsdk.module.telemetry; - -import android.content.Context; -import android.os.Bundle; -import androidx.annotation.FloatRange; -import androidx.annotation.NonNull; - -import com.mapbox.android.accounts.v1.MapboxAccounts; -import com.mapbox.android.telemetry.AppUserTurnstile; -import com.mapbox.android.telemetry.MapboxTelemetry; -import com.mapbox.android.telemetry.SessionInterval; -import com.mapbox.android.telemetry.TelemetryEnabler; -import com.mapbox.mapboxsdk.BuildConfig; -import com.mapbox.mapboxsdk.Mapbox; -import com.mapbox.mapboxsdk.constants.MapboxConstants; -import com.mapbox.mapboxsdk.maps.TelemetryDefinition; -import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition; - -import java.util.UUID; - -public class TelemetryImpl implements TelemetryDefinition { - - private final MapboxTelemetry telemetry; - private final Context appContext; - - public TelemetryImpl() { - appContext = Mapbox.getApplicationContext(); - String accessToken = Mapbox.getAccessToken(); - telemetry = new MapboxTelemetry(appContext, accessToken, BuildConfig.MAPBOX_EVENTS_USER_AGENT); - TelemetryEnabler.State telemetryState = TelemetryEnabler.retrieveTelemetryStateFromPreferences(); - if (TelemetryEnabler.State.ENABLED.equals(telemetryState)) { - telemetry.enable(); - } - } - - /** - * Register the app user turnstile event - */ - @Override - public void onAppUserTurnstileEvent() { - AppUserTurnstile turnstileEvent = new AppUserTurnstile(BuildConfig.MAPBOX_SDK_IDENTIFIER, - BuildConfig.MAPBOX_SDK_VERSION); - turnstileEvent.setSkuId(MapboxAccounts.SKU_ID_MAPS_MAUS); - telemetry.push(turnstileEvent); - telemetry.push(MapEventFactory.buildMapLoadEvent(new PhoneState(appContext))); - } - - /** - * Register an end-user gesture interaction event. - * - * @param eventType type of gesture event occurred - * @param latitude the latitude value of the gesture focal point - * @param longitude the longitude value of the gesture focal point - * @param zoom current zoom of the map - * @deprecated since 7.5.0, this event is no longer supported - */ - @Deprecated - @Override - public void onGestureInteraction(String eventType, double latitude, double longitude, - @FloatRange(from = MapboxConstants.MINIMUM_ZOOM, - to = MapboxConstants.MAXIMUM_ZOOM) double zoom) { - //no-op - } - - /** - * Set the end-user selected state to participate or opt-out in telemetry collection. - * - * @param enabledTelemetry true if enabled, false otherwise - */ - @Override - public void setUserTelemetryRequestState(boolean enabledTelemetry) { - if (enabledTelemetry) { - TelemetryEnabler.updateTelemetryState(TelemetryEnabler.State.ENABLED); - telemetry.enable(); - } else { - telemetry.disable(); - TelemetryEnabler.updateTelemetryState(TelemetryEnabler.State.DISABLED); - } - } - - @Override - public void disableTelemetrySession() { - telemetry.disable(); - } - - /** - * Set the debug logging state of telemetry. - * - * @param debugLoggingEnabled true to enable logging - */ - @Override - public void setDebugLoggingEnabled(boolean debugLoggingEnabled) { - telemetry.updateDebugLoggingEnabled(debugLoggingEnabled); - } - - /** - * Set the telemetry rotation session id interval - * - * @param interval the selected session interval - * @return true if rotation session id was updated - */ - @Override - public boolean setSessionIdRotationInterval(int interval) { - return telemetry.updateSessionIdRotationInterval(new SessionInterval(interval)); - } - - /** - * Register an offline region creation event. - * - * @param offlineDefinition the offline region definition - */ - @Override - public void onCreateOfflineRegion(@NonNull OfflineRegionDefinition offlineDefinition) { - telemetry.push(MapEventFactory.buildOfflineDownloadStartEvent(new PhoneState(appContext), - offlineDefinition instanceof OfflineTilePyramidRegionDefinition ? "tileregion" : "shaperegion", - offlineDefinition.getMinZoom(), - offlineDefinition.getMaxZoom(), - offlineDefinition.getStyleURL()) - ); - } - - /** - * Register a performance event - * - * @param data performance event data - */ - @Override - public void onPerformanceEvent(Bundle data) { - if (data == null) { - data = new Bundle(); - } - telemetry.push(MapEventFactory.buildPerformanceEvent(new PhoneState(appContext), - UUID.randomUUID().toString(), data)); - } -} \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java deleted file mode 100644 index c77612bed..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains the Mapbox Maps Android Modular Telemetry API classes. - */ -package com.mapbox.mapboxsdk.module.telemetry; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java index 632b519f8..27e222317 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/net/ConnectivityReceiver.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java index 0fec147ee..47aa36837 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.offline; import android.os.Parcel; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java index 5d0d33da3..da199f931 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java @@ -4,16 +4,15 @@ import android.annotation.SuppressLint; import android.content.Context; import android.os.Handler; import android.os.Looper; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; import com.mapbox.mapboxsdk.LibraryLoader; -import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.geometry.LatLngBounds; -import com.mapbox.mapboxsdk.maps.TelemetryDefinition; import com.mapbox.mapboxsdk.net.ConnectivityReceiver; import com.mapbox.mapboxsdk.storage.FileSource; import com.mapbox.mapboxsdk.utils.FileUtils; @@ -642,12 +641,6 @@ public class OfflineManager { }); } }); - - TelemetryDefinition telemetry = Mapbox.getTelemetry(); - if (telemetry != null) { - LatLngBounds bounds = definition.getBounds(); - telemetry.onCreateOfflineRegion(definition); - } } /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java index 994c68ab5..b54fa99f0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java @@ -3,10 +3,12 @@ package com.mapbox.mapboxsdk.offline; import android.content.Context; import android.os.Handler; import android.os.Looper; + import androidx.annotation.IntDef; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.LibraryLoader; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.net.ConnectivityReceiver; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java index 1b29800c3..6239a8864 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionDefinition.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.offline; import android.os.Parcelable; + import androidx.annotation.Keep; import com.mapbox.mapboxsdk.geometry.LatLngBounds; @@ -63,7 +64,7 @@ public interface OfflineRegionDefinition extends Parcelable { boolean getIncludeIdeographs(); /** - * Gets the type of the OfflineRegionDefinition for telemetry ("tileregion", "shaperegion"). + * Gets the type of the OfflineRegionDefinition ("tileregion", "shaperegion"). * * @return The type of the OfflineRegionDefinition. */ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java index 67d1744f4..055bfd33a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.offline; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java index 46faf8bd2..1e4aba443 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshot.java @@ -2,9 +2,10 @@ package com.mapbox.mapboxsdk.snapshotter; import android.graphics.Bitmap; import android.graphics.PointF; -import androidx.annotation.Keep; +import androidx.annotation.Keep; import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.geometry.LatLng; /** 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 40a8532e9..d3e71f74e 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 @@ -14,7 +14,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.mapbox.mapboxsdk.Mapbox; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.core.content.res.ResourcesCompat; + import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.attribution.AttributionLayout; import com.mapbox.mapboxsdk.attribution.AttributionMeasure; @@ -25,19 +30,12 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.log.Logger; import com.mapbox.mapboxsdk.maps.Image; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.maps.TelemetryDefinition; import com.mapbox.mapboxsdk.storage.FileSource; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.sources.Source; import com.mapbox.mapboxsdk.utils.FontUtils; import com.mapbox.mapboxsdk.utils.ThreadUtils; -import androidx.annotation.Keep; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.UiThread; -import androidx.core.content.res.ResourcesCompat; - import static com.mapbox.mapboxsdk.maps.Style.toImage; /** @@ -391,10 +389,7 @@ public class MapSnapshotter { checkThread(); this.context = context.getApplicationContext(); this.options = options; - TelemetryDefinition telemetry = Mapbox.getTelemetry(); - if (telemetry != null) { - telemetry.onAppUserTurnstileEvent(); - } + FileSource fileSource = FileSource.getInstance(context); String apiBaseUrl = options.getApiBaseUrl(); if (!TextUtils.isEmpty(apiBaseUrl)) { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java index 363e38157..c433e1819 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java @@ -6,10 +6,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.AsyncTask; import android.os.Environment; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; + import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.constants.MapboxConstants; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index 0a0f62afd..cc965a1fe 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -2,6 +2,11 @@ package com.mapbox.mapboxsdk.style.expressions; import android.annotation.SuppressLint; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Size; + import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -9,11 +14,6 @@ import com.google.gson.JsonNull; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.GeoJson; -import com.mapbox.geojson.LineString; -import com.mapbox.geojson.MultiLineString; -import com.mapbox.geojson.MultiPoint; -import com.mapbox.geojson.MultiPolygon; -import com.mapbox.geojson.Point; import com.mapbox.geojson.Polygon; import com.mapbox.geojson.gson.GeometryGeoJson; import com.mapbox.mapboxsdk.style.layers.PropertyFactory; @@ -26,11 +26,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.Size; - import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaArray; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java index 6870e6537..6d27ed9d2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java @@ -5,16 +5,10 @@ package com.mapbox.mapboxsdk.style.layers; import androidx.annotation.ColorInt; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; - /** * The background color or pattern of the map. * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java index 2f2d8325f..563fb15ca 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java @@ -8,12 +8,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A filled circle. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java index 841a4b35d..f42d94253 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java @@ -8,12 +8,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * An extruded (3D) polygon. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java index 38de5d56a..172b5f447 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java @@ -8,12 +8,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A filled polygon with an optional stroked border. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java index fce946ffe..bc22446dc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java @@ -8,12 +8,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A heatmap. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java index 0342a35cf..42b1f5f8b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java @@ -5,16 +5,10 @@ package com.mapbox.mapboxsdk.style.layers; import androidx.annotation.ColorInt; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.UiThread; import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; - /** * Client-side hillshading visualization based on DEM data. Currently, the implementation only supports Mapbox Terrain RGB and Mapzen Terrarium tiles. * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java index c84291cd7..9ca8e8a1b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.LibraryLoader; import com.mapbox.mapboxsdk.style.expressions.Expression; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java index 00b07f792..41ae07dcc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java @@ -8,12 +8,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * A stroked line. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java index cb9aa5805..fbb47b5da 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java @@ -6,6 +6,7 @@ import androidx.annotation.ColorInt; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.style.types.Formatted; + import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java index 871ac36f9..b56ab86c9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.style.layers; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.google.gson.JsonArray; import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.exceptions.ConversionException; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java index 82f1a0771..5acf544ad 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java @@ -2,19 +2,10 @@ package com.mapbox.mapboxsdk.style.layers; -import androidx.annotation.ColorInt; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; - /** * Raster map textures such as satellite imagery. * diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java index 1355458b7..ee296a16d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -8,14 +8,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; - -import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.mapbox.mapboxsdk.style.expressions.Expression; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.style.types.Formatted; -import com.mapbox.mapboxsdk.style.types.FormattedSection; + +import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor; /** * An icon or a text label. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java index 58997b6e1..ea34b0dc0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonOptions.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.style.sources; import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.style.expressions.Expression; import java.util.HashMap; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java index 286d90e8f..85216e931 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java @@ -4,6 +4,7 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; + import com.mapbox.geojson.Feature; import com.mapbox.geojson.FeatureCollection; import com.mapbox.geojson.Geometry; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java index 09cbb8584..0fc393fae 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/ImageSource.java @@ -4,11 +4,13 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; + import androidx.annotation.DrawableRes; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; + import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.geometry.LatLngQuad; import com.mapbox.mapboxsdk.utils.BitmapUtils; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java index 4686deee9..a0ef6b985 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java @@ -1,12 +1,12 @@ package com.mapbox.mapboxsdk.style.sources; -import com.mapbox.mapboxsdk.LibraryLoader; -import com.mapbox.mapboxsdk.utils.ThreadUtils; - import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.mapbox.mapboxsdk.LibraryLoader; +import com.mapbox.mapboxsdk.utils.ThreadUtils; + /** * Base Peer class for sources. see source.hpp for the other half of the peer. */ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java index def63df29..6c48715c0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/VectorSource.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.style.sources; import android.net.Uri; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java index 751ec0d02..dca6c6e8d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java @@ -1,10 +1,11 @@ package com.mapbox.mapboxsdk.text; +import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.Bitmap; import android.graphics.Typeface; + import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java index 4e0125eb8..2fe4a419b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/AnimatorUtils.java @@ -4,11 +4,12 @@ import android.animation.Animator; import android.animation.AnimatorInflater; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; +import android.view.View; + import androidx.annotation.AnimatorRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import android.view.View; /** * Animator utility class. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java index 195f8ad89..b8403d3f8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java @@ -8,12 +8,13 @@ import android.graphics.PorterDuff; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; +import android.view.View; + import androidx.annotation.ColorInt; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import android.view.View; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index f33c25701..bb75efb03 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -5,11 +5,12 @@ import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.Color; import android.os.Build; +import android.util.TypedValue; +import android.widget.ImageView; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.core.widget.ImageViewCompat; -import android.util.TypedValue; -import android.widget.ImageView; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.exceptions.ConversionException; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java index f1d30354c..972c9c0bf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FileUtils.java @@ -1,6 +1,7 @@ package com.mapbox.mapboxsdk.utils; import android.os.AsyncTask; + import androidx.annotation.NonNull; import com.mapbox.mapboxsdk.log.Logger; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java index c22cb9de7..42f36da30 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/FontUtils.java @@ -2,7 +2,9 @@ package com.mapbox.mapboxsdk.utils; import android.graphics.Typeface; import android.os.Build; + import androidx.annotation.RequiresApi; + import com.mapbox.mapboxsdk.MapStrictMode; import com.mapbox.mapboxsdk.log.Logger; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java index cdd0ff492..1f4ab252f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/MapFragmentUtils.java @@ -5,6 +5,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.maps.MapboxMapOptions; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java index 4b724d68e..99e543a1a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ThreadUtils.java @@ -3,7 +3,9 @@ package com.mapbox.mapboxsdk.utils; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Looper; + import androidx.annotation.NonNull; + import com.mapbox.mapboxsdk.exceptions.CalledFromWorkerThreadException; /** diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index a5e759f6c..95dbebdd8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -95,12 +95,6 @@ - - - - - - diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml index 262e94f36..0b0b1ebe3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-bg/strings.xml @@ -5,11 +5,6 @@ Изглед локация. Това показва местоположението ти на картата. Показва карта създадена с Mapbox. Скролни с два пръста. Мащабирай с два пръста. Mapbox Android SDK - Направи Mapbox картите по-добри. - Помагаш OpenStreetMap и Mapbox картите да станат по-добри, като предоставяш анонимни данни за потребление. - Съгласявам се - Не се съгласявам - Повече инфо Предоставените OfflineRegionDefinition не пасват в границите на света: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml index 6ed788d1d..b76b16692 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml @@ -5,11 +5,6 @@ Vista de posició. Mostra la teva posició al mapa. Mostrant un mapa creat amb Mapbox. Desplaça’t arrossegant amb dos dits. Fes zoom pessigant amb dos dits. Mapbox Android SDK - Millora els mapes de Mapbox - Estàs ajudant a millorar els mapes d’OpenStreetMap i de Mapbox aportant dades d’ús anònimes. - D’acord - Disconforme - Més informació La OfflineRegionDefinition proporcionada no encaixa amb els límits del món: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml index 7b7554419..1e4193301 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml @@ -5,13 +5,6 @@ Zobrazení polohy. Zobrazit umístění na mapě. Zobrazení mapy vytvořené s Mapbox. Posunout tažením dvěma prsty. Změnit velikost roztažením dvou prstů. Mapbox Maps SDK pro Android - Udělejte mapy Mapbox lepšími - Pomozte udělat OpenStreetMap a Mapbox mapy lepšími poskytnutím anonymních dat o využití. - Souhlasit - Odmítnout - Více informací Na zařízení není nainstalován webový prohlížeč, webovou stránku nelze zobrazit. Pokud OfflineRegionDefinition neodpovídá hranicím: %s - Vylepšit tuto mapu - Nastavení telemetrie \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml index 879738323..36e41c051 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml @@ -5,13 +5,6 @@ Vista de ubicación. Muestra tu ubicación en el mapa. Se está mostrando un mapa creado con Mapbox. Arrastra dos dedos para desplazarte o pellizca para acercar. Mapbox Maps SDK para Android - Ayúdanos a mejorar los mapas de Mapbox - Gracias a tu contribución de datos anónimos de uso, ayudas a mejorar OpenStreetMap y Mapbox. - Aceptar - Rechazar - Más información No puede abrir la página Web porque no hay un navegador Web en el dispositivo. El parámetro OfflineRegionDefinition que se ingresó no coincide con los límites mundiales: %s - Mejorar este mapa - Ajustes de telemetría diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml index 67b5b2107..1373ad338 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml @@ -5,13 +5,6 @@ Vue de géolocalisation. Ceci affiche votre localisation sur la carte. Affichage d’une carte créée avec Mapbox. Faites la glisser en traînant deux doigts. Zoomez ou dézoomez en écartant ou rapprochant deux doigts. SDK Mapbox Maps pour Android - Faire de meilleures cartes Mapbox - Vous aidez à améliorer les cartes OpenStreetMap et Mapbox en contribuant des données d\'utilisation anonymes. - D’accord - Pas d’accord - Plus d’informations Aucun navigateur web installé sur l’appareil, impossible d’ouvrir une page web. Le cadre OfflineRegionDefinition pour définir la région de navigation ne tient pas dans les limites du monde : %s - Améliorer cette carte - Paramètres de télémétrie \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml index 1f8f660d1..09d0297ad 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml @@ -5,13 +5,6 @@ Vista de ubicación. Amosa a túa ubicación no mapa. Estase a amosar un mapa feito co Mapbox. Belisca dous dedos para desprazarte ou belisca para achegar. Mapbox Maps SDK para o Android - Axúdanos a mellorar os mapas do Mapbox - Grazas á túa contribución de datos anónimos de emprego, axudas a mellorar o OpenStreetMap e o Mapbox. - Dacordo - Rexeitar - Máis información Non podes abrir a páxina web porque non hai un navegador web no dispositivo. O parámetro OfflineRegionDefinition que se ingresou non coincide cos límites mundiais: %s - Mellorar este mapa - Axustes da telemetría \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml index 11b20f5dc..1b127ea5e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml @@ -5,12 +5,6 @@ סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. מציג מפה שנוצרה עם Mapbox. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. Mapbox Maps SDK for Android - שפר את המפות של Mapbox  - אתם מסייעים לשפר את המפות של OpenStreetMap ו Mapbox באמצעות שיתוף אנונימי של נתוני השימוש. - מסכים/מה - לא מסכים/מה - מידע נוסף לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s - הגדרות טלמטריות diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml index 24ade1ba8..8156b444a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml @@ -3,13 +3,6 @@ Hely nézet. Megmutatja, hol vagy a térképen. Egy Mapbox-szal készült térkép megjelenítése. Húzd két ujjadat a görgetéshez. Csippentsd össze a nagyításhoz. Mapbox Maps SDK Androidhoz - Tedd jobbá a Mapbox térképeket - Segítesz az OpenStreetMap és Mapbox térképek jobbá tételében névtelen felhasználási adatok elküldésével. - Egyetértek - Nem értek egyet - Több infó Nincs webböngésző telepítve a készüléken, nem lehet megnyitni weboldalt. A megadott OfflineRegionDefinition nem fér bele a világ kereteibe: %s - Tedd jobbá ezt a térképet - Telemetria beállítások \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml index 11b20f5dc..1b127ea5e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml @@ -5,12 +5,6 @@ סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. מציג מפה שנוצרה עם Mapbox. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. Mapbox Maps SDK for Android - שפר את המפות של Mapbox  - אתם מסייעים לשפר את המפות של OpenStreetMap ו Mapbox באמצעות שיתוף אנונימי של נתוני השימוש. - מסכים/מה - לא מסכים/מה - מידע נוסף לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s - הגדרות טלמטריות diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml index a292e5251..1f503d5b5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml @@ -5,12 +5,6 @@ 로케이션 뷰. 지도에서 현재 위치를 보여줍니다. 맵박스로 생성된 지도 표시. 두 손가락으로 드래그하여 화면을 위 아래로 움직이세요. 두 손가락을 이용해 화면을 확대 축소 하세요. 안드로이드를 위한 맵박스 맵 SDK - 더 나은 맵박스 지도 만들기 - 당신은 익명의 사용 데이터를 제공함으로써, 오픈스트리트맵과 맵박스 향상에 기여하고 있습니다. - 동의 - 비동의 - 추가정보 웹 브라우저가 설치 되어 있지 않아, 웹 페이지를 열 수 없습니다. 제공된 오프라인지역정의가 월드바운즈에 적합하지 않습니다: %s - 원격 측정 설정 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml index e01be0335..08e218a7c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml @@ -5,11 +5,6 @@ Vartotojo vietos vaizdas. Nurodo tavo poziciją žemėlapyje Rodomas Mapbox kurtas žemėlapis. Naviguok tempdamas du pirštus. Valdyk žemėlapio pritraukimą suimdamas/atitolindamas du pirštus. Mapbox Android SDK - Prisidėk prie Mapbox žemėlapių tobulinimo - Jūs padedate padaryti OpenStreetMap ir Mapbox žemėlapius geresniais dalindamiesi anoniminiais naudojimosi duomenimis. - Sutikti - Nesutikti - Daugiau informacijos Pasirinktas OfflineRegionDefinition netalpa į rėžius: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml index f1fcf837e..7bd8d98b0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml @@ -5,11 +5,6 @@ Locatie Element. Dit toont jouw locatie op de map. Toont een map gemaakt met Mapbox. Scroll door het slepen met twee vingers. Zoom door vingers te nijpen. Mapbox Android SDK - Maak Mapbox Maps beter - U helpt OpenStreetMap en Mapbox maps te verbeteren door het bijdragen van anonieme gebruikersgegevens. - Toestemmen - Intrekken - Meer informatie Aangeleverde OfflineRegionDefinition past niet in de wereld omtrek: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml index 401fae8b3..77b0817c1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml @@ -5,13 +5,6 @@ Widok lokalizacji. Pokazuje twoją pozycję na mapie. Pokazuje mapę stworzoną za pomocą biblioteki Mapbox. Przesuń mapę za pomocą przeciągnięcia dwoma palcami. Przybliż za pomocą uszczypnięcia dwoma palcami. Mapbox Maps SDK dla Androida - Pomoż ulepszyć mapy Mapbox - Pomagasz ulepszyć mapy OpenStreetMap oraz Mapbox poprzez udostępnianie anonimowych danych użytkowania. - Zgadzam się - Nie zgadzam się - Więcej informacji Nie potrafię otworzyć strony, brak przeglądarki internetowej zainstalowanej na urządzeniu. Wymagany region nie mieści się w granicach świata: %s - Ulepsz tą mapę - Ustawienia telemetrii \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml index 02941aab5..18b9ecc57 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml @@ -5,12 +5,6 @@ Vista de localização. Isto mostra a sua localização no mapa. A mostrar um Mapa criado com Mapbox. Desloque arrastanto com 2 dedos. Zoom afastando ou aproximando os 2 dedos. Mapas Mapbox SDK para Android - Torne os Mapas Mapbox Melhores - Está a ajudar a tornar os mapas OpenStreetMap e Mapbox melhores contribuindo com dados de utilização tornados anónimos. - Concordo - Não concordo - Mais informações Não está nenhum navegador de Internet instalado no dispositivo. Não é possível abrir a página web. O OfflineRegionDefinition não cabe nos limites do mundo: %s - Definições de Telemetria diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml index a27412525..8bca5dcc3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml @@ -5,12 +5,6 @@ Местоположение. Отображает вашу позицию на карте. Отображает карту, созданную при помощи Mapbox. Пролистывайте двумя пальцами. Меняйте масштаб сведением пальцев. Mapbox Maps SDK для Android - Сделать карты Mapbox лучше - Вы помогаете улучшать карты OpenStreetMap и Mapbox, предоставляя обезличенные данные об использовании. - Согласен - Не согласен - Дополнительная информация На устройстве нет веб-браузера, нельзя показать веб-страницу. Запрошенный OfflineRegionDefinition не входит в допустимые границы: %s - Настройки телеметрии diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml index 9537299a7..6c546305c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml @@ -5,12 +5,6 @@ Positionsvy. Denna visar din position på kartan. Visar en karta skapad med Mapbox. Scrolla genom att dra med två fingrar. Zooma genom att nypa med två fingrar. Mapbox Maps SDK for Android - Gör Mapbox kartor bättre - Du hjälper till att göra OpenStreetMap och Mapbox karttjänster bättre genom att bidra med anonymiserad användningsdata. - Godkänn - Avböj - Visa mer information Ingen webbläsare installerad på enheten. Kan inte visa sidan. Försedd OfflineRegionDefinition passar inte världens gränser: %s - Telemetri-inställningar diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml index 17e13a1fe..83feddd62 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml @@ -5,12 +5,6 @@ Визначення положення. Показує ваше місцеположення на мапі. Показує мапи створені за допомоги Mapbox. Пересувайте мапу двома пальцями. Змінюйте масштаб стуляючи/розводячи два пальці. Mapbox Maps SDK для Android - Допоможіть зробити мапи Mapbox краще - Ви допомагаєте робити мапи OpenStreetMap та Mapbox краще пощирюючи анонімні дані про користування мапами. - Погоджуюсь - Не погоджуюсь - Додаткова інформація Веб-оглядач відсутній на цьому пристрої, неможливо відкрити веб-сторінку Межі ділянки для оффлайнового користування даними за межами світу: %s - Налаштування телеметрії diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml index 7b6f72fe7..1a8944025 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml @@ -5,13 +5,6 @@ Cái chỉ vị trí. Cái này chỉ vị trí của bạn trên bản đồ. Đang xem bản đồ được xây dựng dùng Mapbox. Kéo hai ngón tay để cuộn. Chụm các ngón tay lại để phóng to. Tách các ngón tay ra để thu nhỏ. Mapbox Maps SDK cho Android - Cải tiến các Bản đồ Mapbox - Bạn đang giúp cải tiến các bản đồ OpenStreetMap và Mapbox bằng cách đóng góp dữ liệu vô danh hóa về cách sử dụng. - Đồng ý - Phản đối - Thông tin thêm Không thể mở trang Web vì thiết bị thiếu trình duyệt. OfflineRegionDefinition được cung cấp không vừa thế giới: %s - Cải thiện Bản đồ này - Thiết lập Trình viễn trắc diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml index 0f489f501..e25d4c1fc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml @@ -5,13 +5,6 @@ 定位视图，在地图上显示当前位置。 显示由Mapbox创建的地图，通过拖动两个手指来滚动，捏两个手指来放大。 Mapbox Maps SDK for Android - 让Mapbox地图变得更好 - 您的匿名数据帮助OpenStreetMap和Mapbox的地图变得更好。 - 继续参与 - 不再参与 - 更多信息 设备中未安装任何浏览器，不能打开该网页 提供的OfflineRegionDefinition不符合标准地理范围：%s - 完善地图 - Telemetry设置 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml index 082f137ed..34ad34549 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml @@ -5,13 +5,6 @@ 定位視圖，在地圖上顯示當前位置。 顯示由Mapbox創建的地圖，通過拖動兩個手指來滾動，捏兩個手指來放大。 Mapbox Maps SDK for Android - 讓Mapbox地圖變得更好 - 您的匿名數據幫助OpenStreetMap和Mapbox的地圖變得更好。 - 繼續參與 - 不再參與 - 更多信息 設備中未安裝任何瀏覽器，不能打開該網頁 提供的OfflineRegionDefinition不符合標準地理範圍：%s - 完善地圖 - Telemetry設置 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml index 082f137ed..34ad34549 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml @@ -5,13 +5,6 @@ 定位視圖，在地圖上顯示當前位置。 顯示由Mapbox創建的地圖，通過拖動兩個手指來滾動，捏兩個手指來放大。 Mapbox Maps SDK for Android - 讓Mapbox地圖變得更好 - 您的匿名數據幫助OpenStreetMap和Mapbox的地圖變得更好。 - 繼續參與 - 不再參與 - 更多信息 設備中未安裝任何瀏覽器，不能打開該網頁 提供的OfflineRegionDefinition不符合標準地理範圍：%s - 完善地圖 - Telemetry設置 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index e818cf88f..82e01f1b5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -5,16 +5,8 @@ Location View. This shows your location on the map. Showing a Map created with Mapbox. Scroll by dragging two fingers. Zoom by pinching two fingers. Mapbox Maps SDK for Android - Make Mapbox Maps Better - You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data. - Agree - Disagree - More info No web browser installed on device, can\'t open web page. Provided OfflineRegionDefinition doesn\'t fit the world bounds: %s - Improve This Map - Telemetry Settings - https://www.mapbox.com/telemetry/