billdizl · Dec 11, 2021 · May 25, 2022 · Jun 8, 2022 · Jul 18, 2022 · Jul 18, 2022
diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -34,7 +34,7 @@ class Config {
             lib_base                   : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/base"),
             lib_common                 : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/common"),
             lib_subutil                : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/subutil"),
-            lib_utilcode               : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/utilcode", remotePath: "com.blankj:utilcodex:$Config.versionName"),
+            lib_utilcode               : new ModuleConfig(isApply: true , useLocal: false, localPath: "./lib/utilcode", remotePath: "com.blankj:utilcodex:$Config.versionName"),
             lib_utildebug              : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/utildebug"),
             lib_utildebug_no_op        : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/utildebug-no-op"),
             /*Don't delete this line*/

diff --git a/lib/utilcode/README.md b/lib/utilcode/README.md
@@ -6,7 +6,7 @@ Gradle:
 implementation 'com.blankj:utilcodex:1.31.1'
 
 // Not in maintenance
-implementation 'com.blankj:utilcode:1.30.6'
+implementation 'com.blankj:utilcode:1.30.7'
 ```
 
 

diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
@@ -1809,6 +1809,33 @@ public static void finishOtherActivities(@NonNull final Class<? extends Activity
         }
     }
 
+
+    /**
+     * Finish the activities whose type  equals the activity class.
+     *
+     * @param clz The activity class.
+     */
+    public static void finishExceptActivities(@NonNull final Class<? extends Activity> clz) {
+        finishExceptActivities(clz, false);
+    }
+
+
+    /**
+     * Finish the activities whose type  equals the activity class.
+     *
+     * @param clz        The activity class.
+     * @param isLoadAnim True to use animation for the outgoing activity, false otherwise.
+     */
+    public static void finishExceptActivities(@NonNull final Class<? extends Activity> clz,
+                                             final boolean isLoadAnim) {
+        List<Activity> activities = UtilsBridge.getActivityList();
+        for (Activity act : activities) {
+            if (act.getClass().equals(clz)) {
+                finishActivity(act, isLoadAnim);
+            }
+        }
+    }
+
     /**
      * Finish the activities whose type not equals the activity class.
      *
@@ -1997,29 +2024,22 @@ private static void startActivity(final Context context,
     private static boolean startActivity(final Intent intent,
                                          final Context context,
                                          final Bundle options) {
-        if (!isIntentAvailable(intent)) {
-            Log.e("ActivityUtils", "intent is unavailable");
-            return false;
-        }
         if (!(context instanceof Activity)) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         }
-        if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            context.startActivity(intent, options);
-        } else {
-            context.startActivity(intent);
+        try {
+            if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                context.startActivity(intent, options);
+            } else {
+                context.startActivity(intent);
+            }
+        } catch (Exception e) {
+            Log.e("ActivityUtils", "An exception occurred in startActivity, error message: " + e.getLocalizedMessage());
+            return false;
         }
         return true;
     }
 
-    private static boolean isIntentAvailable(final Intent intent) {
-//        return Utils.getApp()
-//                .getPackageManager()
-//                .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
-//                .size() > 0;
-        return true;
-    }
-
     private static boolean startActivityForResult(final Activity activity,
                                                   final Bundle extras,
                                                   final String pkg,
@@ -2036,15 +2056,16 @@ private static boolean startActivityForResult(final Intent intent,
                                                   final Activity activity,
                                                   final int requestCode,
                                                   @Nullable final Bundle options) {
-        if (!isIntentAvailable(intent)) {
-            Log.e("ActivityUtils", "intent is unavailable");
+        try {
+            if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                activity.startActivityForResult(intent, requestCode, options);
+            } else {
+                activity.startActivityForResult(intent, requestCode);
+            }
+        } catch (Exception e) {
+            Log.e("ActivityUtils", "An exception occurred in startActivityForResult, error message: " + e.getLocalizedMessage());
             return false;
         }
-        if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            activity.startActivityForResult(intent, requestCode, options);
-        } else {
-            activity.startActivityForResult(intent, requestCode);
-        }
         return true;
     }
 
@@ -2079,18 +2100,19 @@ private static boolean startActivityForResult(final Intent intent,
                                                   final Fragment fragment,
                                                   final int requestCode,
                                                   @Nullable final Bundle options) {
-        if (!isIntentAvailable(intent)) {
-            Log.e("ActivityUtils", "intent is unavailable");
-            return false;
-        }
         if (fragment.getActivity() == null) {
             Log.e("ActivityUtils", "Fragment " + fragment + " not attached to Activity");
             return false;
         }
-        if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            fragment.startActivityForResult(intent, requestCode, options);
-        } else {
-            fragment.startActivityForResult(intent, requestCode);
+        try {
+            if (options != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                fragment.startActivityForResult(intent, requestCode, options);
+            } else {
+                fragment.startActivityForResult(intent, requestCode);
+            }
+        } catch (Exception e) {
+            Log.e("ActivityUtils", "An exception occurred in fragment.startActivityForResult, error message: " + e.getLocalizedMessage());
+            return false;
         }
         return true;
     }