Get users/group from Server, to fill in 'Share with' list

[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..8a589db 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -23,11 +23,9 @@ package com.owncloud.android.ui.fragment;
 import android.accounts.Account;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.accounts.Account;
 import android.app.Activity;
 import android.graphics.Bitmap;

-import android.net.Uri;

 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 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;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;


@@ -42,12 +40,14 @@ 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.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.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;

+import com.owncloud.android.ui.activity.FileActivity;

 import com.owncloud.android.ui.activity.ShareActivity;
 import com.owncloud.android.ui.adapter.ShareUserListAdapter;
 import com.owncloud.android.utils.DisplayUtils;
 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.GetShareWithUsersAsyncTask;

 import com.owncloud.android.utils.MimetypeIconUtil;
 
 import java.util.ArrayList;
 import com.owncloud.android.utils.MimetypeIconUtil;
 
 import java.util.ArrayList;


@@ -63,7 +63,8 @@ import java.util.ArrayList;
  * create an instance of this fragment.
  */
 public class ShareFileFragment extends Fragment
  * create an instance of this fragment.
  */
 public class ShareFileFragment extends Fragment

-        implements GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener, View.OnTouchListener {
+        implements GetShareWithUsersAsyncTask.OnGetSharesWithUsersTaskListener {
+

     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
     // the fragment initialization parameters
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
     // the fragment initialization parameters


@@ -82,11 +83,11 @@ public class ShareFileFragment extends Fragment
     /**
      * Public factory method to create new ShareFileFragment instances.
      *
     /**
      * 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.
      */
      * @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);
         ShareFileFragment fragment = new ShareFileFragment();
         Bundle args = new Bundle();
         args.putParcelable(ARG_FILE, fileToShare);


@@ -122,7 +123,7 @@ public class ShareFileFragment extends Fragment
         if (mFile.isImage()) {
             String remoteId = String.valueOf(mFile.getRemoteId());
             Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(remoteId);
         if (mFile.isImage()) {
             String remoteId = String.valueOf(mFile.getRemoteId());
             Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(remoteId);

-            if (thumbnail != null){
+            if (thumbnail != null) {

                 icon.setImageBitmap(thumbnail);
             }
         }
                 icon.setImageBitmap(thumbnail);
             }
         }


@@ -131,18 +132,12 @@ public class ShareFileFragment extends Fragment
         filename.setText(mFile.getFileName());
         // Size
         TextView size = (TextView) view.findViewById(R.id.shareFileSize);
         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()));
         }
 
             size.setVisibility(View.GONE);
         } else {
             size.setText(DisplayUtils.bytesToHumanReadable(mFile.getFileLength()));
         }
 

-        // List of share with users
-        TextView noShares = (TextView) view.findViewById(R.id.shareNoUsers);
-
-        // TODO: Get shares from DB and show
-
-

         //  Add User Button
         Button addUserGroupButton = (Button)
                 view.findViewById(R.id.addUserButton);
         //  Add User Button
         Button addUserGroupButton = (Button)
                 view.findViewById(R.id.addUserButton);


@@ -161,14 +156,9 @@ public class ShareFileFragment extends Fragment
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 

-        getShares();
-    }
+        // Load data to the list (start process with an Async Task)
+        refreshUsersOrGroupsListFromServer();

 
 

-    // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onShareFragmentInteraction(uri);
-        }

     }
 
     @Override
     }
 
     @Override


@@ -188,42 +178,21 @@ public class ShareFileFragment extends Fragment
         mListener = null;
     }
 
         mListener = null;
     }
 

-    // Get users and groups to fill the "share with" list
-    private void getShares(){
-        mShares = new ArrayList<>();
-
+    /**
+     * Get users and groups fromn the DB to fill in the "share with" list
+     */
+    public void refreshUsersOrGroupsListFromDB (){

         // Get Users and Groups
         FileDataStorageManager fileDataStorageManager =
                 new FileDataStorageManager(mAccount, getActivity().getContentResolver());
         // Get Users and Groups
         FileDataStorageManager fileDataStorageManager =
                 new FileDataStorageManager(mAccount, getActivity().getContentResolver());

-        mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), mAccount.name);
+        mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(),
+                mAccount.name);

 
         // Update list of users/groups
         updateListOfUserGroups();
     }
 
 
         // Update list of users/groups
         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);
         // Update list of users/groups
         mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),
                 R.layout.share_user_item, mShares);


@@ -246,26 +215,93 @@ public class ShareFileFragment extends Fragment
         }
     }
 
         }
     }
 

+    /**
+     * Get users and groups from the server to fill in the "share with" list
+     */
+    public void refreshUsersOrGroupsListFromServer(){
+        mShares = new ArrayList<>();
+
+        // Show loading
+        ((ShareActivity) getActivity()).showLoadingDialog(getString(R.string.common_loading));
+        // Get Users and Groups
+        GetShareWithUsersAsyncTask getTask = new GetShareWithUsersAsyncTask(this);
+        FileDataStorageManager fileDataStorageManager = ((ShareActivity) getActivity()).getStorageManager();
+        Object[] params = { mFile, mAccount, fileDataStorageManager};
+        getTask.execute(params);
+    }
+

     private void registerLongClickListener(final ListView listView) {
         listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
     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);
                                            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(mShares.get(position));
+                            Log_OC.d(TAG, "Unshare - " +
+                                    mShares.get(position).getSharedWithDisplayName());
+                        }
+                    });
+

                 } else {
                     unshareButton.setVisibility(View.GONE);
                 }
                 } else {
                     unshareButton.setVisibility(View.GONE);
                 }

+                view.setAlpha(0);
+                view.animate().alpha(1).setDuration(500).start();

                 return false;
             }
         });
     }
 
                 return false;
             }
         });
     }
 

+    // Call to Unshare operation
+    private void unshareWith(OCShare share){
+        OCFile file = ((FileActivity) getActivity()).getFile();
+
+        ((FileActivity) getActivity()).getFileOperationsHelper().
+                unshareFileWithUserOrGroup(
+                        file, share.getShareType(), share.getShareWith()
+                );
+    }
+

     @Override
     @Override

-    public boolean onTouch(View v, MotionEvent event) {
-        return false;
+    public void onGetDataShareWithFinish(RemoteOperationResult result) {
+        // Remove loading
+        ((ShareActivity) getActivity()).dismissLoadingDialog();
+        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
+            mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),
+                    R.layout.share_user_item, mShares);
+
+            // Show data
+            TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers);
+            ListView usersList = (ListView) getView().findViewById(R.id.shareUsersList);
+
+            if (mShares.size() > 0) {
+                noShares.setVisibility(View.GONE);
+                usersList.setVisibility(View.VISIBLE);
+                usersList.setAdapter(mUserGroupsAdapter);
+
+            } else {
+                noShares.setVisibility(View.VISIBLE);
+                usersList.setVisibility(View.GONE);
+            }
+        } else {
+            Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show();
+        }

     }
 
 
     }
 
 


@@ -282,8 +318,6 @@ public class ShareFileFragment extends Fragment
      */
     public interface OnShareFragmentInteractionListener {
         void showSearchUsersAndGroups();
      */
     public interface OnShareFragmentInteractionListener {
         void showSearchUsersAndGroups();

-
-        void onShareFragmentInteraction(Uri uri);

     }
 
 }
     }
 
 }