Bläddra i källkod

Small spotbugs cleanup

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 år sedan
förälder
incheckning
422c0a5011

+ 21 - 17
app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -362,23 +362,7 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
 
                 final OCFile fileNew = getFile();
                 if (fileNew != null) {
-                    final List<Integer> additionalFilter = new ArrayList<>(
-                        Arrays.asList(
-                            R.id.action_rename_file,
-                            R.id.action_sync_file,
-                            R.id.action_select_all,
-                            R.id.action_move,
-                            R.id.action_copy,
-                            R.id.action_favorite,
-                            R.id.action_unset_favorite
-                                     ));
-                    if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
-                        additionalFilter.add(R.id.action_send_share_file);
-                    }
-                    final FragmentManager fragmentManager = getChildFragmentManager();
-                    FileActionsBottomSheet.newInstance(file, false, additionalFilter)
-                        .setResultListener(fragmentManager, this, this::onFileActionChosen)
-                        .show(fragmentManager, "actions");
+                    showFileActions(file);
                 }
             }
             return true;
@@ -386,6 +370,26 @@ public class PreviewImageFragment extends FileFragment implements Injectable {
         return super.onOptionsItemSelected(item);
     }
 
+    private void showFileActions(OCFile file) {
+        final List<Integer> additionalFilter = new ArrayList<>(
+            Arrays.asList(
+                R.id.action_rename_file,
+                R.id.action_sync_file,
+                R.id.action_select_all,
+                R.id.action_move,
+                R.id.action_copy,
+                R.id.action_favorite,
+                R.id.action_unset_favorite
+                         ));
+        if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
+            additionalFilter.add(R.id.action_send_share_file);
+        }
+        final FragmentManager fragmentManager = getChildFragmentManager();
+        FileActionsBottomSheet.newInstance(file, false, additionalFilter)
+            .setResultListener(fragmentManager, this, this::onFileActionChosen)
+            .show(fragmentManager, "actions");
+    }
+
     /**
      * {@inheritDoc}
      */

+ 21 - 17
app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -385,23 +385,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
 
                 final OCFile fileNew = getFile();
                 if (fileNew != null) {
-                    final List<Integer> additionalFilter = new ArrayList<>(
-                        Arrays.asList(
-                            R.id.action_rename_file,
-                            R.id.action_sync_file,
-                            R.id.action_select_all,
-                            R.id.action_move,
-                            R.id.action_copy,
-                            R.id.action_favorite,
-                            R.id.action_unset_favorite
-                                     ));
-                    if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
-                        additionalFilter.add(R.id.action_send_share_file);
-                    }
-                    final FragmentManager fragmentManager = getChildFragmentManager();
-                    FileActionsBottomSheet.newInstance(file, false, additionalFilter)
-                        .setResultListener(fragmentManager, this, this::onFileActionChosen)
-                        .show(fragmentManager, "actions");
+                    showFileActions(file);
                 }
             }
             return true;
@@ -409,6 +393,26 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
         return super.onOptionsItemSelected(item);
     }
 
+    private void showFileActions(OCFile file) {
+        final List<Integer> additionalFilter = new ArrayList<>(
+            Arrays.asList(
+                R.id.action_rename_file,
+                R.id.action_sync_file,
+                R.id.action_select_all,
+                R.id.action_move,
+                R.id.action_copy,
+                R.id.action_favorite,
+                R.id.action_unset_favorite
+                         ));
+        if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
+            additionalFilter.add(R.id.action_send_share_file);
+        }
+        final FragmentManager fragmentManager = getChildFragmentManager();
+        FileActionsBottomSheet.newInstance(file, false, additionalFilter)
+            .setResultListener(fragmentManager, this, this::onFileActionChosen)
+            .show(fragmentManager, "actions");
+    }
+
     public void onFileActionChosen(final int itemId) {
         if (itemId == R.id.action_send_share_file) {
             sendShareFile();

+ 21 - 17
app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

@@ -285,23 +285,7 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
 
                 final OCFile fileNew = getFile();
                 if (fileNew != null) {
-                    final List<Integer> additionalFilter = new ArrayList<>(
-                        Arrays.asList(
-                            R.id.action_rename_file,
-                            R.id.action_sync_file,
-                            R.id.action_select_all,
-                            R.id.action_move,
-                            R.id.action_copy,
-                            R.id.action_favorite,
-                            R.id.action_unset_favorite
-                                     ));
-                    if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
-                        additionalFilter.add(R.id.action_send_share_file);
-                    }
-                    final FragmentManager fragmentManager = getChildFragmentManager();
-                    FileActionsBottomSheet.newInstance(file, false, additionalFilter)
-                        .setResultListener(fragmentManager, this, this::onFileActionChosen)
-                        .show(fragmentManager, "actions");
+                    showFileActions(file);
                 }
             }
             return true;
@@ -309,6 +293,26 @@ public class PreviewTextFileFragment extends PreviewTextFragment {
         return super.onOptionsItemSelected(item);
     }
 
+    private void showFileActions(OCFile file) {
+        final List<Integer> additionalFilter = new ArrayList<>(
+            Arrays.asList(
+                R.id.action_rename_file,
+                R.id.action_sync_file,
+                R.id.action_select_all,
+                R.id.action_move,
+                R.id.action_copy,
+                R.id.action_favorite,
+                R.id.action_unset_favorite
+                         ));
+        if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
+            additionalFilter.add(R.id.action_send_share_file);
+        }
+        final FragmentManager fragmentManager = getChildFragmentManager();
+        FileActionsBottomSheet.newInstance(file, false, additionalFilter)
+            .setResultListener(fragmentManager, this, this::onFileActionChosen)
+            .show(fragmentManager, "actions");
+    }
+
     private void onFileActionChosen(final int itemId) {
         if (itemId == R.id.action_send_share_file) {
             if (getFile().isSharedWithMe() && !getFile().canReshare()) {