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 8cbc04e..03d3b83 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -34,6 +34,7 @@ import com.owncloud.android.providers.UsersAndGroupsSearchProvider;
 
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 
 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.operations.UnshareOperation;
 import com.owncloud.android.ui.fragment.SearchFragment;
 import com.owncloud.android.ui.fragment.ShareFileFragment;


@@ -59,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();


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

+

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


@@ -176,15 +179,25 @@ public class ShareActivity extends FileActivity
         super.onRemoteOperationFinish(operation, result);
         if (operation instanceof UnshareOperation) {
             if (mShareFileFragment != null){
         super.onRemoteOperationFinish(operation, result);
         if (operation instanceof UnshareOperation) {
             if (mShareFileFragment != null){

-                mShareFileFragment.refreshUsersOrGroupsList();
+                mShareFileFragment.refreshUsersOrGroupsListFromDB();

             }
             }

+        } else if (operation instanceof GetSharesForFileOperation) {
+            onGetSharesForFileOperationFinish((GetSharesForFileOperation) operation, result);

         }
 
     }
 
         }
 
     }
 

-    @Override
-    public void onShareFragmentInteraction(Uri uri) {
+    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
     }
 
     @Override