Merge pull request #1710 from YoungBill/master

[F] 部分应用市场以所谓ActivityUtils隐私合规问题拒绝应用上架
Developerarif2 · Oct 26, 2022 · dcc279c · dcc279c
2 parents 1074998 + 1290919
commit dcc279c
Showing 1 changed file with 26 additions and 31 deletions.
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
@@ -1997,29 +1997,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 +2029,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 +2073,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;
     }