Changes from comments in PR #385

diff --git a/owncloud-android-library b/owncloud-android-library
index 8c87d88..2252bd4 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 8c87d88cff376038248216ea2eb00c0c5ed110e0
+Subproject commit 2252bd4c12263f163027bd81d0c6cafcce32eca2

diff --git a/src/com/owncloud/android/operations/UnshareLinkOperation.java b/src/com/owncloud/android/operations/UnshareLinkOperation.java
index 69fa596..ad23427 100644 (file)
--- a/src/com/owncloud/android/operations/UnshareLinkOperation.java
+++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java
@@ -22,7 +22,7 @@ import com.owncloud.android.lib.network.OwnCloudClient;
 import com.owncloud.android.lib.operations.common.OCShare;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.operations.common.OCShare;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult;
 import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode;

-import com.owncloud.android.lib.operations.remote.UnshareLinkRemoteOperation;
+import com.owncloud.android.lib.operations.remote.RemoveRemoteShareOperation;

 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.utils.Log_OC;
 
 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.utils.Log_OC;
 


@@ -54,10 +54,10 @@ public class UnshareLinkOperation extends SyncOperation {
         OCShare share = getStorageManager().getShareByPath(path);
         
         if (share != null) {
         OCShare share = getStorageManager().getShareByPath(path);
         
         if (share != null) {

-            UnshareLinkRemoteOperation operation = new UnshareLinkRemoteOperation((int) share.getIdRemoteShared());
+            RemoveRemoteShareOperation operation = new RemoveRemoteShareOperation((int) share.getIdRemoteShared());

             result = operation.execute(client);
 
             result = operation.execute(client);
 

-            if (result.isSuccess()) {
+            if (result.isSuccess() || result.getCode() == ResultCode.SHARE_NOT_FOUND) {

                 Log_OC.d(TAG, "Share id = " + share.getIdRemoteShared() + " deleted");
 
                 mFile.setShareByLink(false);
                 Log_OC.d(TAG, "Share id = " + share.getIdRemoteShared() + " deleted");
 
                 mFile.setShareByLink(false);


@@ -65,9 +65,13 @@ public class UnshareLinkOperation extends SyncOperation {
                 getStorageManager().saveFile(mFile);
                 getStorageManager().removeShare(share);
                 
                 getStorageManager().saveFile(mFile);
                 getStorageManager().removeShare(share);
                 

-            }
+                if (result.getCode() == ResultCode.SHARE_NOT_FOUND) {
+                    result = new RemoteOperationResult(ResultCode.OK);
+                }
+            } 
+                

         } else {
         } else {

-            result = new RemoteOperationResult(ResultCode.FILE_NOT_FOUND);
+            result = new RemoteOperationResult(ResultCode.SHARE_NOT_FOUND);

         }
 
         return result;
         }
 
         return result;

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 1456272..09d31c4 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -310,11 +310,12 @@ public class FileDetailFragment extends FileFragment implements
             toHide.add(R.id.action_remove_file);
             
         }
             toHide.add(R.id.action_remove_file);
             
         }

+        

         // Options shareLink
         if (!file.isShareByLink()) {
             toHide.add(R.id.action_unshare_file);
         }
         // Options shareLink
         if (!file.isShareByLink()) {
             toHide.add(R.id.action_unshare_file);
         }

-
+        

         MenuItem item = null;
         for (int i : toHide) {
             item = menu.findItem(i);
         MenuItem item = null;
         for (int i : toHide) {
             item = menu.findItem(i);

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 7691d77..a1ff5d4 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -21,7 +21,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;
 

-import com.actionbarsherlock.view.Menu;

 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;


@@ -354,25 +353,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                 return super.onContextItemSelected(item); 
         }
     }
                 return super.onContextItemSelected(item); 
         }
     }

-    
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        
-        List<Integer> toHide = new ArrayList<Integer>();
-        MenuItem item = null;
-        for (int i : toHide) {
-            item = (MenuItem) menu.findItem(i);
-            if (item != null) {
-                item.setVisible(false);
-                item.setEnabled(false);
-            }
-        }
-    }

 
 
     /**
 
 
     /**

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index e7c497e..c6d9825 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -229,6 +229,11 @@ public class PreviewImageFragment extends FileFragment implements   OnRemoteOper
         toHide.add(R.id.action_cancel_upload);
         toHide.add(R.id.action_download_file);
         toHide.add(R.id.action_rename_file);    // by now
         toHide.add(R.id.action_cancel_upload);
         toHide.add(R.id.action_download_file);
         toHide.add(R.id.action_rename_file);    // by now

+        
+        // Options shareLink
+        if (!getFile().isShareByLink()) {
+            toHide.add(R.id.action_unshare_file);
+        }

 
         for (int i : toHide) {
             item = menu.findItem(i);
 
         for (int i : toHide) {
             item = menu.findItem(i);


@@ -272,16 +277,6 @@ public class PreviewImageFragment extends FileFragment implements   OnRemoteOper
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);

-        
-        List<Integer> toHide = new ArrayList<Integer>();
-        MenuItem item = null;
-        for (int i : toHide) {
-            item = (MenuItem) menu.findItem(i);
-            if (item != null) {
-                item.setVisible(false);
-                item.setEnabled(false);
-            }
-        }

     }
 
 
     }
 
 

diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 1de8bb1..d68332e 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -289,7 +289,12 @@ public class PreviewMediaFragment extends FileFragment implements
         toHide.add(R.id.action_download_file);
         toHide.add(R.id.action_sync_file);
         toHide.add(R.id.action_rename_file);    // by now
         toHide.add(R.id.action_download_file);
         toHide.add(R.id.action_sync_file);
         toHide.add(R.id.action_rename_file);    // by now

-
+        
+        // Options shareLink
+        if (!getFile().isShareByLink()) {
+            toHide.add(R.id.action_unshare_file);
+        }
+        

         for (int i : toHide) {
             item = menu.findItem(i);
             if (item != null) {
         for (int i : toHide) {
             item = menu.findItem(i);
             if (item != null) {


@@ -331,16 +336,6 @@ public class PreviewMediaFragment extends FileFragment implements
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);

-        
-        List<Integer> toHide = new ArrayList<Integer>();
-        MenuItem item = null;
-        for (int i : toHide) {
-            item = (MenuItem) menu.findItem(i);
-            if (item != null) {
-                item.setVisible(false);
-                item.setEnabled(false);
-            }
-        }

     }
 
     
     }