Skip to content

Catch All Exception to fix DeadSystemException #1902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
puderty wants to merge 5 commits into from
Closed

Catch All Exception to fix DeadSystemException #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ed185e
catch all exception and just ignore it
puderty Apr 19, 2022
a401c8e
catch all exception and just ignore it
puderty Apr 19, 2022
4785707
catch all exception and just ignore it
puderty Apr 28, 2022
fbc7fb5
Merge remote-tracking branch 'origin/main' into ok471
puderty Mar 24, 2023
1ebd54e
Merge branch 'OneSignal:main' into ok471
puderty Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/LocationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down
25 changes: 14 additions & 11 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 {
Expand Down Expand Up @@ -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;
}
}
Expand All @@ -291,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
Expand Down Expand Up @@ -411,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);
}

Expand Down Expand Up @@ -492,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();
}

Expand Down
15 changes: 7 additions & 8 deletions OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -1519,7 +1518,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());
Expand Down