Skip to content

[Android] Fixes crash on closing tabs with Tab Groups #8138

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

Merged
merged 1 commit into from
Mar 5, 2021
Merged

[Android] Fixes crash on closing tabs with Tab Groups #8138

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
1 change: 1 addition & 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 @@ -103,6 +103,7 @@
*** mTabModelSelector;
*** mIncognitoStateProvider;
*** mTabCountProvider;
*** mTabGroupUi;
*** onOrientationChange(...);
*** updateButtonStatus(...);
*** updateBookmarkButtonStatus(...);
Expand Down
9 changes: 3 additions & 6 deletions android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import java.util.List;

public class BraveToolbarManager extends ToolbarManager {
// To delete in bytecode, members from parent class will be used instead.
private ObservableSupplierImpl<BottomControlsCoordinator> mBottomControlsCoordinatorSupplier;
private CallbackController mCallbackController;
private BrowserControlsSizer mBrowserControlsSizer;
Expand All @@ -94,15 +95,16 @@ public class BraveToolbarManager extends ToolbarManager {
private TabModelSelector mTabModelSelector;
private IncognitoStateProvider mIncognitoStateProvider;
private TabCountProvider mTabCountProvider;
private TabGroupUi mTabGroupUi;

// Own members.
private boolean mIsBottomToolbarVisible;
private ObservableSupplier<Boolean> mOmniboxFocusStateSupplier;
private OneshotSupplier<LayoutStateProvider> mLayoutStateProviderSupplier;
private HomepageManager.HomepageStateListener mBraveHomepageStateListener;
private AppCompatActivity mActivity;
private WindowAndroid mWindowAndroid;
private CompositorViewHolder mCompositorViewHolder;
private TabGroupUi mTabGroupUi;

public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer controlsSizer,
FullscreenManager fullscreenManager, ToolbarControlContainer controlContainer,
Expand Down Expand Up @@ -191,11 +193,6 @@ public void enableBottomControls() {
updateBottomToolbarVisibility();
}

@Override
public TabGroupUi getTabGroupUi() {
return mTabGroupUi;
}

@Override
public void initializeWithNative(LayoutManagerImpl layoutManager,
OnClickListener tabSwitcherClickHandler, OnClickListener newTabClickHandler,
Expand Down
2 changes: 2 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 @@ -326,6 +326,8 @@ public void testFieldsExist() throws Exception {
"org/chromium/chrome/browser/toolbar/ToolbarManager", "mIncognitoStateProvider"));
Assert.assertTrue(fieldExists(
"org/chromium/chrome/browser/toolbar/ToolbarManager", "mTabCountProvider"));
Assert.assertTrue(
fieldExists("org/chromium/chrome/browser/toolbar/ToolbarManager", "mTabGroupUi"));
Assert.assertTrue(
fieldExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator",
"mTabSwitcherModeCoordinatorPhone"));
Expand Down
3 changes: 3 additions & 0 deletions build/android/bytecode/java/org/brave/bytecode/BraveToolbarManagerClassAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ public BraveToolbarManagerClassAdapter(ClassVisitor visitor) {
deleteField(sBraveToolbarManagerClassName, "mTabCountProvider");
makeProtectedField(sToolbarManagerClassName, "mTabCountProvider");

deleteField(sBraveToolbarManagerClassName, "mTabGroupUi");
makeProtectedField(sToolbarManagerClassName, "mTabGroupUi");

makePublicMethod(sToolbarManagerClassName, "onOrientationChange");
addMethodAnnotation(
sBraveToolbarManagerClassName, "onOrientationChange", "Ljava/lang/Override;");
Expand Down