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

[Android] NotificationPlatformBridge.prepareNotificationBuilder became static

Browse Source 
Chromium change:
https://source.chromium.org/chromium/chromium/src/+/af4a1a29660d0cfa1ed074d69f782abc9f79fd98

Make NotificationPlatformBridge less native-dependent (3/5).

Mark as `static` several helper methods in `NotificationPlatformBridge`. This is in preparation to enable calling methods like `displayProvisionallyUnsubscribedNotification` without an instance of
`NotificationPlatformBridge` existing, which requires native
libraries to be loaded.

As these methods already access no instance variables, there should be no functional changes.
This commit is contained in:
Artem Samoilenko
2024-09-10 14:42:48 -04:00
committed by mkarolin
parent 06c8f573dc
commit 888162c66b
11 changed files with 95 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/apk_for_test.flags
+5
View File
@@ -885,6 +885,11 @@
*** getToolbarSidePaddingForNtp(...);
}
-keep class org.chromium.chrome.browser.notifications.NotificationPlatformBridge {
*** dispatchNotificationEvent(...);
*** prepareNotificationBuilder(...);
}
-keep class org.chromium.chrome.browser.tasks.tab_management.BraveTabSwitcherPaneBase
-keep class org.chromium.chrome.browser.tasks.tab_management.TabSwitcherPane
android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java
+21 -34
View File
@@ -1,46 +1,30 @@
/**
* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/.
* Copyright (c) 2019 The Brave Authors. All rights reserved. This Source Code Form is subject to
* the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
* this file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package org.chromium.chrome.browser.notifications;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import org.jni_zero.CalledByNative;
import androidx.annotation.VisibleForTesting;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ContextUtils;
import org.chromium.chrome.browser.notifications.NotificationPlatformBridge.NotificationIdentifyingAttributes;
public class BraveNotificationPlatformBridge extends NotificationPlatformBridge {
public class BraveNotificationPlatformBridge {
private static final int[] EMPTY_VIBRATION_PATTERN = new int[0];
private @NotificationType int mNotificationType;
@CalledByNative
private static BraveNotificationPlatformBridge create(long nativeNotificationPlatformBridge) {
if (sInstance != null) {
throw new IllegalStateException(
"There must only be a single NotificationPlatformBridge.");
}
sInstance = new BraveNotificationPlatformBridge(nativeNotificationPlatformBridge);
return (BraveNotificationPlatformBridge) sInstance;
}
private BraveNotificationPlatformBridge(long nativeNotificationPlatformBridge) {
super(nativeNotificationPlatformBridge);
}
static boolean dispatchNotificationEvent(Intent intent) {
public static boolean dispatchNotificationEvent(Intent intent) {
if (NotificationPlatformBridge.dispatchNotificationEvent(intent)) {
@NotificationType
int notificationType = intent.getIntExtra(
NotificationConstants.EXTRA_NOTIFICATION_TYPE, NotificationType.WEB_PERSISTENT);
int notificationType =
intent.getIntExtra(
NotificationConstants.EXTRA_NOTIFICATION_TYPE,
NotificationType.WEB_PERSISTENT);
if (notificationType == NotificationType.BRAVE_ADS
&& NotificationConstants.ACTION_CLICK_NOTIFICATION.equals(intent.getAction())) {
bringToForeground();
@@ -65,8 +49,7 @@ public class BraveNotificationPlatformBridge extends NotificationPlatformBridge
}
}
@Override
protected NotificationBuilderBase prepareNotificationBuilder(
public static NotificationBuilderBase prepareNotificationBuilder(
NotificationIdentifyingAttributes identifyingAttributes,
boolean vibrateEnabled,
String title,
@@ -79,14 +62,12 @@ public class BraveNotificationPlatformBridge extends NotificationPlatformBridge
boolean renotify,
boolean silent,
ActionInfo[] actions) {
mNotificationType = identifyingAttributes.notificationType;
if (mNotificationType == NotificationType.BRAVE_ADS) {
if (identifyingAttributes.notificationType == NotificationType.BRAVE_ADS) {
vibrationPattern = EMPTY_VIBRATION_PATTERN;
}
NotificationBuilderBase result =
super.prepareNotificationBuilder(
NotificationPlatformBridge.prepareNotificationBuilder(
identifyingAttributes,
vibrateEnabled,
title,
@@ -104,9 +85,15 @@ public class BraveNotificationPlatformBridge extends NotificationPlatformBridge
: "Bytecode changes for BraveNotificationBuilder were not applied!";
if (result instanceof BraveNotificationBuilder) {
((BraveNotificationBuilder) result)
.setIsBraveNotification(mNotificationType == NotificationType.BRAVE_ADS);
.setIsBraveNotification(
identifyingAttributes.notificationType == NotificationType.BRAVE_ADS);
}
return result;
}
@VisibleForTesting
public static Class<ActionInfo[]> getActionInfoArrayClass() {
return ActionInfo[].class;
}
}