X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9cdaddefa33a73b15e0845e7db6111b0d96a153c..671fef617b9bc67300e3d2cddbbfbe9fb8b4937b:/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 13c17c5f..1b95186b 100644
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -23,25 +23,22 @@ package com.owncloud.android.ui.fragment;
 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.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.shares.OCShare;
-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.utils.MimetypeIconUtil;
@@ -58,7 +55,8 @@ import java.util.ArrayList;
  * Use the {@link ShareFileFragment#newInstance} factory method to
  * create an instance of this fragment.
  */
-public class ShareFileFragment extends Fragment {
+public class ShareFileFragment extends Fragment
+        implements ShareUserListAdapter.ShareUserAdapterListener{
 
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
@@ -140,7 +138,7 @@ public class ShareFileFragment extends Fragment {
             @Override
             public void onClick(View view) {
                 // Show Search Fragment
-                mListener.showSearchUsersAndGroups();
+                mListener.showSearchUsersAndGroups(mShares);
             }
         });
 
@@ -151,14 +149,8 @@ public class ShareFileFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        refreshUsersOrGroupsList();
-    }
-
-    // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onShareFragmentInteraction(uri);
-        }
+        // Load data to the list (start process with an Async Task)
+        mListener.refreshUsersOrGroupsListFromServer();
     }
 
     @Override
@@ -178,14 +170,12 @@ public class ShareFileFragment extends Fragment {
         mListener = null;
     }
 
-    // Get users and groups to fill the "share with" list
-    public void refreshUsersOrGroupsList(){
-        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());
-        mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(),
+        mShares = ((ShareActivity) mListener).getStorageManager().getSharesWithForAFile(mFile.getRemotePath(),
                 mAccount.name);
 
         // Update list of users/groups
@@ -195,7 +185,7 @@ public class ShareFileFragment extends Fragment {
     private void updateListOfUserGroups() {
         // Update list of users/groups
         mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),
-                R.layout.share_user_item, mShares);
+                R.layout.share_user_item, mShares, this);
 
         // Show data
         TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers);
@@ -206,55 +196,20 @@ public class ShareFileFragment extends Fragment {
             usersList.setVisibility(View.VISIBLE);
             usersList.setAdapter(mUserGroupsAdapter);
 
-            // Add unshare options
-            registerLongClickListener(usersList);
-
         } else {
             noShares.setVisibility(View.VISIBLE);
             usersList.setVisibility(View.GONE);
         }
     }
 
-    private void registerLongClickListener(final ListView listView) {
-        listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            @Override
-            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(mShares.get(position));
-                            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;
-            }
-        });
-    }
-
-    private void unshareWith(OCShare share){
-        OCFile file = ((FileActivity) getActivity()).getFile();
-
-        ((FileActivity) getActivity()).getFileOperationsHelper().
-                unshareFileWithUserOrGroup(
-                        file, share.getShareType(), share.getShareWith()
-                );
+    @Override
+    public void unshareButtonPressed(OCShare share) {
+        // Unshare
+        mListener.unshareWith(share);
+        Log_OC.d(TAG, "Unshare - " + share.getSharedWithDisplayName());
     }
 
 
-    // TODO: review if it is necessary
     /**
      * This interface must be implemented by activities that contain this
      * fragment to allow an interaction in this fragment to be communicated
@@ -266,9 +221,9 @@ public class ShareFileFragment extends Fragment {
      * >Communicating with Other Fragments</a> for more information.
      */
     public interface OnShareFragmentInteractionListener {
-        void showSearchUsersAndGroups();
-
-        void onShareFragmentInteraction(Uri uri);
+        void showSearchUsersAndGroups(ArrayList<OCShare> shares);
+        void refreshUsersOrGroupsListFromServer();
+        void unshareWith(OCShare share);
     }
 
 }