Remove unshare with users/groups option from the menu

diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml
index 83780bc..586ec4a 100644 (file)
--- a/res/menu/file_actions_menu.xml
+++ b/res/menu/file_actions_menu.xml
@@ -32,10 +32,7 @@
         android:id="@+id/action_share_with_users"
         android:title="@string/action_share_with_users"
         android:orderInCategory="1" />
         android:id="@+id/action_share_with_users"
         android:title="@string/action_share_with_users"
         android:orderInCategory="1" />

-    <item
-        android:id="@+id/action_unshare_with_users"
-        android:title="@string/action_unshare_with_users"
-        android:orderInCategory="1" />
+

     <item
         android:id="@+id/action_open_file_with"
         android:title="@string/actionbar_open_with"
     <item
         android:id="@+id/action_open_file_with"
         android:title="@string/actionbar_open_with"

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5fbee3e..6e8bf2d 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,7 +88,6 @@
     <string name="action_share_file">Share link</string>
     <string name="action_unshare_file">Unshare link</string>
     <string name="action_share_with_users">Share with users</string>
     <string name="action_share_file">Share link</string>
     <string name="action_unshare_file">Unshare link</string>
     <string name="action_share_with_users">Share with users</string>

-    <string name="action_unshare_with_users">Unshare with users</string>

     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>

diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java
index 364d161..8c04842 100644 (file)
--- a/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@ -208,12 +208,6 @@ public class FileMenuFilter {
             toShow.add(R.id.action_share_with_users);
         }
 
             toShow.add(R.id.action_share_with_users);
         }
 

-        // UNSHARE FILE, with Users
-        if ( !shareAllowed || !shareWithUsersEnable || (mFile == null || !mFile.isSharedViaUsers())) {
-            toHide.add(R.id.action_unshare_with_users);
-        } else {
-            toShow.add(R.id.action_unshare_with_users);
-        }

 
         // SEE DETAILS
         if (mFile == null || mFile.isFolder()) {
 
         // SEE DETAILS
         if (mFile == null || mFile.isFolder()) {