Some minor clean-up

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

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 7f48b9e..43e11b1 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -61,7 +61,6 @@ import com.owncloud.android.operations.SynchronizeFolderOperation;
 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.operations.UnshareLinkOperation;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;

-import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;

 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 import com.owncloud.android.utils.ErrorMessageAdapter;
 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.dialog.SharePasswordDialogFragment;
 import com.owncloud.android.utils.ErrorMessageAdapter;


@@ -98,10 +97,10 @@ public class FileActivity extends SherlockFragmentActivity
     private boolean mRedirectingToSetupAccount = false;
     
     /** Flag to signal when the value of mAccount was set */ 
     private boolean mRedirectingToSetupAccount = false;
     
     /** Flag to signal when the value of mAccount was set */ 

-    private boolean mAccountWasSet;
+    protected boolean mAccountWasSet;

     
     /** Flag to signal when the value of mAccount was restored from a saved state */ 
     
     /** Flag to signal when the value of mAccount was restored from a saved state */ 

-    private boolean mAccountWasRestored;
+    protected boolean mAccountWasRestored;

     
     /** Flag to signal if the activity is launched by a notification */
     private boolean mFromNotification;
     
     /** Flag to signal if the activity is launched by a notification */
     private boolean mFromNotification;


@@ -176,41 +175,49 @@ public class FileActivity extends SherlockFragmentActivity
      */
     @Override
     protected void onRestart() {
      */
     @Override
     protected void onRestart() {

+        Log_OC.v(TAG, "onRestart() start");

         super.onRestart();
         super.onRestart();

-        boolean validAccount = (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name));
+        boolean validAccount =
+                (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name));

         if (!validAccount) {
             swapToDefaultAccount();
         }
         if (!validAccount) {
             swapToDefaultAccount();
         }

+        Log_OC.v(TAG, "onRestart() end");

     }
 
     
     @Override 
     protected void onStart() {
     }
 
     
     @Override 
     protected void onStart() {

+        Log_OC.v(TAG, "onStart() start");

         super.onStart();
 
         if (mAccountWasSet) {
             onAccountSet(mAccountWasRestored);
         }
         super.onStart();
 
         if (mAccountWasSet) {
             onAccountSet(mAccountWasRestored);
         }

+        Log_OC.v(TAG, "onStart() end");

     }
     
     @Override
     protected void onResume() {
     }
     
     @Override
     protected void onResume() {

+        Log_OC.v(TAG, "onResume() start");

         super.onResume();
         
         if (mOperationsServiceBinder != null) {
             doOnResumeAndBound();
         }
         super.onResume();
         
         if (mOperationsServiceBinder != null) {
             doOnResumeAndBound();
         }

-
+        Log_OC.v(TAG, "onResume() end");

     }
     
     @Override
     protected void onPause()  {
     }
     
     @Override
     protected void onPause()  {

-        
+        Log_OC.v(TAG, "onPause() start");
+

         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.removeOperationListener(this);
         }
         
         super.onPause();
         if (mOperationsServiceBinder != null) {
             mOperationsServiceBinder.removeOperationListener(this);
         }
         
         super.onPause();

+        Log_OC.v(TAG, "onPause() end");

     }
     
     
     }
     
     


@@ -243,9 +250,10 @@ public class FileActivity extends SherlockFragmentActivity
      *  @param account          New {@link Account} to set.
      *  @param savedAccount     When 'true', account was retrieved from a saved instance state.
      */
      *  @param account          New {@link Account} to set.
      *  @param savedAccount     When 'true', account was retrieved from a saved instance state.
      */

-    private void setAccount(Account account, boolean savedAccount) {
+    protected void setAccount(Account account, boolean savedAccount) {

         Account oldAccount = mAccount;
         Account oldAccount = mAccount;

-        boolean validAccount = (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), account.name));
+        boolean validAccount =
+                (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), account.name));

         if (validAccount) {
             mAccount = account;
             mAccountWasSet = true;
         if (validAccount) {
             mAccount = account;
             mAccountWasSet = true;


@@ -341,6 +349,10 @@ public class FileActivity extends SherlockFragmentActivity
         return mAccount;
     }
 
         return mAccount;
     }
 

+    protected void setAccount(Account account) {
+        mAccount = account;
+    }
+

     /**
      * @return Value of mFromNotification: True if the Activity is launched by a notification
      */
     /**
      * @return Value of mFromNotification: True if the Activity is launched by a notification
      */


@@ -542,7 +554,9 @@ public class FileActivity extends SherlockFragmentActivity
         } 
     }
 
         } 
     }
 

-    private void onSynchronizeFolderOperationFinish(SynchronizeFolderOperation operation, RemoteOperationResult result) {
+    private void onSynchronizeFolderOperationFinish(
+            SynchronizeFolderOperation operation, RemoteOperationResult result
+    ) {

         if (!result.isSuccess() && result.getCode() != ResultCode.CANCELLED){
             Toast t = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                     Toast.LENGTH_LONG);
         if (!result.isSuccess() && result.getCode() != ResultCode.CANCELLED){
             Toast t = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
                     Toast.LENGTH_LONG);