X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/305536f8c249ae4ca528cf004fe71a26c7278ede..33a9d1f44728895239d79ed3b74df29c2827bdda:/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 17624300..03d3b833 100644
--- 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;
 
-import android.accounts.Account;
 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.v7.app.AppCompatActivity;
 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.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;
 
@@ -44,7 +43,7 @@ import com.owncloud.android.ui.fragment.ShareFileFragment;
  * Activity for sharing files
  */
 
-public class ShareActivity extends AppCompatActivity
+public class ShareActivity extends FileActivity
         implements ShareFileFragment.OnShareFragmentInteractionListener,
         SearchFragment.OnSearchFragmentInteractionListener {
 
@@ -55,22 +54,18 @@ public class ShareActivity extends AppCompatActivity
 
     private static final String DIALOG_WAIT_LOAD_DATA = "DIALOG_WAIT_LOAD_DATA";
 
-    private Account mAccount;
-    private OCFile mFile;
-
     private ShareFileFragment mShareFileFragment;
     private SearchFragment mSearchFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.share_activity);
 
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 
         if (savedInstanceState != null) {
-            mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
-            mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
 
             mShareFileFragment = (ShareFileFragment) getSupportFragmentManager().
                     getFragment(savedInstanceState, TAG_SHARE_FRAGMENT);
@@ -89,12 +84,8 @@ public class ShareActivity extends AppCompatActivity
             }
 
         } else {
-            // Read Extras
-            mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
-            mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
-
             // Add Share fragment
-            mShareFileFragment = ShareFileFragment.newInstance(mFile, mAccount);
+            mShareFileFragment = ShareFileFragment.newInstance(getFile(), getAccount());
             ft.replace(R.id.share_fragment_container, mShareFileFragment, TAG_SHARE_FRAGMENT);
             ft.commit();
 
@@ -148,9 +139,6 @@ public class ShareActivity extends AppCompatActivity
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putParcelable(FileActivity.EXTRA_FILE, mFile);
-        outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount);
-
         //Save the fragment's instance
         getSupportFragmentManager().putFragment(outState, TAG_SHARE_FRAGMENT, mShareFileFragment);
         if (mSearchFragment != null) {
@@ -159,10 +147,11 @@ public class ShareActivity extends AppCompatActivity
 
     }
 
+
     @Override
     public void showSearchUsersAndGroups() {
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        mSearchFragment = SearchFragment.newInstance(mFile, mAccount);
+        mSearchFragment = SearchFragment.newInstance(getFile(), getAccount());
         ft.hide(mShareFileFragment);
         ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT);
         ft.addToBackStack(TAG_SEARCH_FRAGMENT);
@@ -178,38 +167,41 @@ public class ShareActivity extends AppCompatActivity
         }
     }
 
+    /**
+     * 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
-    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);
+        }
 
     }
 
-    @Override
-    public void onSearchFragmentInteraction(Uri uri) {
-
-    }
+    private  void onGetSharesForFileOperationFinish(GetSharesForFileOperation operation, RemoteOperationResult result){
+        dismissLoadingDialog();
 
-    /**
-     * Show waiting for loading data
-     */
-    public void showWaitingLoadDialog() {
-        // Construct dialog
-        LoadingDialog loading = new LoadingDialog(
-                getResources().getString(R.string.common_loading));
-        FragmentManager fm = getSupportFragmentManager();
-        FragmentTransaction ft = fm.beginTransaction();
-        loading.show(ft, DIALOG_WAIT_LOAD_DATA);
+        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) {
 
-    /**
-     * Dismiss waiting for loading data
-     */
-    public void dismissWaitingLoadDialog(){
-        Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_LOAD_DATA);
-        if (frag != null) {
-            LoadingDialog loading = (LoadingDialog) frag;
-            loading.dismiss();
-        }
     }
 }