v1.20

mirfatif · Jun 14, 2023 · 03f5710 · 03f5710
1 parent b449ab8
commit 03f5710
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         applicationId APP_ID
 
-        versionCode 119
-        versionName 'v1.19'
+        versionCode 120
+        versionName 'v1.20'
 
         // Flavor-independent and BuildType-independent BuildConfig.APPLICATION_ID
         buildConfigField 'String', 'APP_ID', '"' + APP_ID + '"'

diff --git a/app/src/main/java/com/mirfatif/permissionmanagerx/privs/NativeDaemon.java b/app/src/main/java/com/mirfatif/permissionmanagerx/privs/NativeDaemon.java
@@ -137,6 +137,8 @@ private boolean startRootDaemon() {
       String su = MySettings.INS.getSuExePath();
       Process proc = Util.runProc(TAG, "startRootDaemon", false, su);
       if (proc == null) {
+
+        MySettings.INS.setRootEnabled(false);
         return false;
       }
 

diff --git a/app/src/main/java/com/mirfatif/permissionmanagerx/util/ApiUtils.java b/app/src/main/java/com/mirfatif/permissionmanagerx/util/ApiUtils.java
@@ -21,11 +21,14 @@
 import com.mirfatif.permissionmanagerx.R;
 import com.mirfatif.permissionmanagerx.app.App;
 import com.mirfatif.privtasks.Constants;
+import com.mirfatif.privtasks.util.MyLog;
 import java.util.ArrayList;
 import java.util.List;
 
 public class ApiUtils {
 
+  private static final String TAG = "ApiUtils";
+
   private ApiUtils() {}
 
   public static String getString(int resId, Object... args) {
@@ -159,10 +162,14 @@ public static void setTargetFragment(Fragment source, Fragment target) {
   public static <T extends Parcelable> ArrayList<T> getParcelableArrayListExtra(
       Intent intent, String name, Class<T> cls) {
     if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
-      return intent.getParcelableArrayListExtra(name, cls);
-    } else {
-      return intent.getParcelableArrayListExtra(name);
+      try {
+        return intent.getParcelableArrayListExtra(name, cls);
+      } catch (NullPointerException e) {
+        MyLog.e(TAG, "getParcelableArrayListExtra", e);
+      }
     }
+
+    return intent.getParcelableArrayListExtra(name);
   }
 
   public static boolean hasAppOpsPerm() {

diff --git a/fastlane/metadata/android/en-US/changelogs/120.txt b/fastlane/metadata/android/en-US/changelogs/120.txt
@@ -0,0 +1,2 @@
+- Fixed crashes
+- Minor improvements
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip