Fixed error messages related with network in ShareActivity

[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 3078bf8..7d98d7a 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -41,6 +41,7 @@ import com.owncloud.android.operations.CreateShareWithShareeOperation;
 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;

+import com.owncloud.android.utils.ErrorMessageAdapter;

 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
 
 import java.util.ArrayList;
 import com.owncloud.android.utils.GetShareWithUsersAsyncTask;
 
 import java.util.ArrayList;


@@ -50,8 +51,7 @@ import java.util.ArrayList;
  */
 
 public class ShareActivity extends FileActivity
  */
 
 public class ShareActivity extends FileActivity

-        implements GetShareWithUsersAsyncTask.OnGetSharesWithUsersTaskListener,
-        ShareFileFragment.OnShareFragmentInteractionListener,
+        implements ShareFileFragment.OnShareFragmentInteractionListener,

         SearchFragment.OnSearchFragmentInteractionListener {
 
     private static final String TAG = ShareActivity.class.getSimpleName();
         SearchFragment.OnSearchFragmentInteractionListener {
 
     private static final String TAG = ShareActivity.class.getSimpleName();


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

+        onAccountSet(false);

 
         setContentView(R.layout.share_activity);
 
 
         setContentView(R.layout.share_activity);
 


@@ -85,7 +86,6 @@ public class ShareActivity extends FileActivity
                 if (mSearchFragment != null){
                     ft.hide(mShareFileFragment);
                     ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT);
                 if (mSearchFragment != null){
                     ft.hide(mShareFileFragment);
                     ft.add(R.id.share_fragment_container, mSearchFragment, TAG_SEARCH_FRAGMENT);

-                    ft.addToBackStack(TAG_SEARCH_FRAGMENT);

                 }
                 ft.commit();
             }
                 }
                 ft.commit();
             }


@@ -101,7 +101,7 @@ public class ShareActivity extends FileActivity
 
         handleIntent(getIntent());
 
 
         handleIntent(getIntent());
 

-        onAccountSet(false);
+

     }
 
 
     }
 
 


@@ -131,11 +131,6 @@ public class ShareActivity extends FileActivity
     }
 
     private void doShareWith(String shareeName, boolean isGroup) {
     }
 
     private void doShareWith(String shareeName, boolean isGroup) {

-        if (isGroup) {
-            Toast.makeText(this, "You want to SHARE with GROUP [" + shareeName + "]", Toast.LENGTH_SHORT).show();
-        } else {
-            Toast.makeText(this, "You want to SHARE with USER [" + shareeName + "]", Toast.LENGTH_SHORT).show();
-        }

         getFileOperationsHelper().shareFileWithSharee(
                 getFile(),
                 shareeName,
         getFileOperationsHelper().shareFileWithSharee(
                 getFile(),
                 shareeName,


@@ -188,8 +183,8 @@ public class ShareActivity extends FileActivity
     public void onBackPressed() {
         super.onBackPressed();
         if (mSearchFragment != null){
     public void onBackPressed() {
         super.onBackPressed();
         if (mSearchFragment != null){

-            getSupportFragmentManager().popBackStackImmediate();

             mSearchFragment = null;
             mSearchFragment = null;

+            getSupportFragmentManager().popBackStackImmediate();

             mShareFileFragment.refreshUsersOrGroupsListFromDB();
         }
     }
             mShareFileFragment.refreshUsersOrGroupsListFromDB();
         }
     }


@@ -204,26 +199,15 @@ public class ShareActivity extends FileActivity
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
         super.onRemoteOperationFinish(operation, result);
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
         super.onRemoteOperationFinish(operation, result);

-        if (operation instanceof UnshareOperation) {
-            refreshUsersInLists();
-        } else if(operation instanceof CreateShareWithShareeOperation){
-            refreshUsersInLists();
-        }
-    }
-
-    @Override
-    public void onGetDataShareWithFinish(RemoteOperationResult result) {
-        // Remove loading
-        dismissLoadingDialog();
-        if (result != null && result.isSuccess()) {
-            Log_OC.d(TAG, "Get Data Share With finishes sucessfully");

 
 

-        } else {
-            Toast.makeText(this, result.getLogMessage(), Toast.LENGTH_SHORT).show();
+        if (result.isSuccess()) {
+            refreshUsersInLists();
+            if (operation instanceof  CreateShareWithShareeOperation) {
+                // Clean action
+                getIntent().setAction(null);
+            }

         }
 
         }
 

-        // Data is on Database
-        refreshUsersInLists();

     }
 
     private void refreshUsersInLists(){
     }
 
     private void refreshUsersInLists(){