Adapt UnshareLinkOperation to support also ShareType: USER or GROUP. UnshareLinkOpera...

[pub/Android/ownCloud.git] / 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 4546cc0..ed81a4a 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -27,7 +27,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -42,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;
 
@@ -63,7 +62,8 @@ import java.util.ArrayList;
  * create an instance of this fragment.
  */
 public class ShareFileFragment extends Fragment
-        implements GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener, View.OnTouchListener {
+        implements UnshareWithUserAsyncTask.OnUnshareWithUserTaskListener{
+
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
     // the fragment initialization parameters
@@ -82,11 +82,11 @@ public class ShareFileFragment extends Fragment
     /**
      * Public factory method to create new ShareFileFragment instances.
      *
-     * @param fileToShare   An {@link OCFile} to show in the fragment
-     * @param account       An ownCloud account
+     * @param fileToShare An {@link OCFile} to show in the fragment
+     * @param account     An ownCloud account
      * @return A new instance of fragment ShareFileFragment.
      */
-    public static ShareFileFragment  newInstance(OCFile fileToShare, Account account) {
+    public static ShareFileFragment newInstance(OCFile fileToShare, Account account) {
         ShareFileFragment fragment = new ShareFileFragment();
         Bundle args = new Bundle();
         args.putParcelable(ARG_FILE, fileToShare);
@@ -122,7 +122,7 @@ public class ShareFileFragment extends Fragment
         if (mFile.isImage()) {
             String remoteId = String.valueOf(mFile.getRemoteId());
             Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(remoteId);
-            if (thumbnail != null){
+            if (thumbnail != null) {
                 icon.setImageBitmap(thumbnail);
             }
         }
@@ -131,7 +131,7 @@ public class ShareFileFragment extends Fragment
         filename.setText(mFile.getFileName());
         // Size
         TextView size = (TextView) view.findViewById(R.id.shareFileSize);
-        if (mFile.isFolder()){
+        if (mFile.isFolder()) {
             size.setVisibility(View.GONE);
         } else {
             size.setText(DisplayUtils.bytesToHumanReadable(mFile.getFileLength()));
@@ -190,8 +190,6 @@ public class ShareFileFragment extends Fragment
 
     // Get users and groups to fill the "share with" list
     private void getShares(){
-        mShares = new ArrayList<>();
-
         // Get Users and Groups
         FileDataStorageManager fileDataStorageManager =
                 new FileDataStorageManager(mAccount, getActivity().getContentResolver());
@@ -201,29 +199,7 @@ 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(){
+    private void updateListOfUserGroups() {
         // Update list of users/groups
         mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),
                 R.layout.share_user_item, mShares);
@@ -249,25 +225,57 @@ 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);
                 }
+                view.setAlpha(0);
+                view.animate().alpha(1).setDuration(500).start();
                 return false;
             }
         });
     }
 
-    @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        return false;
+    private void unshareWith(int shareId){
+        ( (ShareActivity) getActivity()).showLoadingDialog(getActivity().getApplicationContext().
+                getString(R.string.common_loading));
+        // 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()).dismissLoadingDialog();
+
+        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
     /**