X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fd39628997a8544213c32249e50bbae5f983e094..d38a69abc1ba78df70fee65fc2434fc80b6be93b:/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 0ce31e26..59b44433 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.AccountUtils; -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 . @@ -46,7 +46,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.ACCOUNT"; + public static final String EXTRA_WAITING_TO_PREVIEW = "com.owncloud.android.ui.activity.WAITING_TO_PREVIEW"; public static final String TAG = FileActivity.class.getSimpleName(); @@ -60,59 +60,121 @@ public abstract class FileActivity extends SherlockFragmentActivity { /** Flag to signal that the activity will is finishing to enforce the creation of an ownCloud {@link Account} */ private boolean mRedirectingToSetupAccount = false; + /** Flag to signal when the value of mAccount was set */ + private boolean mAccountWasSet; + /** Flag to signal when the value of mAccount was restored from a saved state */ + private boolean mAccountWasRestored; + + + /** + * 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 + * is requested to create a new one. + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - /// Load of saved instance state: keep this always before initDataFromCurrentAccount() + + Account account; if(savedInstanceState != null) { + account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT); mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE); - mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT); } else { - mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT); + account = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT); mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE); } - - if (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)) { - onAccountChanged(); - } - + + setAccount(account, savedInstanceState != null); } /** - * Validate the ownCloud {@link Account} associated to the Activity any time it is - * started, and if not valid tries to move to a different Account. + * 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 + * every time it is restarted. */ @Override + protected void onRestart() { + super.onRestart(); + boolean validAccount = (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)); + if (!validAccount) { + swapToDefaultAccount(); + } + + } + + + @Override protected void onStart() { - Log_OC.d(TAG, "onStart en FileActivity"); super.onStart(); - /// Validate account, and try to fix if wrong - if (mAccount == null || !AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)) { - if (!AccountUtils.accountsAreSetup(getApplicationContext())) { - /// no account available: force account creation - mAccount = null; - createFirstAccount(); - mRedirectingToSetupAccount = true; - - } else { - /// get 'last current account' as default account - mAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()); - onAccountChanged(); - } + if (mAccountWasSet) { + onAccountSet(mAccountWasRestored); } } - + + /** + * 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, @@ -183,6 +245,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; @@ -190,11 +253,11 @@ 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.onAccountChanged(); + setAccount(new Account(name, type), false); + accountWasSet = true; } } catch (OperationCanceledException e) { - Log_OC.e(TAG, "Account creation canceled"); + Log_OC.d(TAG, "Account creation canceled"); } catch (Exception e) { Log_OC.e(TAG, "Account creation finished in exception: ", e); @@ -203,8 +266,8 @@ public abstract class FileActivity extends SherlockFragmentActivity { } else { Log_OC.e(TAG, "Account creation callback with null bundle"); } - if (mAccount == null) { - finish(); + if (!accountWasSet) { + moveTaskToBack(true); } } @@ -216,7 +279,7 @@ public abstract class FileActivity extends SherlockFragmentActivity { * * Child classes must grant that state depending on the {@link Account} is updated. */ - protected abstract void onAccountChanged(); + protected abstract void onAccountSet(boolean stateWasRecovered);