Răsfoiți Sursa

Merge pull request #2807 from nextcloud/createExistingFolder

enhance folder already exists
Tobias Kaminsky 7 ani în urmă
părinte
comite
6d220f9bbb

+ 6 - 4
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -2109,10 +2109,12 @@ public class FileDisplayActivity extends HookActivity
             refreshListOfFilesFragment(false);
         } else {
             try {
-                DisplayUtils.showSnackMessage(
-                        this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources())
-                );
-
+                if (ResultCode.FOLDER_ALREADY_EXISTS == result.getCode()) {
+                    DisplayUtils.showSnackMessage(this, R.string.folder_already_exists);
+                } else {
+                    DisplayUtils.showSnackMessage(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation,
+                            getResources()));
+                }
             } catch (NotFoundException e) {
                 Log_OC.e(TAG, "Error while trying to show fail message ", e);
             }

+ 1 - 0
src/main/res/values/strings.xml

@@ -825,4 +825,5 @@
     <string name="stream">Stream with…</string>
     <string name="stream_not_possible_headline">Internal streaming not possible</string>
     <string name="stream_not_possible_message">Please download media instead or use external app.</string>
+    <string name="folder_already_exists">Folder already exists</string>
 </resources>