fixing run workflow from local storage
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/53d7bc87 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/53d7bc87 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/53d7bc87 Branch: refs/heads/master Commit: 53d7bc87b3b41085a3ddb81a9b564b2dcf361711 Parents: ca95c34 Author: larrytech7 <larrya...@gmail.com> Authored: Sat Jul 11 23:01:49 2015 +0100 Committer: larrytech7 <larrya...@gmail.com> Committed: Sat Jul 11 23:01:49 2015 +0100 ---------------------------------------------------------------------- .../activities/DashboardMainActivity.java | 7 ------- .../workflowdetails/WorkflowdetailFragment.java | 3 ++- .../mobile/tavernamobile/TavernaPlayerAPI.java | 22 ++++++++++---------- .../apache/taverna/mobile/utils/RunTask.java | 6 +++--- .../taverna/mobile/utils/WorkflowOpen.java | 8 ++++--- 5 files changed, 21 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/53d7bc87/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java index 8a90059..2afab50 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/DashboardMainActivity.java @@ -99,13 +99,6 @@ public class DashboardMainActivity extends ActionBarActivity mPager = (ViewPager)findViewById(R.id.pager); mPager.setAdapter(mAdapter); - /* //Handle search actions from a system sent intent - Intent searchIntent = getIntent(); - if(searchIntent != null && Intent.ACTION_SEARCH.equals(searchIntent.getAction())){ - //retrieve and process query then display results - String query = searchIntent.getStringExtra(SearchManager.QUERY); - Toast.makeText(this,"Query = "+query, Toast.LENGTH_SHORT).show(); - }*/ } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/53d7bc87/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 5a5ee09..c2c5277 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 @@ -359,6 +359,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList private class WorkflowRunTask extends AsyncTask<String, Void, String>{ private Context context; + TavernaPlayerAPI tavernaPlayerAPI = new TavernaPlayerAPI(); private WorkflowRunTask(Context context) { this.context = context; @@ -378,7 +379,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_FRAMEWORK_URL+params[0]); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); - String userpass = "icep...@gmail.com" + ":" + "creationfox"; + String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT); connection.setRequestProperty("Authorization", basicAuth); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/53d7bc87/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java index 0b16de1..638094b 100644 --- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java +++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/TavernaPlayerAPI.java @@ -39,10 +39,11 @@ public class TavernaPlayerAPI { public static String PLAYER_RUN_URL = PLAYER_BASE_URL+"runs/"; public static String PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id="; //returns a json 'framework' used for creating runs for the given workflow - public TavernaPlayerAPI(Context context) { String server = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_server_url","/"); String player = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_player_url","/"); + String user = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_player_url","/"); + String password = PreferenceManager.getDefaultSharedPreferences(context).getString("pref_player_url","/"); PLAYER_BASE_URL = player; SERVER_BASE_URL = server; PLAYER_WORKFLOW_URL = PLAYER_BASE_URL+"workflows/"; @@ -50,36 +51,35 @@ public class TavernaPlayerAPI { PLAYER_RUN_FRAMEWORK_URL = PLAYER_RUN_URL+"new?workflow_id="; } - public static String getPLAYER_BASE_URL(Context context) { - new TavernaPlayerAPI(context); + public TavernaPlayerAPI(){ + + } + + public static String getPLAYER_BASE_URL() { return PLAYER_BASE_URL; } - public static String getSERVER_BASE_URL(Context ctx) { - new TavernaPlayerAPI(ctx); + public static String getSERVER_BASE_URL() { return SERVER_BASE_URL; } - public static String getPLAYER_WORKFLOW_URL(Context ctx) { - new TavernaPlayerAPI(ctx); + public static String getPLAYER_WORKFLOW_URL() { return PLAYER_WORKFLOW_URL; } public static String getPLAYER_RUN_URL(Context ctx) { - new TavernaPlayerAPI(ctx); return PLAYER_RUN_URL; } public static String getPLAYER_RUN_FRAMEWORK_URL(Context ctx) { - new TavernaPlayerAPI(ctx); return PLAYER_RUN_FRAMEWORK_URL; } - public static String getPlayerUserName(Context c){ + public String getPlayerUserName(Context c){ return PreferenceManager.getDefaultSharedPreferences(c).getString("pref_user","default"); } - public static String getPlayerUserPassword(Context c){ + public String getPlayerUserPassword(Context c){ return PreferenceManager.getDefaultSharedPreferences(c).getString("pref_password","default"); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/53d7bc87/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java b/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java index 14e0939..d0710a5 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/RunTask.java @@ -42,10 +42,10 @@ public class RunTask extends AsyncTask<String, Void, String> { protected String doInBackground(String... params) { StringBuffer sb = new StringBuffer(); try { - + TavernaPlayerAPI tavernaPlayerAPI = new TavernaPlayerAPI(); URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_URL); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); - String userpass = "icep...@gmail.com" + ":" + "creationfox"; + String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -84,7 +84,7 @@ public class RunTask extends AsyncTask<String, Void, String> { @Override protected void onPostExecute(String s) { Log.i("RUN OutPut", s); -// progressDialog.dismiss(); + progressDialog.dismiss(); Intent runIntent = new Intent(); runIntent.setClass(this.context, RunResult.class); runIntent.putExtra("runresult", s); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/53d7bc87/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java index aaa13ff..eae8479 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowOpen.java @@ -39,6 +39,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { private Context context; private ProgressDialog progressDialog; + TavernaPlayerAPI tavernaPlayerAPI = new TavernaPlayerAPI(); public WorkflowOpen(Context context) { this.context = context; @@ -61,13 +62,14 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { StringBuffer sb = new StringBuffer(); String str = ""; try { + //prepare connection requests File objectFile = new File(params[0]); //the resource xml file representing the workflow to be uploaded to the player String playerurl = new TavernaPlayerAPI(this.context).PLAYER_BASE_URL+"workflows.json"; URL posturl = new URL(playerurl); HttpURLConnection connection = (HttpURLConnection) posturl.openConnection(); - String user = "icep...@gmail.com" + ":" + "creationfox"; + String user = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(), Base64.DEFAULT); //read the file from remote resource and encode the stream with a base64 algorithm @@ -184,7 +186,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { URL workflowurl = new URL(new TavernaPlayerAPI(this.context).PLAYER_RUN_FRAMEWORK_URL+params[0]); HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); - String userpass = "icep...@gmail.com" + ":" + "creationfox"; + String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(), Base64.DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -192,7 +194,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { connection.setRequestMethod("GET"); connection.connect(); //send request Log.i("RESPONSE Code", "" + connection.getResponseCode()); - Log.i("RESPONSE Messsage", "" + connection.getResponseMessage()); + Log.i("RESPONSE Message", "" + connection.getResponseMessage()); Log.i("Authorization ", "" + connection.getRequestProperty("Authorization")); InputStream dis = connection.getInputStream();
