Fixed mark workflow as favorite. Button still disappears though but functions great.
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/e031e8fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e031e8fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e031e8fd Branch: refs/heads/master Commit: e031e8fd06b741fc9fd4eba2863a16573be18c05 Parents: c87abf8 Author: larrytech7 <larrya...@gmail.com> Authored: Sun Jul 5 19:31:23 2015 +0100 Committer: larrytech7 <larrya...@gmail.com> Committed: Sun Jul 5 19:31:23 2015 +0100 ---------------------------------------------------------------------- .../mobile/adapters/WorkflowAdapter.java | 21 ++++++++++---------- .../workflowdetails/WorkflowdetailFragment.java | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e031e8fd/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java index c18d60c..4f57766 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/WorkflowAdapter.java @@ -114,13 +114,9 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo final String author = workflow.get(i).getWorkflow_author(); final String title = workflow.get(i).getWorkflow_title(); String description = workflow.get(i).getWorkflow_description(); - String uri = workflow.get(i).getWorkflow_details_url(); + final String uri = workflow.get(i).getWorkflow_details_url(); final String desc_full = description; - final ArrayList<Object> mfav = new ArrayList<Object>(); - //save current workflow as favorite - mfav.add(wid); mfav.add(author);mfav.add(title);mfav.add(desc_full); mfav.add(SimpleDateFormat.getDateTimeInstance().format(new Date()).toString()); - mfav.add(uri); if(description.length() > 80) description = description.substring(0, 79); viewHolder.author_name.setHint(author); viewHolder.wk_title.setHint(title); @@ -144,7 +140,16 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo viewHolder.btn_mark_workflow.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + ArrayList<Object> mfav = new ArrayList<Object>(); + //save current workflow as favorite + mfav.add(wid); mfav.add(author);mfav.add(title);mfav.add(desc_full); mfav.add(SimpleDateFormat.getDateTimeInstance().format(new Date()).toString()); + mfav.add(uri); mfav.add(viewHolder.author_name.getText()); + try { + favDB.put(mfav); + } catch (JSONException e) { + e.printStackTrace(); + } boolean saved = favDB.save(); if(saved) { Toast.makeText(context, "Workflow marked as favorite", Toast.LENGTH_SHORT).show(); @@ -165,11 +170,7 @@ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHo viewHolder.infolayout.setVisibility(View.GONE); } }); - try { - favDB.put(mfav); - } catch (JSONException e) { - e.printStackTrace(); - } + synchronized (this){ new DetailLinkLoader().execute(uri); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e031e8fd/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 5e6594e..68ebf09 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 @@ -518,10 +518,10 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList sb.append(str); //in this string builder we have read the workflow( as .t2flow or .xml) workflow from remote resource. Now we need to post that to the player. bufferedReader.close(); wconn.disconnect(); - +//PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHM6c2N1ZmwgeG1sbnM6cz0iaHR0cDovL29yZy5lbWJsLmViaS5lc2NpZW5jZS94c2N1ZmwvMC4xYWxwaGEiIHZlcnNpb249IjAuMiIgbG9nPSIwIj4KICA8czp3b3JrZmxvd2Rlc2NyaXB0aW9uIGxzaWQ9InVybjpsc2lkOnd3dy5teWdyaWQub3JnLnVrOm9wZXJhdGlvbjpLNlpDRzZJV05TMCIgYXV0aG9yPSIiIHRpdGxlPSIiIC8+CiAgPHM6cHJvY2Vzc29yIG5hbWU9IlN0cmluZ19Db25zdGFudCIgYm9yaW5nPSJ0cnVlIj4KICAgIDxzOnN0cmluZ2NvbnN0YW50Pmh0dHA6Ly93d3cuY3MubWFuLmFjLnVrL35nb2RlcmlzYS9QaG90by5qcGc8L3M6c3RyaW5nY29uc3RhbnQ+CiAgPC9zOnByb2Nlc3Nvcj4KICA8czpwcm9jZXNzb3IgbmFtZT0iR2V0X2ltYWdlX2Zyb21fVVJMIj4KICAgIDxzOmxvY2FsPm9yZy5lbWJsLmViaS5lc2NpZW5jZS5zY3VmbHdvcmtlcnMuamF2YS5XZWJJbWFnZUZldGNoZXI8L3M6bG9jYWw+CiAgPC9zOnByb2Nlc3Nvcj4KICA8czpsaW5rIHNvdXJjZT0iU3RyaW5nX0NvbnN0YW50OnZhbHVlIiBzaW5rPSJHZXRfaW1hZ2VfZnJvbV9VUkw6dXJsIiAvPgogIDxzOmxpbmsgc291cmNlPSJHZXRfaW1hZ2VfZnJvbV9VUkw6aW1hZ2UiIHNpbms9InZpeiIgLz4KICA8czpzaW5rIG5hbWU9InZpeiIgLz4KPC9zOnNjdWZsPgoKCg== // Base64.encodeToString(sb.toString().getBytes("UTF-8"), Base64.DEFAULT) String data = "{\"document\":\"data:application/octet-stream;base64," + - "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHM6c2N1ZmwgeG1sbnM6cz0iaHR0cDovL29yZy5lbWJsLmViaS5lc2NpZW5jZS94c2N1ZmwvMC4xYWxwaGEiIHZlcnNpb249IjAuMiIgbG9nPSIwIj4KICA8czp3b3JrZmxvd2Rlc2NyaXB0aW9uIGxzaWQ9InVybjpsc2lkOnd3dy5teWdyaWQub3JnLnVrOm9wZXJhdGlvbjpLNlpDRzZJV05TMCIgYXV0aG9yPSIiIHRpdGxlPSIiIC8+CiAgPHM6cHJvY2Vzc29yIG5hbWU9IlN0cmluZ19Db25zdGFudCIgYm9yaW5nPSJ0cnVlIj4KICAgIDxzOnN0cmluZ2NvbnN0YW50Pmh0dHA6Ly93d3cuY3MubWFuLmFjLnVrL35nb2RlcmlzYS9QaG90by5qcGc8L3M6c3RyaW5nY29uc3RhbnQ+CiAgPC9zOnByb2Nlc3Nvcj4KICA8czpwcm9jZXNzb3IgbmFtZT0iR2V0X2ltYWdlX2Zyb21fVVJMIj4KICAgIDxzOmxvY2FsPm9yZy5lbWJsLmViaS5lc2NpZW5jZS5zY3VmbHdvcmtlcnMuamF2YS5XZWJJbWFnZUZldGNoZXI8L3M6bG9jYWw+CiAgPC9zOnByb2Nlc3Nvcj4KICA8czpsaW5rIHNvdXJjZT0iU3RyaW5nX0NvbnN0YW50OnZhbHVlIiBzaW5rPSJHZXRfaW1hZ2VfZnJvbV9VUkw6dXJsIiAvPgogIDxzOmxpbmsgc291cmNlPSJHZXRfaW1hZ2VfZnJvbV9VUkw6aW1hZ2UiIHNpbms9InZpeiIgLz4KICA8czpzaW5rIG5hbWU9InZpeiIgLz4KPC9zOnNjdWZsPgoKCg=="+"\"}"; + Base64.encodeToString(sb.toString().getBytes("UTF-8"), Base64.URL_SAFE|Base64.NO_WRAP)+"\"}"; String post = "{\"workflow\":"+data+"}"; //clear sb so that we can use it again to fetch results from this post request sb.delete(0,sb.length()-1); @@ -531,7 +531,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList connection.setRequestProperty("Accept", "*/*"); // connection.setRequestProperty("Content-Length", "10165"); connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("Content-Language", "en-US"); + connection.setRequestProperty("Content-Encoding", "UTF-8"); connection.setRequestProperty("Accept-Charset", "UTF-8"); connection.setUseCaches (false); connection.setDoOutput(true);
