Эх сурвалжийг харах

getCapability marked with @NonNull and associated npe check removed.

Signed-off-by: ardevd <edvard.holst@gmail.com>
ardevd 6 жил өмнө
parent
commit
f1f3d74ce6

+ 2 - 0
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -62,6 +62,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Locale;
 import java.util.Set;
 import java.util.Set;
 
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
@@ -2023,6 +2024,7 @@ public class FileDataStorageManager {
         return c;
         return c;
     }
     }
 
 
+    @NonNull
     public OCCapability getCapability(String accountName) {
     public OCCapability getCapability(String accountName) {
         OCCapability capability;
         OCCapability capability;
         Cursor c = getCapabilityCursorForAccount(accountName);
         Cursor c = getCapabilityCursorForAccount(accountName);

+ 2 - 4
src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -165,7 +165,7 @@ public class FileMenuFilter {
     private void filter(List<Integer> toShow, List<Integer> toHide, boolean inSingleFileFragment) {
     private void filter(List<Integer> toShow, List<Integer> toHide, boolean inSingleFileFragment) {
         boolean synchronizing = anyFileSynchronizing();
         boolean synchronizing = anyFileSynchronizing();
         OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
         OCCapability capability = mComponentsGetter.getStorageManager().getCapability(mAccount.name);
-        boolean endToEndEncryptionEnabled = capability != null && capability.getEndToEndEncryption().isTrue();
+        boolean endToEndEncryptionEnabled = capability.getEndToEndEncryption().isTrue();
 
 
         filterDownload(toShow, toHide, synchronizing);
         filterDownload(toShow, toHide, synchronizing);
         filterRename(toShow, toHide, synchronizing);
         filterRename(toShow, toHide, synchronizing);
@@ -184,9 +184,7 @@ public class FileMenuFilter {
         filterUnsetEncrypted(toShow, toHide, endToEndEncryptionEnabled);
         filterUnsetEncrypted(toShow, toHide, endToEndEncryptionEnabled);
         filterSetPictureAs(toShow, toHide);
         filterSetPictureAs(toShow, toHide);
         filterStream(toShow, toHide);
         filterStream(toShow, toHide);
-        if (endToEndEncryptionEnabled) {
-            filterOpenAsRichDocument(toShow, toHide, capability);
-        }
+        filterOpenAsRichDocument(toShow, toHide, capability);
     }
     }
 
 
     private void filterShareFile(List<Integer> toShow, List<Integer> toHide, OCCapability capability) {
     private void filterShareFile(List<Integer> toShow, List<Integer> toHide, OCCapability capability) {