aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Shvadskiy <ashvadskiy@cyngn.com>2016-05-18 14:56:27 -0700
committerArtem Shvadskiy <ashvadskiy@cyngn.com>2016-05-18 16:34:46 -0700
commita6816a2da8c21171b840011ba3727032f0879306 (patch)
tree4fd0df43acb4ec2e907ba01f8a296fa3bada9f35
parentdee6e1f853a1d415d38cb11337e29a876f6b8652 (diff)
downloadandroid_packages_apps_CMFileManager-a6816a2da8c21171b840011ba3727032f0879306.tar.gz
android_packages_apps_CMFileManager-a6816a2da8c21171b840011ba3727032f0879306.tar.bz2
android_packages_apps_CMFileManager-a6816a2da8c21171b840011ba3727032f0879306.zip
Remove "Properties" from action menu for secure directory
Ideally we would allow the properties action to appear and ask the user to unlock the directory first, but that seems to be nigh impossible without refactoring SecureConsole. Change-Id: If619062d3c3db1855ac865811cf6b48e5ae5812f issue-id: FEIJ-692 (cherry picked from commit 9d2b05ef1f341449140b9a667cb12f767fc14bc5)
-rw-r--r--src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java
index 5f2ec4e2..49b66f89 100644
--- a/src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/ActionsDialog.java
@@ -682,7 +682,8 @@ public class ActionsDialog implements OnItemClickListener, OnItemLongClickListen
}
//- Remove properties option if multiple files selected
- if (selection != null && selection.size() > 1) {
+ // or this selection contains a secure folder.
+ if ((selection != null && selection.size() > 1) || containsSecureDirectory(selection)) {
menu.removeItem(R.id.mnu_actions_properties);
menu.removeItem(R.id.mnu_actions_properties_current_folder);
}
@@ -866,4 +867,22 @@ public class ActionsDialog implements OnItemClickListener, OnItemLongClickListen
}
return resources;
}
+
+ private boolean containsSecureDirectory(List<FileSystemObject> selection) {
+ if (mFso != null && FileHelper.isDirectory(mFso) && mFso.isSecure()) {
+ return true;
+ }
+
+ if (selection == null) {
+ return false;
+ }
+
+ for (FileSystemObject fso : selection) {
+ if (FileHelper.isDirectory(fso) && fso.isSecure()) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}