From 137fdd8d28a5d0a5f268712f0227011b88aae2d0 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 23 Jun 2015 16:44:47 +0200 Subject: [PATCH] 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) --- .../JavaFileStorage/bin/javafilestorage.jar | Bin 532591 -> 535545 bytes .../javafilestorage/DropboxFileStorage.java | 57 ++++++++++-------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/java/JavaFileStorage/bin/javafilestorage.jar b/src/java/JavaFileStorage/bin/javafilestorage.jar index a21a9fc85b3de527203f359c64e2cd1bddf9c02f..b0f2a4858119915088db14564427e198605707b5 100644 GIT binary patch delta 20463 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 _17wfmjVG)&Clf(cP^6FN##L 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 diff --git a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java b/src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java index e66b4533..7768842f 100644 --- a/src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java +++ b/src/java/JavaFileStorage/src/keepass2android/javafilestorage/DropboxFileStorage.java @@ -377,14 +377,14 @@ public class DropboxFileStorage extends JavaFileStorageBase { String path = getProtocolId()+":///"; Log.d("KP2AJ", "startSelectFile "+path+", connected: "+path); - if (isConnected()) + /*if (isConnected()) { Intent intent = new Intent(); intent.putExtra(EXTRA_IS_FOR_SAVE, isForSave); intent.putExtra(EXTRA_PATH, path); activity.onImmediateResult(requestCode, RESULT_FILECHOOSER_PREPARED, intent); } - else + else*/ { activity.startSelectFileProcess(path, isForSave, requestCode); } @@ -440,41 +440,46 @@ public class DropboxFileStorage extends JavaFileStorageBase { if (activity.getProcessName().equals(PROCESS_NAME_SELECTFILE)) activity.getState().putString(EXTRA_PATH, activity.getPath()); - Log.d("KP2AJ", "OnResume. LoggedIn="+mLoggedIn); - if (mLoggedIn) + Log.d("KP2AJ", "OnResume (3). LoggedIn="+mLoggedIn); + /*if (mLoggedIn) { finishActivityWithSuccess(activity); return; - } + }*/ 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; 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"); Intent data = new Intent(); data.putExtra(EXTRA_ERROR_MESSAGE, "authenticating not succesful");