Skip to content

Commit 28a6dcd

Browse files
Merge pull request #16093 from nextcloud/backport/16092/stable-3.35
[stable-3.35] fix: event bus drawer activity
2 parents 02dd88f + 0a0f89a commit 28a6dcd

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import android.accounts.AuthenticatorException;
1616
import android.accounts.OperationCanceledException;
1717
import android.app.Activity;
18-
import android.app.ComponentCaller;
1918
import android.content.Context;
2019
import android.content.Intent;
2120
import android.content.res.ColorStateList;
@@ -1208,6 +1207,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
12081207
preferences.setLockTimestamp(0);
12091208
finish();
12101209
}
1210+
} else if (requestCode == REQ_ALL_FILES_ACCESS || requestCode == REQ_MEDIA_ACCESS) {
1211+
checkStoragePermissionWarningBannerVisibility();
12111212
}
12121213
}
12131214

@@ -1436,15 +1437,6 @@ public BottomNavigationView getBottomNavigationView() {
14361437
return bottomNavigationView;
14371438
}
14381439

1439-
@Override
1440-
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data, @NonNull ComponentCaller caller) {
1441-
super.onActivityResult(requestCode, resultCode, data, caller);
1442-
1443-
if (requestCode == REQ_ALL_FILES_ACCESS || requestCode == REQ_MEDIA_ACCESS) {
1444-
checkStoragePermissionWarningBannerVisibility();
1445-
}
1446-
}
1447-
14481440
private void checkStoragePermissionWarningBannerVisibility() {
14491441
if (this instanceof SyncedFoldersActivity syncedFoldersActivity) {
14501442
syncedFoldersActivity.setupStoragePermissionWarningBanner();

0 commit comments

Comments
 (0)