解决GPermission的内存泄漏问题

ITGungnir · Nov 12, 2019 · dc54b2a · dc54b2a
1 parent e11fed8
commit dc54b2a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/test/itgungnir/permission/App.kt b/app/src/main/java/test/itgungnir/permission/App.kt
@@ -0,0 +1,20 @@
+package test.itgungnir.permission
+
+import android.app.Application
+import com.squareup.leakcanary.LeakCanary
+
+/**
+ * Description:
+ *
+ * Created by ITGungnir on 2019-11-12
+ */
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            return
+        }
+        LeakCanary.install(this)
+    }
+}
diff --git a/app/src/main/java/test/itgungnir/permission/MainActivity.kt b/app/src/main/java/test/itgungnir/permission/MainActivity.kt
@@ -13,7 +13,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        grantResult.text = when (GPermission.allGranted(
+        grantResult.text = when (GPermission.with(this).allGranted(
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_PHONE_STATE
         )) {

diff --git a/permission/src/main/java/my/itgungnir/permission/GPermission.kt b/permission/src/main/java/my/itgungnir/permission/GPermission.kt
@@ -12,16 +12,15 @@ import androidx.lifecycle.ViewModelStoreOwner
 
 class GPermission private constructor() {
 
+    private lateinit var context: FragmentActivity
+
     private lateinit var permissionUtil: GPermissionProxy
 
     private var showDialogAtPermissionRejection: Boolean = false
     private var grantedCallback: (() -> Unit)? = null
     private var deniedCallback: (() -> Unit)? = null
 
     companion object {
-
-        private lateinit var context: FragmentActivity
-
         fun with(component: ViewModelStoreOwner) = GPermission().apply {
             permissionUtil = GPermissionProxy.with(component)
             context = when (component) {
@@ -33,12 +32,6 @@ class GPermission private constructor() {
                     throw IllegalArgumentException("GPermission requested from wrong component.")
             }
         }
-
-        fun allGranted(vararg permissions: String) = permissions.all { granted(it) }
-
-        private fun granted(permission: String): Boolean =
-            ContextCompat.checkSelfPermission(context.applicationContext, permission) ==
-                    PackageManager.PERMISSION_GRANTED
     }
 
     /**
@@ -73,11 +66,17 @@ class GPermission private constructor() {
             }
     }
 
+    private fun granted(permission: String): Boolean =
+        ContextCompat.checkSelfPermission(context.applicationContext, permission) ==
+                PackageManager.PERMISSION_GRANTED
+
     private fun lackedOnes(vararg permissions: Pair<String, String>): List<String> {
         return permissions.filter { !granted(permission = it.first) }
             .map { it.second }
     }
 
+    fun allGranted(vararg permissions: String) = permissions.all { granted(it) }
+
     /**
      * Repeatedly pop the permission-request dialogs.
      * When the user denied a permission without checking the "Don't show again" checkbox,