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

API fixes after rebase

Browse source
This commit is contained in:
AndyScherzinger 2016-11-09 14:33:19 +01:00
parent 2a5d8a8aa6
commit a78aa605b6
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/owncloud/android/files/FileMenuFilter.java
View file

@ -32,6 +32,7 @@ import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.lib.resources.status.OCCapability; import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.services.OperationsService.OperationsServiceBinder; import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
import com.owncloud.android.ui.activity.ComponentsGetter; import com.owncloud.android.ui.activity.ComponentsGetter;
import com.owncloud.android.utils.MimeTypeUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -305,7 +306,7 @@ public class FileMenuFilter {
} }
private boolean isSingleImage() { private boolean isSingleImage() {
return isSingleSelection() && mFiles.iterator().next().isImage(); return isSingleSelection() && MimeTypeUtil.isImage(mFiles.iterator().next());
} }
private boolean allFiles() { private boolean allFiles() {

2
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -227,7 +227,7 @@ public class PreviewImageFragment extends FileFragment {
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.file_actions_menu, menu); inflater.inflate(R.menu.file_actions_menu, menu);
if(getFile().isDown() && getFile().isImage()) { if(getFile().isDown() && MimeTypeUtil.isImage(getFile())) {
menu.findItem(R.id.action_set_as_wallpaper).setVisible(false); menu.findItem(R.id.action_set_as_wallpaper).setVisible(false);
} }
} }