From: masensio Date: Mon, 4 May 2015 12:54:49 +0000 (+0200) Subject: Enable/disable share option in the menu: long press and details menu, using setup... X-Git-Tag: test~15^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/05df07a362565f65fa5eaa2cfe73e878c740f74e?ds=inline;hp=--cc Enable/disable share option in the menu: long press and details menu, using setup option --- 05df07a362565f65fa5eaa2cfe73e878c740f74e diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java index 04e9fbc1..7dcf8ebf 100644 --- a/src/com/owncloud/android/files/FileMenuFilter.java +++ b/src/com/owncloud/android/files/FileMenuFilter.java @@ -216,7 +216,9 @@ public class FileMenuFilter { // SHARE FILE // TODO add check on SHARE available on server side? - if (mFile == null) { + boolean shareAllowed = (mContext != null && + mContext.getString(R.string.share_link).equalsIgnoreCase("on")); + if (!shareAllowed || mFile == null) { toHide.add(R.id.action_share_file); } else { toShow.add(R.id.action_share_file); @@ -224,13 +226,12 @@ public class FileMenuFilter { // UNSHARE FILE // TODO add check on SHARE available on server side? - if (mFile == null || !mFile.isShareByLink()) { + if ( !shareAllowed || (mFile == null || !mFile.isShareByLink())) { toHide.add(R.id.action_unshare_file); } else { toShow.add(R.id.action_unshare_file); } - - + // SEE DETAILS if (mFile == null || mFile.isFolder()) { toHide.add(R.id.action_see_details);