From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 22 Apr 2015 07:35:37 +0000 (+0200)
Subject: Merge branch 'develop' into loging_different_servers_same_pattern
X-Git-Tag: test~30^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/968c535e19e40bee7df8609fd050bc2196ca95e6?ds=sidebyside

Merge branch 'develop' into loging_different_servers_same_pattern

Conflicts SOLVED in:
	src/com/owncloud/android/ui/activity/FileActivity.java
---

968c535e19e40bee7df8609fd050bc2196ca95e6
diff --cc src/com/owncloud/android/ui/activity/FileActivity.java
index e3af8368,8a5449e7..17aa8c04
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@@ -169,6 -167,17 +169,16 @@@ public class FileActivity extends Sherl
  
      }
  
 -
+     @Override
+     protected void onNewIntent (Intent intent) {
+         Log_OC.v(TAG, "onNewIntent() start");
+         Account current = AccountUtils.getCurrentOwnCloudAccount(this);
+         if (current != null && mAccount != null && !mAccount.name.equals(current.name)) {
+             mAccount = current;
+         }
+         Log_OC.v(TAG, "onNewIntent() stop");
+     }
+ 
      /**
       *  Since ownCloud {@link Account}s can be managed from the system setting menu, 
       *  the existence of the {@link Account} associated to the instance must be checked