Skip to content
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

Jump to bottom

[Android] remove old widgets on upgrade scenario (uplift to 1.48.x) #16759

Merged
merged 1 commit into from
Jan 23, 2023
Merged

[Android] remove old widgets on upgrade scenario (uplift to 1.48.x) #16759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions android/java/apk_for_test.flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,13 @@
*** runMenuItemEnterAnimations(...);
}

-keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderDino

-keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch

-keep class org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider {
*** setWidgetEnabled(...);
*** setWidgetComponentEnabled(...);
}

-keep class org.chromium.chrome.browser.quickactionsearchwidget.BraveQuickActionSearchWidgetProvider {
Expand Down
12 changes: 10 additions & 2 deletions ...chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@

package org.chromium.chrome.browser.quickactionsearchwidget;

import androidx.annotation.NonNull;

import org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidgetProvider;

public abstract class BraveQuickActionSearchWidgetProvider extends QuickActionSearchWidgetProvider {
public static void setWidgetEnabled(
boolean shouldEnableQuickActionSearchWidget, boolean shouldEnableDinoVariant) {
// We don't need to do anything here as in QuickActionSearchWidgetProvider we only set dino
// and quick search widgets.
setWidgetComponentEnabled(QuickActionSearchWidgetProviderSearch.class, false);
setWidgetComponentEnabled(QuickActionSearchWidgetProviderDino.class, false);
}

public static void setWidgetComponentEnabled(
@NonNull Class<? extends QuickActionSearchWidgetProvider> component,
boolean shouldEnableWidgetComponent) {
assert false : "setWidgetComponentEnabled should be redirected to parent in bytecode!";
}
}
11 changes: 11 additions & 0 deletions android/javatests/org/chromium/chrome/browser/BytecodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,14 @@ public void testClassesExist() throws Exception {
Assert.assertTrue(classExists("org/chromium/chrome/browser/omnibox/LocationBarMediator"));
Assert.assertTrue(
classExists("org/chromium/chrome/browser/omnibox/BraveLocationBarMediator"));
Assert.assertTrue(classExists(
"org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider"));
Assert.assertTrue(classExists(
"org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderDino"));
Assert.assertTrue(classExists(
"org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider$QuickActionSearchWidgetProviderSearch"));
Assert.assertTrue(classExists(
"org/chromium/chrome/browser/quickactionsearchwidget/BraveQuickActionSearchWidgetProvider"));
Assert.assertTrue(classExists("org/chromium/chrome/browser/tasks/ReturnToChromeUtil"));
Assert.assertTrue(classExists("org/chromium/chrome/browser/IntentHandler"));
Assert.assertTrue(classExists("org/chromium/chrome/browser/BraveIntentHandler"));
Expand Down Expand Up @@ -449,6 +457,9 @@ public void testMethodsExist() throws Exception {
Assert.assertTrue(methodExists(
"org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider",
"setWidgetEnabled", false, null));
Assert.assertTrue(methodExists(
"org/chromium/chrome/browser/quickactionsearchwidget/QuickActionSearchWidgetProvider",
"setWidgetComponentEnabled", false, null));
Assert.assertTrue(methodExists(
"org/chromium/chrome/browser/notifications/permissions/NotificationPermissionRationaleDialogController",
"wrapDialogDismissalCallback", true, Callback.class, Callback.class));
Expand Down
5 changes: 4 additions & 1 deletion ...id/bytecode/java/org/brave/bytecode/BraveQuickActionSearchWidgetProviderClassAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ public BraveQuickActionSearchWidgetProviderClassAdapter(ClassVisitor visitor) {
super(visitor);
changeMethodOwner(sQuickActionSearchWidgetProviderClassName, "setWidgetEnabled",
sBraveQuickActionSearchWidgetProviderClassName);

deleteMethod(sBraveQuickActionSearchWidgetProviderClassName, "setWidgetComponentEnabled");
makePublicMethod(sQuickActionSearchWidgetProviderClassName, "setWidgetComponentEnabled");
}
}
}