Remove inner ActivityStack

Author: yjfnypeu

app/src/main/java/com/haoge/sample/easyandroid/activities/EasyPermissionsActivity.kt

@@ -33,15 +33,15 @@ class EasyPermissionsActivity:BaseActivity() {
     fun permissionSingle() {
         EasyPermissions.create(Manifest.permission.WRITE_EXTERNAL_STORAGE)
                 .callback(callback)
-                .request()
+                .request(this)
     }
 
     @OnClick(R.id.permissionOnSubThread)
     fun permissionOnSubThread() {
         pool.execute {
             EasyPermissions.create(Manifest.permission.WRITE_EXTERNAL_STORAGE)
                     .callback(callback)
-                    .request()
+                    .request(this)
         }
     }
 
@@ -50,7 +50,7 @@ class EasyPermissionsActivity:BaseActivity() {
         EasyPermissions.create(Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         Manifest.permission.WRITE_CALENDAR,
                         Manifest.permission.WRITE_CONTACTS
-                ).callback(callback).request()
+                ).callback(callback).request(this)
     }
 
     @OnClick(R.id.permissionWithRational)
@@ -65,7 +65,7 @@ class EasyPermissionsActivity:BaseActivity() {
                             .show()
                     return@rational true
                 }.callback(callback)
-                .request()
+                .request(this)
     }
 
 }

utils/src/main/java/com/haoge/easyandroid/EasyAndroid.kt

@@ -2,7 +2,6 @@ package com.haoge.easyandroid
 
 import android.annotation.SuppressLint
 import android.content.Context
-import com.haoge.easyandroid.tools.ActivityStack
 
 /**
  * @author haoge on 2018/5/17
@@ -40,6 +39,5 @@ object EasyAndroid {
         if (this.context != null) return
 
         this.context = context.applicationContext
-        ActivityStack.registerCallback(this.context)
     }
 }

utils/src/main/java/com/haoge/easyandroid/easy/EasyPermissions.kt

@@ -8,7 +8,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import com.haoge.easyandroid.tools.ActivityStack
 
 /**
  * @author haoge on 2018/6/4
@@ -38,23 +37,22 @@ class EasyPermissions private constructor(private val permissions:Array<out Stri
         return this
     }
 
-    fun request() {
+    fun request(activity: Activity) {
         if (Build.VERSION.SDK_INT < 23) {
             callback?.invoke(true)
             return
         }
 
         if (Looper.myLooper() == Looper.getMainLooper()) {
-            requestInternal(permissions)
+            requestInternal(permissions, activity)
         } else {
-            mainHandler.post { requestInternal(permissions) }
+            mainHandler.post { requestInternal(permissions, activity) }
         }
     }
 
     @TargetApi(Build.VERSION_CODES.M)
-    internal fun requestInternal(permissions: Array<out String>) {
-        val activity = ActivityStack.top<Activity>()
-        if (activity == null || activity.isFinishing || activity.isDestroyed) {
+    internal fun requestInternal(permissions: Array<out String>, activity: Activity) {
+        if (activity.isFinishing || activity.isDestroyed) {
             callback?.invoke(false)
             return
         }