Skip to content

fix: event bus drawer activity #16092

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
alperozturk96 merged 1 commit into from
Dec 8, 2025
+2 −10
Merged

fix: event bus drawer activity #16092

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
12 changes: 2 additions & 10 deletions app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.app.ComponentCaller;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
Expand Down Expand Up @@ -1208,6 +1207,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
preferences.setLockTimestamp(0);
finish();
}
} else if (requestCode == REQ_ALL_FILES_ACCESS || requestCode == REQ_MEDIA_ACCESS) {
checkStoragePermissionWarningBannerVisibility();
}
}

Expand Down Expand Up @@ -1436,15 +1437,6 @@ public BottomNavigationView getBottomNavigationView() {
return bottomNavigationView;
}

@Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data, @NonNull ComponentCaller caller) {
super.onActivityResult(requestCode, resultCode, data, caller);

if (requestCode == REQ_ALL_FILES_ACCESS || requestCode == REQ_MEDIA_ACCESS) {
checkStoragePermissionWarningBannerVisibility();
}
}

private void checkStoragePermissionWarningBannerVisibility() {
if (this instanceof SyncedFoldersActivity syncedFoldersActivity) {
syncedFoldersActivity.setupStoragePermissionWarningBanner();
Expand Down
Loading