Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions changelog/unreleased/4986
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Crash when returning from external-file receive screen

A null guard has been added to `startSyncFolderOperation` in `ReceiveExternalFilesActivity` to prevent a NullPointerException when `getCurrentDir()` cannot resolve the current folder.

https://github.com/owncloud/android/issues/4738
https://github.com/owncloud/android/pull/4986
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,10 @@ public void onSavedCertificate() {
}

private void startSyncFolderOperation(OCFile folder) {
if (folder == null) {
Timber.w("startSyncFolderOperation called with a null folder; skipping sync");
return;
}

mSyncInProgress = true;

Expand Down
Loading