Skip to content

Commit a09f523

Browse files
Merge pull request #16598 from nextcloud/fix/npe-receive-external-files-activity
fix(receive-external-activity): npe adapter
2 parents 4129d64 + c5d91dc commit a09f523

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,9 +814,14 @@ private void populateDirectoryList(OCFile file) {
814814
}
815815

816816
private void setupReceiveExternalFilesAdapter(List<OCFile> files) {
817+
final var optionalUser = getUser();
818+
if (optionalUser.isEmpty()) {
819+
return;
820+
}
821+
817822
receiveExternalFilesAdapter = new ReceiveExternalFilesAdapter(files,
818823
this,
819-
getUser().get(),
824+
optionalUser.get(),
820825
getStorageManager(),
821826
viewThemeUtils,
822827
syncedFolderProvider,
@@ -1143,13 +1148,17 @@ private void setupSearchView(Menu menu) {
11431148
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
11441149
@Override
11451150
public boolean onQueryTextSubmit(String query) {
1146-
receiveExternalFilesAdapter.filter(query);
1151+
if (receiveExternalFilesAdapter != null) {
1152+
receiveExternalFilesAdapter.filter(query);
1153+
}
11471154
return false;
11481155
}
11491156

11501157
@Override
11511158
public boolean onQueryTextChange(String newText) {
1152-
receiveExternalFilesAdapter.filter(newText);
1159+
if (receiveExternalFilesAdapter != null) {
1160+
receiveExternalFilesAdapter.filter(newText);
1161+
}
11531162
return false;
11541163
}
11551164
});

0 commit comments

Comments
 (0)