Replaced 'PIN code' by 'pass code'

[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 8a5449e..50b4175 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -151,6 +151,8 @@ public class FileActivity extends SherlockFragmentActivity
             mFromNotification = getIntent().getBooleanExtra(FileActivity.EXTRA_FROM_NOTIFICATION, false);
         }
 
             mFromNotification = getIntent().getBooleanExtra(FileActivity.EXTRA_FROM_NOTIFICATION, false);
         }
 

+        AccountUtils.updateAccountVersion(this); // best place, before any access to AccountManager or database
+

         setAccount(account, savedInstanceState != null);
         
         mOperationsServiceConnection = new OperationsServiceConnection();
         setAccount(account, savedInstanceState != null);
         
         mOperationsServiceConnection = new OperationsServiceConnection();


@@ -167,7 +169,6 @@ public class FileActivity extends SherlockFragmentActivity
 
     }
 
 
     }
 

-

     @Override
     protected void onNewIntent (Intent intent) {
         Log_OC.v(TAG, "onNewIntent() start");
     @Override
     protected void onNewIntent (Intent intent) {
         Log_OC.v(TAG, "onNewIntent() start");


@@ -197,42 +198,34 @@ public class FileActivity extends SherlockFragmentActivity
     
     @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");

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

-        Log_OC.v(TAG, "onDestroy() start");

         if (mOperationsServiceConnection != null) {
             unbindService(mOperationsServiceConnection);
             mOperationsServiceBinder = null;
         if (mOperationsServiceConnection != null) {
             unbindService(mOperationsServiceConnection);
             mOperationsServiceBinder = null;


@@ -247,7 +240,6 @@ public class FileActivity extends SherlockFragmentActivity
         }
 
         super.onDestroy();
         }
 
         super.onDestroy();

-        Log_OC.v(TAG, "onDestroy() end");

     }
     
     
     }