Get rid of dependency on Context in CreateShareOperation

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / ShareActivity.java

diff --git a/src/com/owncloud/android/ui/activity/ShareActivity.java b/src/com/owncloud/android/ui/activity/ShareActivity.java
index d7c7261..03d3b83 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -21,22 +21,21 @@
 
 package com.owncloud.android.ui.activity;
 
 
 package com.owncloud.android.ui.activity;
 

-import android.accounts.Account;

 import android.app.SearchManager;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;

-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;

 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentTransaction;

-import android.support.v7.app.AppCompatActivity;

 import android.widget.Toast;
 
 import com.owncloud.android.R;
 import android.widget.Toast;
 
 import com.owncloud.android.R;

-import com.owncloud.android.datamodel.OCFile;

 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.providers.UsersAndGroupsSearchProvider;

-import com.owncloud.android.ui.dialog.LoadingDialog;
+
+import com.owncloud.android.lib.common.operations.RemoteOperation;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.operations.GetSharesForFileOperation;
+import com.owncloud.android.operations.UnshareOperation;

 import com.owncloud.android.ui.fragment.SearchFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;
 
 import com.owncloud.android.ui.fragment.SearchFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;
 


@@ -61,6 +60,7 @@ public class ShareActivity extends FileActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

+

         setContentView(R.layout.share_activity);
 
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         setContentView(R.layout.share_activity);
 
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();


@@ -147,6 +147,7 @@ public class ShareActivity extends FileActivity
 
     }
 
 
     }
 

+

     @Override
     public void showSearchUsersAndGroups() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
     @Override
     public void showSearchUsersAndGroups() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();


@@ -166,11 +167,39 @@ public class ShareActivity extends FileActivity
         }
     }
 
         }
     }
 

+    /**
+     * Updates the view associated to the activity after the finish of some operation over files
+     * in the current account.
+     *
+     * @param operation Removal operation performed.
+     * @param result    Result of the removal.
+     */

     @Override
     @Override

-    public void onShareFragmentInteraction(Uri uri) {
+    public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
+        super.onRemoteOperationFinish(operation, result);
+        if (operation instanceof UnshareOperation) {
+            if (mShareFileFragment != null){
+                mShareFileFragment.refreshUsersOrGroupsListFromDB();
+            }
+        } else if (operation instanceof GetSharesForFileOperation) {
+            onGetSharesForFileOperationFinish((GetSharesForFileOperation) operation, result);
+        }

 
     }
 
 
     }
 

+    private  void onGetSharesForFileOperationFinish(GetSharesForFileOperation operation, RemoteOperationResult result){
+        dismissLoadingDialog();
+
+        if (!result.isSuccess()) {
+            Toast.makeText(getApplicationContext(), result.getLogMessage(), Toast.LENGTH_LONG).show();
+        }
+
+        // Show Shares
+        if (mShareFileFragment != null){
+            mShareFileFragment.refreshUsersOrGroupsListFromDB();
+        }
+    }
+

     @Override
     public void onSearchFragmentInteraction(Uri uri) {
 
     @Override
     public void onSearchFragmentInteraction(Uri uri) {