remove error
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/18863897 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/18863897 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/18863897 Branch: refs/heads/master Commit: 1886389738dea80ea4d48d35c23be82b38619946 Parents: 76cb6bd Author: Sagar <[email protected]> Authored: Mon Jun 13 17:14:34 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jun 13 17:14:34 2016 +0530 ---------------------------------------------------------------------- .../activities/DashboardMainActivity.java | 3 +- .../mobile/activities/LoginActivity.java | 2 +- .../mobile/activities/SettingsActivity.java | 48 ++++++++++---------- .../adapters/FavoriteWorkflowAdapter.java | 2 +- .../mobile/adapters/WorkflowAdapter.java | 2 +- .../mobile/data/remote/BaseApiManager.java | 2 +- .../mobile/fragments/WorkflowItemFragment.java | 3 +- .../fragments/workflowdetails/RunFragment.java | 2 +- .../WorkflowRunHistoryFragment.java | 4 +- .../workflowdetails/WorkflowdetailFragment.java | 27 +++++------ .../taverna/mobile/utils/DetailsLoader.java | 7 +-- .../apache/taverna/mobile/utils/HttpUtil.java | 1 + .../apache/taverna/mobile/utils/RunTask.java | 5 +- .../apache/taverna/mobile/utils/WorkflowDB.java | 2 +- .../taverna/mobile/utils/WorkflowOpen.java | 13 ++++-- 15 files changed, 66 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/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 22abada..6ec84d8 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 @@ -146,7 +146,8 @@ public class DashboardMainActivity extends AppCompatActivity { .setDataAndTypeAndNormalize( Uri.parse(String.format("%s%s%s", Environment.getExternalStorageDirectory(), - File.separator, APP_DIRECTORY_NAME)), + File.separator, + APP_DIRECTORY_NAME)), "application/vnd.taverna.t2flow+xml"); Intent loadWorkflowIntent = Intent.createChooser http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java index c374ec0..6bcfd2a 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/LoginActivity.java @@ -199,7 +199,7 @@ public class LoginActivity extends ActionBarActivity { con.connect(); } BufferedReader br = new BufferedReader(new InputStreamReader(con - .getInputStream(),"UTF-8")); + .getInputStream(), "UTF-8")); StringBuilder sb = new StringBuilder(); String s = ""; while ((s = br.readLine()) != null) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java index 3dd2e5d..a941a2c 100644 --- a/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/activities/SettingsActivity.java @@ -66,30 +66,30 @@ public class SettingsActivity extends PreferenceActivity { */ private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object value) { - String stringValue = value.toString(); - - if (preference instanceof ListPreference) { - // For list preferences, look up the correct display value in - // the preference's 'entries' list. - ListPreference listPreference = (ListPreference) preference; - int index = listPreference.findIndexOfValue(stringValue); - - // Set the summary to reflect the new value. - preference.setSummary( - index >= 0 - ? listPreference.getEntries()[index] - : null); - - } else { - // For all other preferences, set the summary to the value's - // simple string representation. - preference.setSummary(stringValue); - } - return true; - } - }; + @Override + public boolean onPreferenceChange(Preference preference, Object value) { + String stringValue = value.toString(); + + if (preference instanceof ListPreference) { + // For list preferences, look up the correct display value in + // the preference's 'entries' list. + ListPreference listPreference = (ListPreference) preference; + int index = listPreference.findIndexOfValue(stringValue); + + // Set the summary to reflect the new value. + preference.setSummary( + index >= 0 + ? listPreference.getEntries()[index] + : null); + + } else { + // For all other preferences, set the summary to the value's + // simple string representation. + preference.setSummary(stringValue); + } + return true; + } + }; /** * Helper method to determine if the device has an extra-large screen. For http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java index b64ad43..9522a3a 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/FavoriteWorkflowAdapter.java @@ -166,7 +166,7 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl } sharedPreferences.edit().putString(WorkflowAdapter.FAVORITE_LIST_DB, Arrays.toString (charsequence) - ).apply(); + ).apply(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/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 b9c4e86..03c28fe 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 @@ -67,10 +67,10 @@ import java.util.List; * Created by Larry Akah on 6/8/15. */ public class WorkflowAdapter extends RecyclerView.Adapter<WorkflowAdapter.ViewHolder> { - private static final String TAG = "WorkflowAdapter"; public static final String WORKFLOW_FAVORITE_KEY = "WORKFLOW_FAVORITES"; //workflow key used // to save workflows when marked as favorites public static final String FAVORITE_LIST_DB = "FAVORITE_LIST"; + private static final String TAG = "WorkflowAdapter"; public WorkflowDB favDB; //favorited keeps items that have been favorited in order to // identify them during private Context context; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java index 5a384e4..f49ffd2 100644 --- a/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java +++ b/app/src/main/java/org/apache/taverna/mobile/data/remote/BaseApiManager.java @@ -10,8 +10,8 @@ import retrofit2.converter.simplexml.SimpleXmlConverterFactory; public class BaseApiManager { - public TavernaService mTavernaService; final String ENDPOINT = "http://www.myexperiment.org/";; + public TavernaService mTavernaService; public BaseApiManager() { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java index 1a58a40..6b4e89d 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/WorkflowItemFragment.java @@ -89,12 +89,12 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout */ private static RecyclerView mListView; private static View rootView; - private boolean stateOn = false; private static TextView noDataText; private static LruCache<String, Bitmap> avatarCache; private static WorkflowAdapter workflowAdapter; //variables for controlling the infinite scroll mechanism private static int previousTotal = 0; + private boolean stateOn = false; private Animation in; private ProgressDialog mProgressDialog; //progressbar used to indicate the state of the // workflow loaders @@ -131,6 +131,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout public static void setIsRefreshData(boolean isRefreshData) { WorkflowItemFragment.isRefreshData = isRefreshData; } + public static WorkflowItemFragment newInstance(String param1, String param2) { WorkflowItemFragment fragment = new WorkflowItemFragment(); Bundle args = new Bundle(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java index b4bde68..7ba68ec 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/RunFragment.java @@ -272,7 +272,7 @@ public class RunFragment extends Fragment implements View.OnClickListener { connection.connect(); //send request InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); String jsonData = ""; while ((jsonData = br.readLine()) != null) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java index eea053e..774a197 100644 --- a/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/fragments/workflowdetails/WorkflowRunHistoryFragment.java @@ -147,7 +147,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage public void onLoadFinished(Loader<Workflow> workflowLoader, Workflow workflow) { try { - if (workflow.getWorkflowRuns() != null || workflow.getWorkflowRuns().size() != 0) { + if (workflow.getWorkflowRuns() != null && workflow.getWorkflowRuns().size() != 0) { runAdapter.setRunList(workflow.getWorkflowRuns()); mRecyclerView.setAdapter(runAdapter); @@ -159,7 +159,7 @@ public class WorkflowRunHistoryFragment extends Fragment implements LoaderManage emptyRunHistoryTextView.setVisibility(View.VISIBLE); } } catch (NullPointerException np) { - Log.e(TAG, "onLoadFinished: ", np); + Log.e(TAG, "onLoadFinished:", np); } // progressDialog.dismiss(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/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 22a100b..9835c04 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,19 +106,19 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList private static final String BOX_APP_SECRET = "3uuuw36mm7jkflc"; public static String mWorkfloId = ""; public static Context cont; - public String workflow_uri; static View rootView; static Animation zoomin; static Animation zoomout; static Workflow currentWorkflow = null; private static ProgressDialog progressDialog; private static String download_url; - private boolean mLoadState = false; - private boolean mDropupload = false; + public String workflow_uri; public AlertDialog runDialog; public AlertDialog.Builder alertDialogBuilder; public boolean isZoomIn; SharedPreferences sharedPreferences; + private boolean mLoadState = false; + private boolean mDropupload = false; private DownloadManager downloadManager; private long wid; @@ -234,6 +234,10 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList WorkflowdetailFragment.rootView = rootView; } + public static void setCont(Context cont) { + WorkflowdetailFragment.cont = cont; + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -286,12 +290,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList return rootView; } - public static void setCont(Context cont) { - WorkflowdetailFragment.cont = cont; - } - /** - * Called when a fragment is first attached to its activity. * {@link #onCreate(android.os.Bundle)} will be called after this. */ @@ -507,7 +506,8 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); - String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64 + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset + .forName("UTF-8")), Base64 .DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -521,7 +521,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList Log.i("Authorization ", "" + connection.getRequestProperty("Authorization")); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); String jsonData = ""; while ((jsonData = br.readLine()) != null) { @@ -668,11 +668,12 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList String user = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); - String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(Charset.forName("UTF-8")), Base64 + String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(Charset.forName + ("UTF-8")), Base64 .DEFAULT); //read the file from remote resource and encode the stream with a base64 algorithm BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(wconn - .getInputStream(),"UTF-8")); + .getInputStream(), "UTF-8")); String str = ""; while ((str = bufferedReader.readLine()) != null) { sb.append(str); //in this string builder we have read the workflow( as @@ -707,7 +708,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList dos.close(); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); while ((str = br.readLine()) != null) { sb.append(str); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java index 66b4f84..cec8748 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java @@ -101,7 +101,8 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); - String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset + .forName("UTF-8")), Base64.DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -167,7 +168,7 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { return workflow; case TYPE_RUN_HISTORY: { Log.e(TAG, "Downloading run history"); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); StringBuffer sb = new StringBuffer(); String jsonData = ""; while ((jsonData = br.readLine()) != null) { @@ -209,7 +210,7 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { } return workflow; default: - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); StringBuffer sb = new StringBuffer(); String jsonData = ""; while ((jsonData = br.readLine()) != null) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java b/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java index f043d93..0be41a3 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/HttpUtil.java @@ -47,6 +47,7 @@ import java.net.HttpURLConnection; */ public class HttpUtil { private static final String TAG = "HttpUtil"; + public <T> Object doPostAuthenticate() { User muser = new User("", null); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/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 ff9d39c..9305456 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 @@ -49,7 +49,8 @@ public class RunTask extends AsyncTask<String, Void, String> { HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); - String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64 + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName + ("UTF-8")), Base64 .DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -68,7 +69,7 @@ public class RunTask extends AsyncTask<String, Void, String> { dos.close(); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); String jsonData = ""; while ((jsonData = br.readLine()) != null) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java index 6e62a01..f953ee9 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/WorkflowDB.java @@ -50,9 +50,9 @@ public class WorkflowDB { private static final String TAG = "WorkflowDB"; private final String ENTITY_KEY; + private final ArrayList<String> ITEM_IDS; private Context context; private SharedPreferences msharedpreference; - private final ArrayList<String> ITEM_IDS; private JSONObject dataobj; //hold all entries for a given ENTITY_KEY /** http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18863897/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 35ce80b..ce261ce 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 @@ -75,7 +75,8 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { String user = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); - String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(Charset.forName("UTF-8")), Base64.DEFAULT); + String basicAuth = "Basic " + Base64.encodeToString(user.getBytes(Charset.forName + ("UTF-8")), Base64.DEFAULT); //read the file from remote resource and encode the stream with a base64 algorithm try { @@ -91,7 +92,8 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { } String data = "{\"document\":\"data:application/octet-stream;base64," + - Base64.encodeToString(sb.toString().getBytes(Charset.forName("UTF-8")), Base64.URL_SAFE | + Base64.encodeToString(sb.toString().getBytes(Charset.forName("UTF-8")), + Base64.URL_SAFE | Base64.NO_WRAP).replace('-', '+') + "\"}"; String post = "{\"workflow\":" + data + "}"; //clear sb so that we can use it again to fetch results from this post request @@ -115,7 +117,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { dos.close(); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); while ((str = br.readLine()) != null) { sb.append(str); } @@ -199,7 +201,8 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { HttpURLConnection connection = (HttpURLConnection) workflowurl.openConnection(); String userpass = tavernaPlayerAPI.getPlayerUserName(this.context) + ":" + tavernaPlayerAPI.getPlayerUserPassword(this.context); - String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64 + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset + .forName("UTF-8")), Base64 .DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -211,7 +214,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { Log.i("Authorization ", "" + connection.getRequestProperty("Authorization")); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); + BufferedReader br = new BufferedReader(new InputStreamReader(dis, "UTF-8")); String jsonData = ""; while ((jsonData = br.readLine()) != null) {
