From 0ed185eb1f064ffdefa17a8154d835751df88e74 Mon Sep 17 00:00:00 2001 From: ZhangGonghua Date: Tue, 19 Apr 2022 12:04:41 +0800 Subject: [PATCH 1/3] catch all exception and just ignore it --- OneSignalSDK/onesignal/maven-push.gradle | 2 +- .../GooglePlayServicesUpgradePrompt.java | 2 +- .../java/com/onesignal/LocationController.java | 4 ++-- .../src/main/java/com/onesignal/OSUtils.java | 14 ++++++-------- .../src/main/java/com/onesignal/OneSignal.java | 15 +++++++-------- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/OneSignalSDK/onesignal/maven-push.gradle b/OneSignalSDK/onesignal/maven-push.gradle index 070a5e7cfb..08901b2d90 100644 --- a/OneSignalSDK/onesignal/maven-push.gradle +++ b/OneSignalSDK/onesignal/maven-push.gradle @@ -32,7 +32,7 @@ class Global { static def POM_NAME = 'OneSignal' static def POM_ARTIFACT_ID = 'OneSignal' static def POM_PACKAGING = 'aar' - static def VERSION_NAME = '4.7.1' + static def VERSION_NAME = '4.7.1.1' static def GROUP_ID = 'com.onesignal' static def POM_DESCRIPTION = 'OneSignal Android SDK' diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java index 32bd9f7cc9..d48ea901fd 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java @@ -20,7 +20,7 @@ private static boolean isGooglePlayStoreInstalled() { PackageInfo info = pm.getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, PackageManager.GET_META_DATA); String label = (String) info.applicationInfo.loadLabel(pm); return (!label.equals("Market")); - } catch (PackageManager.NameNotFoundException e) { + } catch (Exception e) { // Google Play Store might not be installed, ignore exception if so } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java index 78d4e788d3..9cb1831cdf 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java @@ -260,7 +260,7 @@ static void getLocation(Context context, boolean promptLocation, boolean fallbac sendAndClearPromptHandlers(promptLocation, result); fireFailedComplete(); } - } catch (PackageManager.NameNotFoundException e) { + } catch (Exception e) { sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.ERROR); e.printStackTrace(); } @@ -295,7 +295,7 @@ private static void backgroundLocationPermissionLogic(Context context, boolean p sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.PERMISSION_GRANTED); startGetLocation(); } - } catch (PackageManager.NameNotFoundException e) { + } catch (Exception e) { sendAndClearPromptHandlers(promptLocation, OneSignal.PromptActionResult.ERROR); e.printStackTrace(); } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java index 5008f0b7ec..ff269fb8bb 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java @@ -42,16 +42,9 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; - -import androidx.annotation.Keep; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.NotificationManagerCompat; import android.telephony.TelephonyManager; import android.text.TextUtils; -import androidx.legacy.content.WakefulBroadcastReceiver; - import com.google.android.gms.common.GoogleApiAvailability; import com.huawei.hms.api.HuaweiApiAvailability; @@ -70,6 +63,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationManagerCompat; +import androidx.legacy.content.WakefulBroadcastReceiver; import static com.onesignal.OneSignal.Log; class OSUtils { @@ -275,7 +273,7 @@ private static boolean packageInstalledAndEnabled(@NonNull String packageName) { PackageManager pm = OneSignal.appContext.getPackageManager(); PackageInfo info = pm.getPackageInfo(packageName, PackageManager.GET_META_DATA); return info.applicationInfo.enabled; - } catch (PackageManager.NameNotFoundException e) { + } catch (Exception e) { return false; } } diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java index 1289676e8d..ac6f286714 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java @@ -40,17 +40,12 @@ import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.WorkerThread; -import androidx.core.app.NotificationCompat; - +import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoCompletionHandler; +import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoError; import com.onesignal.influence.data.OSTrackerFactory; import com.onesignal.influence.domain.OSInfluence; import com.onesignal.language.LanguageContext; import com.onesignal.language.LanguageProviderAppDefined; -import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoError; -import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoCompletionHandler; import com.onesignal.outcomes.data.OSOutcomeEventsFactory; import org.json.JSONArray; @@ -72,6 +67,10 @@ import java.util.Map; import java.util.TimeZone; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; +import androidx.core.app.NotificationCompat; import static com.onesignal.GenerateNotification.BUNDLE_KEY_ACTION_ID; import static com.onesignal.GenerateNotification.BUNDLE_KEY_ANDROID_NOTIFICATION_ID; import static com.onesignal.NotificationBundleProcessor.newJsonArray; @@ -1507,7 +1506,7 @@ private static void registerUserTask() throws JSONException { try { deviceInfo.put("game_version", packageManager.getPackageInfo(packageName, 0).versionCode); - } catch (PackageManager.NameNotFoundException e) {} + } catch (Exception e) {} deviceInfo.put("net_type", osUtils.getNetType()); deviceInfo.put("carrier", osUtils.getCarrierName()); From a401c8e25a185b56c854a4983da350a78e58c966 Mon Sep 17 00:00:00 2001 From: ZhangGonghua Date: Tue, 19 Apr 2022 14:01:34 +0800 Subject: [PATCH 2/3] catch all exception and just ignore it --- .../onesignal/src/main/java/com/onesignal/OSUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java index ff269fb8bb..5f7f74e57e 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java @@ -289,7 +289,12 @@ static boolean isGMSInstalledAndEnabled() { private static final int HMS_AVAILABLE_SUCCESSFUL = 0; private static boolean isHMSCoreInstalledAndEnabled() { HuaweiApiAvailability availability = HuaweiApiAvailability.getInstance(); - return availability.isHuaweiMobileServicesAvailable(OneSignal.appContext) == HMS_AVAILABLE_SUCCESSFUL; + try { + return availability.isHuaweiMobileServicesAvailable(OneSignal.appContext) == HMS_AVAILABLE_SUCCESSFUL; + } catch (Exception e) { + e.printStackTrace(); + } + return false; } private static final String HMS_CORE_SERVICES_PACKAGE = "com.huawei.hwid"; // = HuaweiApiAvailability.SERVICES_PACKAGE From 478570778a513cd34583c114eb7679334b3271ed Mon Sep 17 00:00:00 2001 From: ZhangGonghua Date: Thu, 28 Apr 2022 09:00:06 +0800 Subject: [PATCH 3/3] catch all exception and just ignore it --- .../onesignal/src/main/java/com/onesignal/OSUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java index 5f7f74e57e..7ef82e2045 100644 --- a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java +++ b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java @@ -414,7 +414,7 @@ static Bundle getManifestMetaBundle(Context context) { try { ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA); return ai.metaData; - } catch (PackageManager.NameNotFoundException e) { + } catch (Exception e) { Log(OneSignal.LOG_LEVEL.ERROR, "Manifest application info not found", e); } @@ -495,7 +495,7 @@ static int getTargetSdkVersion(Context context) { try { ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0); return applicationInfo.targetSdkVersion; - } catch (PackageManager.NameNotFoundException e) { + } catch (Exception e) { e.printStackTrace(); }