You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2015/07/13 14:54:48 UTC
[30/34] incubator-taverna-mobile git commit: implementing upload
workflow to dropbox
implementing upload workflow to dropbox
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/8e045402
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8e045402
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8e045402
Branch: refs/heads/master
Commit: 8e04540252d337c54be8c2c806d7c3aec1d71591
Parents: 354b4f4
Author: larrytech7 <la...@gmail.com>
Authored: Sun Jul 12 13:01:48 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Sun Jul 12 13:01:48 2015 +0100
----------------------------------------------------------------------
.../workflowdetails/WorkflowdetailFragment.java | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8e045402/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
index 786f572..bfcce62 100644
--- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowdetailFragment.java
@@ -106,7 +106,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
public static long WORKFLO_ID;
public static Context cont;
private static boolean LOAD_STATE = false;
- private ZoomControls zoomControls;
+ private static boolean DROPUPLOAD = false;
static Animation zoomin;
static Animation zoomout;
public boolean isZoomIn;
@@ -205,8 +205,13 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
//TODO mark a workflow as important and launch task to store the entry into the local database
break;
case R.id.saveToDropboxButton:
- mDBApi.getSession().startOAuth2Authentication(getActivity());
-
+ String authToken = PreferenceManager.getDefaultSharedPreferences(getActivity()).getString("dropboxauth", "");
+ if (authToken.isEmpty())
+ mDBApi.getSession().startOAuth2Authentication(getActivity());
+ else {
+ mDBApi.getSession().setOAuth2AccessToken(authToken);
+ new WorkflowDriveUpload().execute(download_url);
+ }
break;
case R.id.saveToGoogleDriveButton:
break;
@@ -227,11 +232,12 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
getActivity().getLoaderManager().initLoader(1, null, this).forceLoad();
- if (mDBApi.getSession().authenticationSuccessful()) {
+ if (mDBApi.getSession().authenticationSuccessful() && !DROPUPLOAD) {
try {
// Required to complete auth, sets the access token on the session
mDBApi.getSession().finishAuthentication();
String accessToken = mDBApi.getSession().getOAuth2AccessToken();
+ PreferenceManager.getDefaultSharedPreferences(getActivity()).edit().putString("dropboxauth", accessToken).commit();
new WorkflowDriveUpload().execute(download_url);
} catch (IllegalStateException e) {
Log.i("DbAuthLog", "Error authenticating", e);
@@ -655,7 +661,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
});
Log.i("DbExampleLog", "The uploaded file's rev is: " + response.rev);
- metaDataEntry = mDBApi.metadata("/"+Uri.parse(files[0]).getLastPathSegment(), 1, null, false, null);
+ // metaDataEntry = mDBApi.metadata("/"+Uri.parse(files[0]).getLastPathSegment(), 1, null, false, null);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (DropboxException e) {
@@ -671,8 +677,10 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList
@Override
protected void onPostExecute(String s) {
- if(null != s)
- Toast.makeText(getActivity(), "File Saved to dropbox: "+s, Toast.LENGTH_LONG).show();
+ if(null != s) {
+ Toast.makeText(getActivity(), "File Saved to dropbox. Reference: " + s, Toast.LENGTH_LONG).show();
+ DROPUPLOAD = true;
+ }
else{
Toast.makeText(getActivity(), "Failed to save to dropbox "+s, Toast.LENGTH_LONG).show();
}