import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.AccountUtils;
import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.FileHandler;
import eu.alefzero.webdav.WebdavUtils;
*
* @author David A. Velasco
*/
-public abstract class FileActivity extends SherlockFragmentActivity implements FileHandler {
+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 TAG = FileActivity.class.getSimpleName();
/** Flag to signal that the activity will is finishing to enforce the creation of an ownCloud {@link Account} */
private boolean mRedirectingToSetupAccount = false;
- private FileHandlerImpl mFileHandler;
-
+ /**
+ * Loads the cownCloud {@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()
+
if(savedInstanceState != null) {
mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
}
-
- if (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)) {
- onAccountChanged();
+
+ grantValidAccount();
+ if (mAccount != null) {
+ onAccountSet(savedInstanceState != null);
}
-
- mFileHandler = new FileHandlerImpl();
}
/**
- * 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 onStart() {
- Log_OC.e(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())) {
+ protected void onRestart() {
+ super.onRestart();
+
+ Account oldAccount = mAccount;
+ grantValidAccount();
+ if (mAccount != null && !mAccount.equals(oldAccount)) {
+ onAccountSet(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
- mAccount = null;
createFirstAccount();
mRedirectingToSetupAccount = true;
-
- } else {
- /// get 'last current account' as default account
- mAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
- onAccountChanged();
}
}
}
-
+
/**
* Launches the account creation activity. To use when no ownCloud account is available
*/
String type = result.getString(AccountManager.KEY_ACCOUNT_TYPE);
if (AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name)) {
FileActivity.this.mAccount = new Account(name, type);
- FileActivity.this.onAccountChanged();
+ FileActivity.this.onAccountSet(false);
}
} catch (OperationCanceledException e) {
Log_OC.e(TAG, "Account creation canceled");
}
- public void openFile(OCFile file) {
- mFileHandler.openFile(file);
- }
-
-
/**
* Called when the ownCloud {@link Account} associated to the Activity was just updated.
*
* Child classes must grant that state depending on the {@link Account} is updated.
*/
- protected abstract void onAccountChanged();
+ protected abstract void onAccountSet(boolean stateWasRecovered);
- public class FileHandlerImpl implements FileHandler {
-
- public void openFile(OCFile file) {
- if (file != null) {
- String storagePath = file.getStoragePath();
- String encodedStoragePath = WebdavUtils.encodePath(storagePath);
-
- Intent intentForSavedMimeType = new Intent(Intent.ACTION_VIEW);
- intentForSavedMimeType.setDataAndType(Uri.parse("file://"+ encodedStoragePath), file.getMimetype());
- intentForSavedMimeType.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-
- Intent intentForGuessedMimeType = null;
- if (storagePath.lastIndexOf('.') >= 0) {
- String guessedMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
- if (guessedMimeType != null && !guessedMimeType.equals(file.getMimetype())) {
- intentForGuessedMimeType = new Intent(Intent.ACTION_VIEW);
- intentForGuessedMimeType.setDataAndType(Uri.parse("file://"+ encodedStoragePath), guessedMimeType);
- intentForGuessedMimeType.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
- }
- }
-
- Intent chooserIntent = null;
- if (intentForGuessedMimeType != null) {
- chooserIntent = Intent.createChooser(intentForGuessedMimeType, null);
- } else {
- chooserIntent = Intent.createChooser(intentForSavedMimeType, null);
+
+ public void openFile(OCFile file) {
+ if (file != null) {
+ String storagePath = file.getStoragePath();
+ String encodedStoragePath = WebdavUtils.encodePath(storagePath);
+
+ Intent intentForSavedMimeType = new Intent(Intent.ACTION_VIEW);
+ intentForSavedMimeType.setDataAndType(Uri.parse("file://"+ encodedStoragePath), file.getMimetype());
+ intentForSavedMimeType.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+
+ Intent intentForGuessedMimeType = null;
+ if (storagePath.lastIndexOf('.') >= 0) {
+ String guessedMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));
+ if (guessedMimeType != null && !guessedMimeType.equals(file.getMimetype())) {
+ intentForGuessedMimeType = new Intent(Intent.ACTION_VIEW);
+ intentForGuessedMimeType.setDataAndType(Uri.parse("file://"+ encodedStoragePath), guessedMimeType);
+ intentForGuessedMimeType.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
}
-
- startActivity(chooserIntent);
-
+ }
+
+ Intent chooserIntent = null;
+ if (intentForGuessedMimeType != null) {
+ chooserIntent = Intent.createChooser(intentForGuessedMimeType, getString(R.string.actionbar_open_with));
} else {
- Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
+ chooserIntent = Intent.createChooser(intentForSavedMimeType, getString(R.string.actionbar_open_with));
}
+
+ startActivity(chooserIntent);
+
+ } else {
+ Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
}
}
+
}
projects / pub / Android / ownCloud.git / blobdiff