fix: clean up permission (#85)

amplitude · Oct 14, 2022 · 0402c91 · 0402c91
1 parent 917796c
commit 0402c91
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 37 deletions.
diff --git a/common-android/build.gradle b/common-android/build.gradle
@@ -35,6 +35,9 @@ android {
             includeAndroidResources = true
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/common-android/src/main/AndroidManifest.xml b/common-android/src/main/AndroidManifest.xml
@@ -2,5 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.amplitude.common.android">
 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>
diff --git a/common-android/src/main/java/com/amplitude/common/android/AndroidContextProvider.kt b/common-android/src/main/java/com/amplitude/common/android/AndroidContextProvider.kt
@@ -1,5 +1,6 @@
 package com.amplitude.common.android
 
+import android.Manifest
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
@@ -10,6 +11,7 @@ import android.location.LocationManager
 import android.os.Build
 import android.provider.Settings.Secure
 import android.telephony.TelephonyManager
+import androidx.core.content.ContextCompat
 import com.amplitude.common.ContextProvider
 import java.io.IOException
 import java.lang.Exception
@@ -351,7 +353,17 @@ class AndroidContextProvider(private val context: Context, locationListening: Bo
             if (!isLocationListening) {
                 return null
             }
-            if (!Utils.checkLocationPermissionAllowed(context)) {
+            if (!(
+                ContextCompat.checkSelfPermission(
+                        context,
+                        Manifest.permission.ACCESS_COARSE_LOCATION
+                    ) === PackageManager.PERMISSION_GRANTED ||
+                    ContextCompat.checkSelfPermission(
+                        context,
+                        Manifest.permission.ACCESS_FINE_LOCATION
+                    ) === PackageManager.PERMISSION_GRANTED
+                )
+            ) {
                 return null
             }
             val locationManager = context

diff --git a/common-android/src/main/java/com/amplitude/common/android/Utils.kt b/common-android/src/main/java/com/amplitude/common/android/Utils.kt