From 930bacd1209dce7826c9c1ae1303e37380ce431c Mon Sep 17 00:00:00 2001 From: Deep Date: Fri, 12 Feb 2021 16:48:44 -0500 Subject: [PATCH 1/2] Update default browser behaviour for different channel --- .../org/chromium/chrome/browser/app/BraveActivity.java | 4 ++++ .../BraveSetDefaultBrowserNotificationService.java | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 6ca9db079dd..0de1aeb7846 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -125,6 +125,10 @@ public abstract class BraveActivity private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; public static final String OPEN_URL = "open_url"; + public static final String BRAVE_PRODUCTION_PACKAGE_NAME = "com.brave.browser"; + public static final String BRAVE_BETA_PACKAGE_NAME = "com.brave.browser_beta"; + public static final String BRAVE_NIGHTLY_PACKAGE_NAME = "com.brave.browser_nightly"; + private static final int DAYS_3 = 3; private static final int DAYS_4 = 4; private static final int DAYS_5 = 5; diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java index 5b50238fd96..d8e8279814b 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java @@ -22,6 +22,7 @@ import android.provider.Settings; import androidx.core.app.NotificationCompat; import org.chromium.base.ContextUtils; +import org.chromium.base.Log; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.chrome.R; @@ -63,8 +64,13 @@ public class BraveSetDefaultBrowserNotificationService extends BroadcastReceiver || ContextUtils.getApplicationContext() == null) { return false; } + Log.e("NTP", "isBraveSetAsDefaultBrowser : " + resolveInfo.activityInfo.packageName); return resolveInfo.activityInfo.packageName.equals( - ContextUtils.getApplicationContext().getPackageName()); + BraveActivity.BRAVE_PRODUCTION_PACKAGE_NAME) + || resolveInfo.activityInfo.packageName.equals( + BraveActivity.BRAVE_BETA_PACKAGE_NAME) + || resolveInfo.activityInfo.packageName.equals( + BraveActivity.BRAVE_NIGHTLY_PACKAGE_NAME); } private boolean shouldShowNotification() { From 2cfe08d4b35129790aade43e6b20b550cc15ea99 Mon Sep 17 00:00:00 2001 From: Deep Date: Fri, 12 Feb 2021 16:51:41 -0500 Subject: [PATCH 2/2] Remove unused code --- .../BraveSetDefaultBrowserNotificationService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java index d8e8279814b..54711a90f3a 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java @@ -22,7 +22,6 @@ import android.provider.Settings; import androidx.core.app.NotificationCompat; import org.chromium.base.ContextUtils; -import org.chromium.base.Log; import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.chrome.R; @@ -64,7 +63,6 @@ public class BraveSetDefaultBrowserNotificationService extends BroadcastReceiver || ContextUtils.getApplicationContext() == null) { return false; } - Log.e("NTP", "isBraveSetAsDefaultBrowser : " + resolveInfo.activityInfo.packageName); return resolveInfo.activityInfo.packageName.equals( BraveActivity.BRAVE_PRODUCTION_PACKAGE_NAME) || resolveInfo.activityInfo.packageName.equals(