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 9d01bd2..ed81a4a 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java
@@ -189,9 +189,7 @@ public class ShareFileFragment extends Fragment
     }
 
     // Get users and groups to fill the "share with" list
     }
 
     // Get users and groups to fill the "share with" list

-    private void getShares() {
-        mShares = new ArrayList<>();
-
+    private void getShares(){

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


@@ -254,7 +252,8 @@ public class ShareFileFragment extends Fragment
     }
 
     private void unshareWith(int shareId){
     }
 
     private void unshareWith(int shareId){

-        ( (ShareActivity) getActivity()).showWaitingLoadDialog();
+        ( (ShareActivity) getActivity()).showLoadingDialog(getActivity().getApplicationContext().
+                getString(R.string.common_loading));

         // Remove Share with id
         UnshareWithUserAsyncTask unshareTask = new UnshareWithUserAsyncTask(this);
         FileDataStorageManager fileDataStorageManager =
         // Remove Share with id
         UnshareWithUserAsyncTask unshareTask = new UnshareWithUserAsyncTask(this);
         FileDataStorageManager fileDataStorageManager =


@@ -266,7 +265,7 @@ public class ShareFileFragment extends Fragment
     @Override
     public void onUnshareWithFinish(RemoteOperationResult result) {
         // Remove loading
     @Override
     public void onUnshareWithFinish(RemoteOperationResult result) {
         // Remove loading

-        ((ShareActivity) getActivity()).dismissWaitingLoadDialog();
+        ((ShareActivity) getActivity()).dismissLoadingDialog();

 
         if (result != null && result.isSuccess()) {
             // Refresh data
 
         if (result != null && result.isSuccess()) {
             // Refresh data