diff --git a/android/java/proguard.flags b/android/java/proguard.flags index 39271cd41fe..7c42510803f 100644 --- a/android/java/proguard.flags +++ b/android/java/proguard.flags @@ -56,7 +56,7 @@ -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken -keep class org.chromium.chrome.browser.tabmodel.TabGroupModelFilterImpl { - *** shouldUseParentIds(...); + *** shouldGroupWithParent(...); *** isTabModelRestored(...); } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 12d4bfb5b55..26a779a89a9 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -1123,9 +1123,10 @@ public class BytecodeTest { Assert.assertTrue( methodExists( "org/chromium/chrome/browser/tabmodel/TabGroupModelFilterImpl", - "shouldUseParentIds", + "shouldGroupWithParent", MethodModifier.REGULAR, boolean.class, + Tab.class, Tab.class)); Assert.assertTrue( methodExists( diff --git a/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/BraveTabGroupModelFilter.java b/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/BraveTabGroupModelFilter.java index 469795af061..8ff6a37f826 100644 --- a/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/BraveTabGroupModelFilter.java +++ b/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/BraveTabGroupModelFilter.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser.tabmodel; import org.chromium.base.BravePreferenceKeys; import org.chromium.base.BraveReflectionUtil; +import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabLaunchType; @@ -19,7 +20,8 @@ public class BraveTabGroupModelFilter { protected boolean mIsResetting; /** Call from {@link TabGroupModelFilterImpl} will be redirected here via bytecode. */ - public boolean shouldUseParentIds(Tab tab) { + @SuppressWarnings("UnusedMethod") + private boolean shouldGroupWithParent(Tab tab, @Nullable Tab parentTab) { if (linkClicked(tab.getLaunchType()) && ChromeSharedPreferences.getInstance() .readBoolean( @@ -36,7 +38,13 @@ public class BraveTabGroupModelFilter { // Otherwise just call parent. return (boolean) BraveReflectionUtil.invokeMethod( - TabGroupModelFilterImpl.class, this, "shouldUseParentIds", Tab.class, tab); + TabGroupModelFilterImpl.class, + this, + "shouldGroupWithParent", + Tab.class, + tab, + Tab.class, + parentTab); } /** Determine if a launch type is the result of linked being clicked. */ diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java index 16afd6ec928..085788e92b1 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java @@ -22,7 +22,7 @@ public class BraveTabGroupModelFilterClassAdapter extends BraveClassVisitor { changeMethodOwner( sTabGroupModelFilterClassName, - "shouldUseParentIds", + "shouldGroupWithParent", sBraveTabGroupModelFilterClassName); } }