moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2025-02-07 10:20:11 -05:00
Code Issues Releases Wiki Activity

Always start Dropbox authentication when starting to select a file. This allows users to change Dropbox accounts and avoids issues with listing files after revocing the authentication (File chooser showed empty list because exception could not be propagated in ContentProvider.query)

Browse Source
This commit is contained in:
Philipp Crocoll 2015-06-23 16:44:47 +02:00
parent 6b4d31aa44
commit 137fdd8d28
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/java/JavaFileStorage/bin/javafilestorage.jar
View File

Binary file not shown.

57
src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java
View File

@ -377,14 +377,14 @@ public class DropboxFileStorage extends JavaFileStorageBase {
String path = getProtocolId()+":///"; String path = getProtocolId()+":///";
Log.d("KP2AJ", "startSelectFile "+path+", connected: "+path); Log.d("KP2AJ", "startSelectFile "+path+", connected: "+path);
if (isConnected()) /*if (isConnected())
{ {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(EXTRA_IS_FOR_SAVE, isForSave); intent.putExtra(EXTRA_IS_FOR_SAVE, isForSave);
intent.putExtra(EXTRA_PATH, path); intent.putExtra(EXTRA_PATH, path);
activity.onImmediateResult(requestCode, RESULT_FILECHOOSER_PREPARED, intent); activity.onImmediateResult(requestCode, RESULT_FILECHOOSER_PREPARED, intent);
} }
else else*/
{ {
activity.startSelectFileProcess(path, isForSave, requestCode); activity.startSelectFileProcess(path, isForSave, requestCode);
} }
@ -440,41 +440,46 @@ public class DropboxFileStorage extends JavaFileStorageBase {
if (activity.getProcessName().equals(PROCESS_NAME_SELECTFILE)) if (activity.getProcessName().equals(PROCESS_NAME_SELECTFILE))
activity.getState().putString(EXTRA_PATH, activity.getPath()); activity.getState().putString(EXTRA_PATH, activity.getPath());
Log.d("KP2AJ", "OnResume. LoggedIn="+mLoggedIn); Log.d("KP2AJ", "OnResume (3). LoggedIn="+mLoggedIn);
if (mLoggedIn) /*if (mLoggedIn)
{ {
finishActivityWithSuccess(activity); finishActivityWithSuccess(activity);
return; return;
} }*/
AndroidAuthSession session = mApi.getSession(); AndroidAuthSession session = mApi.getSession();
// The next part must be inserted in the onResume() method of the
// activity from which session.startAuthentication() was called, so
// that Dropbox authentication completes properly.
if (session.authenticationSuccessful()) {
try {
// Mandatory call to complete the auth
session.finishAuthentication();
// Store it locally in our app for later use
TokenPair tokens = session.getAccessTokenPair();
storeKeys(tokens.key, tokens.secret);
setLoggedIn(true);
finishActivityWithSuccess(activity);
return;
} catch (Exception e) {
finishWithError(activity, e);
return;
}
}
JavaFileStorage.FileStorageSetupActivity storageSetupAct = (JavaFileStorage.FileStorageSetupActivity)activity; JavaFileStorage.FileStorageSetupActivity storageSetupAct = (JavaFileStorage.FileStorageSetupActivity)activity;
if (storageSetupAct.getState().containsKey("hasStartedAuth")) if (storageSetupAct.getState().containsKey("hasStartedAuth"))
{ {
Log.d("KP2AJ", "auth started");
// The next part must be inserted in the onResume() method of the
// activity from which session.startAuthentication() was called, so
// that Dropbox authentication completes properly.
if (session.authenticationSuccessful()) {
Log.d("KP2AJ", "auth successful");
try {
// Mandatory call to complete the auth
session.finishAuthentication();
Log.d("KP2AJ", "finished auth ");
// Store it locally in our app for later use
TokenPair tokens = session.getAccessTokenPair();
storeKeys(tokens.key, tokens.secret);
setLoggedIn(true);
Log.d("KP2AJ", "success");
finishActivityWithSuccess(activity);
return;
} catch (Exception e) {
Log.d("KP2AJ", "finish with error: " + e.toString());
finishWithError(activity, e);
return;
}
}
Log.i(TAG, "authenticating not succesful"); Log.i(TAG, "authenticating not succesful");
Intent data = new Intent(); Intent data = new Intent();
data.putExtra(EXTRA_ERROR_MESSAGE, "authenticating not succesful"); data.putExtra(EXTRA_ERROR_MESSAGE, "authenticating not succesful");