X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3de67c45e4a2cbd8869ea28ef422eab1762d3e9b..1bdd67229590048bb37134aeb94426ea77faeaf6:/src/com/owncloud/android/ui/fragment/ShareFileFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
index 0ae15020..9d01bd25 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -41,13 +41,13 @@ import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
-import com.owncloud.android.lib.resources.shares.ShareType;
 import com.owncloud.android.ui.activity.ShareActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
 import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.GetShareWithUserAsyncTask;
 import com.owncloud.android.utils.MimetypeIconUtil;
+import com.owncloud.android.utils.UnshareWithUserAsyncTask;
 
 import java.util.ArrayList;
 
@@ -62,7 +62,7 @@ import java.util.ArrayList;
  * create an instance of this fragment.
  */
 public class ShareFileFragment extends Fragment
-        implements GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener {
+        implements UnshareWithUserAsyncTask.OnUnshareWithUserTaskListener{
 
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
@@ -201,28 +201,6 @@ public class ShareFileFragment extends Fragment
         updateListOfUserGroups();
     }
 
-    @Override
-    public void onGetDataShareWithFinish(RemoteOperationResult result) {
-        // Remove loading
-        ((ShareActivity) getActivity()).dismissWaitingLoadDialog();
-        if (result != null && result.isSuccess()) {
-            // update local database
-            for (Object obj : result.getData()) {
-                if (((OCShare) obj).getShareType() == ShareType.USER ||
-                        ((OCShare) obj).getShareType() == ShareType.GROUP) {
-                    mShares.add((OCShare) obj);
-                }
-            }
-
-            // Update list of users/groups
-            updateListOfUserGroups();
-
-        } else {
-            Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show();
-        }
-
-    }
-
     private void updateListOfUserGroups() {
         // Update list of users/groups
         mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),
@@ -249,12 +227,22 @@ public class ShareFileFragment extends Fragment
     private void registerLongClickListener(final ListView listView) {
         listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
-            public boolean onItemLongClick(AdapterView<?> parent, View view, int position,
+            public boolean onItemLongClick(AdapterView<?> parent, View view, final int position,
                                            long id) {
                 // Show unshare button
                 ImageView unshareButton = (ImageView) view.findViewById(R.id.unshareButton);
                 if (unshareButton.getVisibility() == View.GONE) {
                     unshareButton.setVisibility(View.VISIBLE);
+                    unshareButton.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            // Unshare
+                            unshareWith((int)(mShares.get(position).getIdRemoteShared()));
+                            Log_OC.d(TAG, "Unshare - " +
+                                    mShares.get(position).getSharedWithDisplayName());
+                        }
+                    });
+
                 } else {
                     unshareButton.setVisibility(View.GONE);
                 }
@@ -265,6 +253,31 @@ public class ShareFileFragment extends Fragment
         });
     }
 
+    private void unshareWith(int shareId){
+        ( (ShareActivity) getActivity()).showWaitingLoadDialog();
+        // Remove Share with id
+        UnshareWithUserAsyncTask unshareTask = new UnshareWithUserAsyncTask(this);
+        FileDataStorageManager fileDataStorageManager =
+                new FileDataStorageManager(mAccount, getActivity().getContentResolver());
+        Object[] params = { shareId, mAccount, fileDataStorageManager};
+        unshareTask.execute(params);
+    }
+
+    @Override
+    public void onUnshareWithFinish(RemoteOperationResult result) {
+        // Remove loading
+        ((ShareActivity) getActivity()).dismissWaitingLoadDialog();
+
+        if (result != null && result.isSuccess()) {
+            // Refresh data
+            //TODO: Refresh file or delete the user from the list
+            updateListOfUserGroups();
+
+        } else {
+            Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
     // TODO: review if it is necessary
     /**
      * This interface must be implemented by activities that contain this