From fb835f4eab9c137cdaa1fa8068421a009f7ba3bf Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 6 Jun 2024 15:45:59 +0200
Subject: [PATCH 1/2] Show snackbar message instead throwing exception

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../android/ui/activity/ReceiveExternalFilesActivity.java    | 5 +++--
 app/src/main/res/values/strings.xml                          | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 437beee94c11..8942c12e009e 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -804,7 +804,8 @@ public void onSavedCertificate() {
 
     private void startSyncFolderOperation(OCFile folder) {
         if (folder == null) {
-            throw new IllegalArgumentException("Folder must not be null");
+            DisplayUtils.showSnackMessage(this, R.string.receive_external_files_activity_start_sync_folder_is_not_exists_message);
+            return;
         }
 
         long currentSyncTime = System.currentTimeMillis();
@@ -1070,7 +1071,7 @@ private OCFile getCurrentFolder() {
     }
 
     private void browseToRoot() {
-        OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
+        OCFile root = getStorageManager().getFileByEncryptedRemotePath(OCFile.ROOT_PATH);
         mFile = root;
         mParents.clear();
         mParents.add("");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1113f748a0e..da7ab5d6bdf9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -432,6 +432,8 @@
     <string name="clipboard_unexpected_error">Unexpected error while copying to clipboard</string>
     <string name="clipboard_label">Text copied from %1$s</string>
 
+    <string name="receive_external_files_activity_start_sync_folder_is_not_exists_message">Folder cannot be found, sync operation is cancelled</string>
+
     <string name="error_cant_bind_to_operations_service">Critical error: Unable to perform operations</string>
 
     <string name="network_error_socket_exception">An error occurred during connection to the server</string>

From 91ad15af86a0e6f47c72e27507f1b3946dcc8dd2 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 6 Jun 2024 15:49:12 +0200
Subject: [PATCH 2/2] Revert

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../android/ui/activity/ReceiveExternalFilesActivity.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 8942c12e009e..d06709242a5a 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -1071,7 +1071,7 @@ private OCFile getCurrentFolder() {
     }
 
     private void browseToRoot() {
-        OCFile root = getStorageManager().getFileByEncryptedRemotePath(OCFile.ROOT_PATH);
+        OCFile root = getStorageManager().getFileByPath(OCFile.ROOT_PATH);
         mFile = root;
         mParents.clear();
         mParents.add("");