浏览代码

Merge pull request #2803 from nextcloud/switchWithDefault

use default in switch
Andy Scherzinger 6 年之前
父节点
当前提交
1e2240e812
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

+ 5 - 3
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -999,9 +999,7 @@ public class FileDisplayActivity extends HookActivity
                 remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();
                 remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();
             }
             }
 
 
-            // default, as fallback
-            int behaviour = FileUploader.LOCAL_BEHAVIOUR_FORGET;
-
+            int behaviour;
             switch (resultCode) {
             switch (resultCode) {
                 case UploadFilesActivity.RESULT_OK_AND_MOVE:
                 case UploadFilesActivity.RESULT_OK_AND_MOVE:
                     behaviour = FileUploader.LOCAL_BEHAVIOUR_MOVE;
                     behaviour = FileUploader.LOCAL_BEHAVIOUR_MOVE;
@@ -1014,6 +1012,10 @@ public class FileDisplayActivity extends HookActivity
                 case UploadFilesActivity.RESULT_OK_AND_DO_NOTHING:
                 case UploadFilesActivity.RESULT_OK_AND_DO_NOTHING:
                     behaviour = FileUploader.LOCAL_BEHAVIOUR_FORGET;
                     behaviour = FileUploader.LOCAL_BEHAVIOUR_FORGET;
                     break;
                     break;
+
+                default:
+                    behaviour = FileUploader.LOCAL_BEHAVIOUR_FORGET;
+                    break;
             }
             }
 
 
             FileUploader.UploadRequester requester = new FileUploader.UploadRequester();
             FileUploader.UploadRequester requester = new FileUploader.UploadRequester();