mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

getCapability marked with @NonNull and associated npe check removed.

Browse source 
Signed-off-by: ardevd <edvard.holst@gmail.com>
This commit is contained in:
ardevd 2019-03-27 10:29:52 +01:00
parent b96414d794
commit f1f3d74ce6
No known key found for this signature in database
GPG key ID: C30729EE3C9A3CCE
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

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

6
src/main/java/com/owncloud/android/files/FileMenuFilter.java
View file

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