From caff30d5197445805461a70ff0f63cb25efdb853 Mon Sep 17 00:00:00 2001 From: ibrahim-iqbal Date: Sat, 26 Sep 2026 17:34:57 +0530 Subject: [PATCH 1/2] chore: add calens file Signed-off-by: ibrahim-iqbal --- changelog/unreleased/4986 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/unreleased/4986 diff --git a/changelog/unreleased/4986 b/changelog/unreleased/4986 new file mode 100644 index 00000000000..d4266e778c2 --- /dev/null +++ b/changelog/unreleased/4986 @@ -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 From 2698becc358e7283c7a686ae6a7425f6c0bd6cf7 Mon Sep 17 00:00:00 2001 From: ibrahim-iqbal Date: Sat, 26 Sep 2026 17:34:57 +0530 Subject: [PATCH 2/2] fix: guard startSyncFolderOperation against a null folder (#4738) Signed-off-by: ibrahim-iqbal --- .../android/ui/activity/ReceiveExternalFilesActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java index 2d0af9aeca0..0c6f61d81e9 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java @@ -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;