X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/576de8a8bcd3991cc3f701c1c353630ddbafc8e5..e2f73945571d8690901094f045c9b61d9aecefd0:/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 31e3e862..f0038662 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -87,7 +87,6 @@ public abstract class FileActivity extends SherlockFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - Account account; if(savedInstanceState != null) { account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT); @@ -100,6 +99,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { } setAccount(account, savedInstanceState != null); + } @@ -149,6 +149,11 @@ public abstract class FileActivity extends SherlockFragmentActivity { } else { swapToDefaultAccount(); } + + AccountManager accountMngr = AccountManager.get(getBaseContext()); + if (mAccount != null) { + mIsSharedSupported = Boolean.parseBoolean(accountMngr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API)); + } } @@ -164,7 +169,6 @@ public abstract class FileActivity extends SherlockFragmentActivity { */ private void swapToDefaultAccount() { // default to the most recently used account - AccountManager accountManager = AccountManager.get(this); Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()); if (newAccount == null) { /// no account available: force account creation @@ -178,7 +182,6 @@ public abstract class FileActivity extends SherlockFragmentActivity { mAccountWasRestored = (newAccount.equals(mAccount)); mAccount = newAccount; } - setIsSharedSupported( Boolean.getBoolean(accountManager.getUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API))); } @@ -261,8 +264,8 @@ public abstract class FileActivity extends SherlockFragmentActivity { } - public void setIsSharedSupported(boolean mIsSharedSupported) { - this.mIsSharedSupported = mIsSharedSupported; + public void setIsSharedSupported(boolean isSharedSupported) { + this.mIsSharedSupported = isSharedSupported; } /**