Fixed build after rebasing

[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 0ae1502..81e7772 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -23,7 +23,6 @@ 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;


@@ -41,12 +40,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.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.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;


@@ -62,7 +62,7 @@ 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 {
+        implements GetShareWithUsersAsyncTask.OnGetSharesWithUsersTaskListener {

 
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 
 
     private static final String TAG = ShareFileFragment.class.getSimpleName();
 


@@ -79,6 +79,8 @@ public class ShareFileFragment extends Fragment
 
     private OnShareFragmentInteractionListener mListener;
 
 
     private OnShareFragmentInteractionListener mListener;
 

+    private FileDataStorageManager mFileDataStorageManager;
+

     /**
      * Public factory method to create new ShareFileFragment instances.
      *
     /**
      * Public factory method to create new ShareFileFragment instances.
      *


@@ -105,6 +107,7 @@ public class ShareFileFragment extends Fragment
         if (getArguments() != null) {
             mFile = getArguments().getParcelable(ARG_FILE);
             mAccount = getArguments().getParcelable(ARG_ACCOUNT);
         if (getArguments() != null) {
             mFile = getArguments().getParcelable(ARG_FILE);
             mAccount = getArguments().getParcelable(ARG_ACCOUNT);

+            mFileDataStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());

         }
     }
 
         }
     }
 


@@ -137,12 +140,6 @@ public class ShareFileFragment extends Fragment
             size.setText(DisplayUtils.bytesToHumanReadable(mFile.getFileLength()));
         }
 
             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 +158,8 @@ public class ShareFileFragment extends Fragment
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 

-        getShares();
-    }
-
-    // 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)
+        refreshUsersOrGroupsListFromServer();

     }
 
     @Override
     }
 
     @Override


@@ -188,41 +179,18 @@ 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
         // Get Users and Groups

-        FileDataStorageManager fileDataStorageManager =
-                new FileDataStorageManager(mAccount, getActivity().getContentResolver());
-        mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), mAccount.name);
+        mShares = mFileDataStorageManager.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() {
         // Update list of users/groups
         mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),
     private void updateListOfUserGroups() {
         // Update list of users/groups
         mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(),


@@ -246,15 +214,37 @@ public class ShareFileFragment extends Fragment
         }
     }
 
         }
     }
 

+    /**
+     * Get users and groups from the server to fill in the "share with" list
+     */
+    public void refreshUsersOrGroupsListFromServer(){
+        // Show loading
+        ((ShareActivity) getActivity()).showLoadingDialog(getString(R.string.common_loading));
+        // Get Users and Groups
+        GetShareWithUsersAsyncTask getTask = new GetShareWithUsersAsyncTask(this);
+        Object[] params = { mFile, mAccount, mFileDataStorageManager};
+        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);
                 }


@@ -265,6 +255,32 @@ public class ShareFileFragment extends Fragment
         });
     }
 
         });
     }
 

+    // Call to Unshare operation
+    private void unshareWith(OCShare share){
+        OCFile file = ((FileActivity) getActivity()).getFile();
+
+        ((FileActivity) getActivity()).getFileOperationsHelper().
+                unshareFileWithUserOrGroup(
+                        file, share.getShareType(), share.getShareWith()
+                );
+    }
+
+    @Override
+    public void onGetDataShareWithFinish(RemoteOperationResult result) {
+        // Remove loading
+        ((ShareActivity) getActivity()).dismissLoadingDialog();
+        if (result != null && result.isSuccess()) {
+            Log_OC.d(TAG, "Get Data Share With finishes sucessfully");
+
+        } else {
+            Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show();
+        }
+
+        // Data is on Database
+        refreshUsersOrGroupsListFromDB();
+    }
+
+

     // TODO: review if it is necessary
     /**
      * This interface must be implemented by activities that contain this
     // TODO: review if it is necessary
     /**
      * This interface must be implemented by activities that contain this


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

-
-        void onShareFragmentInteraction(Uri uri);

     }
 
 }
     }
 
 }