From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 5 May 2015 11:43:01 +0000 (+0200)
Subject: Merge branch 'develop' into pinEnhancement
X-Git-Tag: test~19^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dcd8dde86400e2d36a25141b3ce3dfdb49965033?ds=inline;hp=-c

Merge branch 'develop' into pinEnhancement
---

dcd8dde86400e2d36a25141b3ce3dfdb49965033
diff --combined src/com/owncloud/android/ui/activity/FileActivity.java
index 50b41751,373603e6..fbb62edd
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@@ -136,9 -136,8 +136,8 @@@ public class FileActivity extends Sherl
          super.onCreate(savedInstanceState);
          mHandler = new Handler();
          mFileOperationsHelper = new FileOperationsHelper(this);
-         Account account;
+         Account account = null;
          if(savedInstanceState != null) {
-             account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
              mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
              mFromNotification = savedInstanceState.getBoolean(FileActivity.EXTRA_FROM_NOTIFICATION);
              mFileOperationsHelper.setOpIdWaitingFor(
@@@ -198,34 -197,42 +197,34 @@@
      
      @Override 
      protected void onStart() {
 -        Log_OC.v(TAG, "onStart() start");
          super.onStart();
  
          if (mAccountWasSet) {
              onAccountSet(mAccountWasRestored);
          }
 -        Log_OC.v(TAG, "onStart() end");
      }
      
      @Override
      protected void onResume() {
 -        Log_OC.v(TAG, "onResume() start");
          super.onResume();
          
          if (mOperationsServiceBinder != null) {
              doOnResumeAndBound();
          }
 -        Log_OC.v(TAG, "onResume() end");
      }
      
      @Override
      protected void onPause()  {
 -        Log_OC.v(TAG, "onPause() start");
 -
          if (mOperationsServiceBinder != null) {
              mOperationsServiceBinder.removeOperationListener(this);
          }
          
          super.onPause();
 -        Log_OC.v(TAG, "onPause() end");
      }
      
      
      @Override
      protected void onDestroy() {
 -        Log_OC.v(TAG, "onDestroy() start");
          if (mOperationsServiceConnection != null) {
              unbindService(mOperationsServiceConnection);
              mOperationsServiceBinder = null;
@@@ -240,6 -247,7 +239,6 @@@
          }
  
          super.onDestroy();
 -        Log_OC.v(TAG, "onDestroy() end");
      }
      
      
@@@ -316,7 -324,6 +315,6 @@@
      protected void onSaveInstanceState(Bundle outState) {
          super.onSaveInstanceState(outState);
          outState.putParcelable(FileActivity.EXTRA_FILE, mFile);
-         outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount);
          outState.putBoolean(FileActivity.EXTRA_FROM_NOTIFICATION, mFromNotification);
          outState.putLong(KEY_WAITING_FOR_OP_ID, mFileOperationsHelper.getOpIdWaitingFor());
          outState.putBoolean(KEY_TRY_SHARE_AGAIN, mTryShareAgain);