修复activity 销毁的问题

添加低target版本的判断
greatyingzi · Jun 8, 2020 · 7faafe0 · 7faafe0
1 parent 822a9dc
commit 7faafe0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/permission/src/main/java/com/yanzhenjie/permission/checker/StandardChecker.java b/permission/src/main/java/com/yanzhenjie/permission/checker/StandardChecker.java
@@ -42,6 +42,7 @@ public boolean hasPermission(Context context, String... permissions) {
 
     @Override
     public boolean hasPermission(Context context, List<String> permissions) {
+        if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.M) return true;
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) return true;
 
         AppOpsManager opsManager = null;

diff --git a/permission/src/main/java/com/yanzhenjie/permission/checker/StrictChecker.java b/permission/src/main/java/com/yanzhenjie/permission/checker/StrictChecker.java
@@ -33,6 +33,7 @@ public StrictChecker() {
 
     @Override
     public boolean hasPermission(Context context, String... permissions) {
+        if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.M) return true;
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return true;
 
         for (String permission : permissions) {

diff --git a/permission/src/main/java/com/yanzhenjie/permission/runtime/LRequest.java b/permission/src/main/java/com/yanzhenjie/permission/runtime/LRequest.java
@@ -70,7 +70,7 @@ protected List<String> doInBackground(Void... voids) {
 
             @Override
             protected void onFinish(List<String> deniedList) {
-                if (deniedList.isEmpty()) {
+                if (deniedList == null || deniedList.isEmpty()) {
                     callbackSucceed(mPermissions);
                 } else {
                     callbackFailed(deniedList);

diff --git a/permission/src/main/java/com/yanzhenjie/permission/runtime/MRequest.java b/permission/src/main/java/com/yanzhenjie/permission/runtime/MRequest.java
@@ -106,7 +106,7 @@ protected List<String> doInBackground(Void... voids) {
 
             @Override
             protected void onFinish(List<String> deniedList) {
-                if (deniedList.isEmpty()) {
+                if (deniedList == null || deniedList.isEmpty()) {
                     callbackSucceed(mPermissions);
                 } else {
                     callbackFailed(deniedList);

diff --git a/permission/src/main/java/com/yanzhenjie/permission/task/TaskExecutor.java b/permission/src/main/java/com/yanzhenjie/permission/task/TaskExecutor.java
@@ -38,8 +38,14 @@ public TaskExecutor(Context context) {
 
     @Override
     protected final void onPreExecute() {
-        if (!mDialog.isShowing()) {
-            mDialog.show();
+        try {
+            if (!mDialog.isShowing()) {
+                mDialog.show();
+            }
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+            cancel(false);
+            onFinish(null);
         }
     }