X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5b792b044056bc0a547803ff52f30b9da457870e..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/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 2cd28dd9..937d45dd 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -29,13 +29,13 @@ import android.os.Bundle; import android.webkit.MimeTypeMap; import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.owncloud.android.Log_OC; +import com.owncloud.android.MainApp; import com.owncloud.android.R; -import com.owncloud.android.authentication.AccountAuthenticator; import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.oc_framework.network.webdav.WebdavUtils; +import com.owncloud.android.utils.Log_OC; -import eu.alefzero.webdav.WebdavUtils; /** * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud {@link Account}s . @@ -47,6 +47,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE"; public static final String EXTRA_ACCOUNT = "com.owncloud.android.ui.activity.ACCOUNT"; public static final String EXTRA_WAITING_TO_PREVIEW = "com.owncloud.android.ui.activity.WAITING_TO_PREVIEW"; + public static final String EXTRA_FROM_NOTIFICATION= "com.owncloud.android.ui.activity.FROM_NOTIFICATION"; public static final String TAG = FileActivity.class.getSimpleName(); @@ -66,9 +67,12 @@ public abstract class FileActivity extends SherlockFragmentActivity { /** Flag to signal when the value of mAccount was restored from a saved state */ private boolean mAccountWasRestored; + /** Flag to signal if the activity is launched by a notification */ + private boolean mFromNotification; + /** - * Loads the cownCloud {@link Account} and main {@link OCFile} to be handled by the instance of + * Loads the ownCloud {@link Account} and main {@link OCFile} to be handled by the instance of * the {@link FileActivity}. * * Grants that a valid ownCloud {@link Account} is associated to the instance, or that the user @@ -78,23 +82,18 @@ public abstract class FileActivity extends SherlockFragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Account account; if(savedInstanceState != null) { + account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT); mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE); - mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT); + mFromNotification = savedInstanceState.getBoolean(FileActivity.EXTRA_FROM_NOTIFICATION); } else { - mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT); + account = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT); mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE); + mFromNotification = getIntent().getBooleanExtra(FileActivity.EXTRA_FROM_NOTIFICATION, false); } - Account oldAccount = mAccount; - grantValidAccount(); - if (mAccount != null) { - mAccountWasSet = true; - mAccountWasRestored = (savedInstanceState != null && mAccount.equals(oldAccount)); - } else { - mAccountWasSet = false; - mAccountWasRestored = false; - } + setAccount(account, savedInstanceState != null); } @@ -106,44 +105,16 @@ public abstract class FileActivity extends SherlockFragmentActivity { @Override protected void onRestart() { super.onRestart(); - - Account oldAccount = mAccount; - grantValidAccount(); - if (mAccount != null && !mAccount.equals(oldAccount)) { - mAccountWasSet = true; - mAccountWasRestored = false; - } else { - mAccountWasSet = false; - mAccountWasRestored = false; - } - } - - - /** - * Validates the ownCloud {@link Account} associated to the Activity any time it is restarted. - * - * If not valid, tries to swap it for other valid and existing ownCloud {@link Account}. - * - * If no valid ownCloud {@link Account} exists, mAccount is set to NULL and the user is requested - * to create a new ownCloud {@link Account}. - */ - private void grantValidAccount() { boolean validAccount = (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)); if (!validAccount) { - // get most recently used account as default account - mAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()); - if (mAccount == null) { - /// no account available: force account creation - createFirstAccount(); - mRedirectingToSetupAccount = true; - } + swapToDefaultAccount(); } + } - + @Override protected void onStart() { - // maybe better in onPostCreate() ? super.onStart(); if (mAccountWasSet) { onAccountSet(mAccountWasRestored); @@ -152,12 +123,64 @@ public abstract class FileActivity extends SherlockFragmentActivity { /** + * Sets and validates the ownCloud {@link Account} associated to the Activity. + * + * If not valid, tries to swap it for other valid and existing ownCloud {@link Account}. + * + * POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}. + * + * @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) { + Account oldAccount = mAccount; + boolean validAccount = (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), account.name)); + if (validAccount) { + mAccount = account; + mAccountWasSet = true; + mAccountWasRestored = (savedAccount || mAccount.equals(oldAccount)); + + } else { + swapToDefaultAccount(); + } + } + + + /** + * Tries to swap the current ownCloud {@link Account} for other valid and existing. + * + * If no valid ownCloud {@link Account} exists, the the user is requested + * to create a new ownCloud {@link Account}. + * + * POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}. + * + * @return 'True' if the checked {@link Account} was valid. + */ + private void swapToDefaultAccount() { + // default to the most recently used account + Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()); + if (newAccount == null) { + /// no account available: force account creation + createFirstAccount(); + mRedirectingToSetupAccount = true; + mAccountWasSet = false; + mAccountWasRestored = false; + + } else { + mAccountWasSet = true; + mAccountWasRestored = (newAccount.equals(mAccount)); + mAccount = newAccount; + } + } + + + /** * Launches the account creation activity. To use when no ownCloud account is available */ private void createFirstAccount() { AccountManager am = AccountManager.get(getApplicationContext()); - am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, - AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD, + am.addAccount(MainApp.getAccountType(), + null, null, null, this, @@ -174,6 +197,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { super.onSaveInstanceState(outState); outState.putParcelable(FileActivity.EXTRA_FILE, mFile); outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount); + outState.putBoolean(FileActivity.EXTRA_FROM_NOTIFICATION, mFromNotification); } @@ -206,6 +230,12 @@ public abstract class FileActivity extends SherlockFragmentActivity { return mAccount; } + /** + * @return Value of mFromNotification: True if the Activity is launched by a notification + */ + public boolean fromNotification() { + return mFromNotification; + } /** * @return 'True' when the Activity is finishing to enforce the setup of a new account. @@ -228,6 +258,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { @Override public void run(AccountManagerFuture future) { FileActivity.this.mRedirectingToSetupAccount = false; + boolean accountWasSet = false; if (future != null) { try { Bundle result; @@ -235,8 +266,8 @@ public abstract class FileActivity extends SherlockFragmentActivity { String name = result.getString(AccountManager.KEY_ACCOUNT_NAME); String type = result.getString(AccountManager.KEY_ACCOUNT_TYPE); if (AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name)) { - FileActivity.this.mAccount = new Account(name, type); - FileActivity.this.onAccountSet(false); + setAccount(new Account(name, type), false); + accountWasSet = true; } } catch (OperationCanceledException e) { Log_OC.d(TAG, "Account creation canceled"); @@ -248,7 +279,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { } else { Log_OC.e(TAG, "Account creation callback with null bundle"); } - if (mAccount == null) { + if (!accountWasSet) { moveTaskToBack(true); } }