Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15472 from brave/android_retention_crash

Browse Source 
Adds a few null checks and handling an exception inside RetentionNotificationPublisher on Android
This commit is contained in:
Serg
2022-10-14 23:02:12 +01:00
committed by GitHub
parent cb0930078f 224377b12e
commit 44dbb074d0
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java
+13 -6
View File
@@ -112,11 +112,17 @@ public class RetentionNotificationPublisher extends BroadcastReceiver {
case RetentionNotificationUtil.DAY_30:
case RetentionNotificationUtil.DAY_35:
// Can't check for rewards code in background
if (braveActivity != null
&& !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile())
&& ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)) {
createNotification(context, intent);
try {
if (braveActivity != null
&& !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile())
&& ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)) {
createNotification(context, intent);
}
} catch (IllegalStateException exc) {
// We can receive 'Browser hasn't finished initialization yet!' if
// Profile.getLastUsedRegularProfile is called to early. Just ignore it,
// that's better comparing to crashing
}
break;
case RetentionNotificationUtil.EVERY_SUNDAY:
@@ -184,7 +190,8 @@ public class RetentionNotificationPublisher extends BroadcastReceiver {
public static void backgroundNotificationAction(Context context, Intent intent) {
String notificationType = intent.getStringExtra(RetentionNotificationUtil.NOTIFICATION_TYPE);
if (ApplicationStatus.hasVisibleActivities()) {
if (ApplicationStatus.hasVisibleActivities() || context == null
|| context.getPackageManager() == null) {
return;
}
Intent launchIntent =