Adaption to refactoring of library from GetRemoteUsersOrGroupsOperation to GetRemoteS...

[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..0aacdeb 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ShareActivity.java
+++ b/src/com/owncloud/android/ui/activity/ShareActivity.java
@@ -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);
+

     }
 
 
     }
 
 


@@ -132,9 +132,9 @@ public class ShareActivity extends FileActivity
 
     private void doShareWith(String shareeName, boolean isGroup) {
         if (isGroup) {
 
     private void doShareWith(String shareeName, boolean isGroup) {
         if (isGroup) {

-            Toast.makeText(this, "You want to SHARE with GROUP [" + shareeName + "]", Toast.LENGTH_SHORT).show();
+           Log_OC.d(TAG, "You want to SHARE with GROUP [" + shareeName + "]");

         } else {
         } else {

-            Toast.makeText(this, "You want to SHARE with USER [" + shareeName + "]", Toast.LENGTH_SHORT).show();
+           Log_OC.d(TAG, "You want to SHARE with USER [" + shareeName + "]");

         }
         getFileOperationsHelper().shareFileWithSharee(
                 getFile(),
         }
         getFileOperationsHelper().shareFileWithSharee(
                 getFile(),


@@ -188,8 +188,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();
         }
     }


@@ -208,6 +208,8 @@ public class ShareActivity extends FileActivity
             refreshUsersInLists();
         } else if(operation instanceof CreateShareWithShareeOperation){
             refreshUsersInLists();
             refreshUsersInLists();
         } else if(operation instanceof CreateShareWithShareeOperation){
             refreshUsersInLists();

+            // Clean action
+            getIntent().setAction(null);

         }
     }
 
         }
     }