diff --git a/app/build.gradle b/app/build.gradle index 34f58cbae..d1374f650 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,6 +41,7 @@ dependencies { implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.1.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.11.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.4.0' + implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0' implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0' implementation 'com.dinuscxj:circleprogressbar:1.1.1' implementation 'com.karumi:dexter:5.0.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 52ba2b233..5ab858379 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,6 @@ - diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index a921d420f..30f02c1bd 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -143,31 +143,15 @@ public class MainActivity extends BaseActivity private void setUpPager() { tabLayout.setOnNavigationItemSelectedListener(item -> { - if (VERSION.SDK_INT >= VERSION_CODES.M) { - if (item.getTitle().equals(getString(R.string.nearby_fragment)) - && checkSelfPermission(permission.READ_PHONE_STATE) - != PackageManager.PERMISSION_GRANTED) { - requestPhoneStatePermission(() -> { - tabLayout.setSelectedItemId(NavTab.NEARBY.code()); - }); - return false; - } - } if (!item.getTitle().equals(getString(R.string.more))) { // do not change title for more fragment setTitle(item.getTitle()); } - Fragment fragment = NavTab.of(item.getOrder()).newInstance(); + final Fragment fragment = NavTab.of(item.getOrder()).newInstance(); return loadFragment(fragment, true); }); } - private void requestPhoneStatePermission(final Runnable runnable) { - PermissionUtils.checkPermissionsAndPerformAction(this, - android.Manifest.permission.READ_PHONE_STATE, (Runnable) runnable::run, (Runnable) () -> { - }, R.string.need_permission, R.string.read_phone_state_permission_message); - } - private void setUpLoggedOutPager() { loadFragment(ExploreFragment.newInstance(),false); tabLayout.setOnNavigationItemSelectedListener(item -> {