diff --git a/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java index f628688441..25336141e7 100644 --- a/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java +++ b/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java @@ -177,7 +177,6 @@ public class FileMenuFilter { filterStream(toHide); filterLock(toHide, fileLockingEnabled); filterUnlock(toHide, fileLockingEnabled); - filterLockInfo(toHide, fileLockingEnabled); return toHide; } @@ -243,17 +242,6 @@ public class FileMenuFilter { } } - private void filterLockInfo(List toHide, boolean fileLockingEnabled) { - if (files.isEmpty() || !isSingleSelection() || !fileLockingEnabled) { - toHide.add(R.id.menu_group_lock_info); - } else { - OCFile file = files.iterator().next(); - if (!file.isLocked()) { - toHide.add(R.id.menu_group_lock_info); - } - } - } - private void filterEncrypt(List toHide, boolean endToEndEncryptionEnabled) { if (files.isEmpty() || !isSingleSelection() || isSingleFile() || isEncryptedFolder() || isGroupFolder() || !endToEndEncryptionEnabled || !isEmptyFolder()) { diff --git a/app/src/main/res/menu/fragment_file_detail.xml b/app/src/main/res/menu/fragment_file_detail.xml deleted file mode 100644 index c0b346ff27..0000000000 --- a/app/src/main/res/menu/fragment_file_detail.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/menu/item_file.xml b/app/src/main/res/menu/item_file.xml deleted file mode 100644 index 658e880e7e..0000000000 --- a/app/src/main/res/menu/item_file.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml new file mode 100644 index 0000000000..20b360411d --- /dev/null +++ b/app/src/main/res/values/ids.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +