reformat code using findbugs
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/18002d33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/18002d33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/18002d33 Branch: refs/heads/master Commit: 18002d33667c458244eb2f1b8bb27c649583e428 Parents: 0df0ab5 Author: Sagar <[email protected]> Authored: Mon Jun 13 16:53:38 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jun 13 16:53:38 2016 +0530 ---------------------------------------------------------------------- .../mobile/activities/LoginActivity.java | 5 ++- .../adapters/FavoriteWorkflowAdapter.java | 6 ++- .../mobile/fragments/WorkflowItemFragment.java | 33 ++++++++++----- .../fragments/workflowdetails/RunFragment.java | 2 +- .../WorkflowRunHistoryFragment.java | 2 +- .../workflowdetails/WorkflowdetailFragment.java | 42 +++++++++++++------- .../taverna/mobile/utils/DetailsLoader.java | 7 ++-- .../apache/taverna/mobile/utils/RunTask.java | 5 ++- .../taverna/mobile/utils/WorkflowOpen.java | 11 ++--- .../xmlparsers/MyExperimentXmlParserRules.java | 2 +- 10 files changed, 74 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18002d33/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 d7b46f9..c374ec0 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 @@ -53,6 +53,7 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.Charset; public class LoginActivity extends ActionBarActivity { @@ -168,7 +169,7 @@ public class LoginActivity extends ActionBarActivity { String authentication = userName + ":" + password; con.setRequestMethod("GET"); con.setRequestProperty("Authorization", "Basic " + Base64.encodeToString - (authentication.getBytes(), Base64.DEFAULT)); + (authentication.getBytes(Charset.forName("UTF-8")), Base64.DEFAULT)); con.setInstanceFollowRedirects(true); HttpURLConnection.setFollowRedirects(true); con.connect(); @@ -198,7 +199,7 @@ public class LoginActivity extends ActionBarActivity { con.connect(); } BufferedReader br = new BufferedReader(new InputStreamReader(con - .getInputStream())); + .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/18002d33/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 0feb3ce..b64ad43 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 @@ -45,6 +45,7 @@ import android.widget.TextView; import android.widget.Toast; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -163,8 +164,9 @@ public class FavoriteWorkflowAdapter extends RecyclerView.Adapter<FavoriteWorkfl break; } } - sharedPreferences.edit().putString(WorkflowAdapter.FAVORITE_LIST_DB, charsequence - .toString()).apply(); + sharedPreferences.edit().putString(WorkflowAdapter.FAVORITE_LIST_DB, Arrays.toString + (charsequence) + ).apply(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18002d33/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 53649a0..1a58a40 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,7 +89,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout */ private static RecyclerView mListView; private static View rootView; - private static boolean stateOn = false; + private boolean stateOn = false; private static TextView noDataText; private static LruCache<String, Bitmap> avatarCache; private static WorkflowAdapter workflowAdapter; @@ -116,6 +116,21 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout public WorkflowItemFragment() { } + public static void setCx(Context cx) { + WorkflowItemFragment.cx = cx; + } + + public static void setRootView(View rootView) { + WorkflowItemFragment.rootView = rootView; + } + + public static void setIsLoadMoreData(boolean isLoadMoreData) { + WorkflowItemFragment.isLoadMoreData = isLoadMoreData; + } + + 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(); @@ -132,8 +147,8 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout public void run() { WorkflowItemFragment.workflowAdapter = new WorkflowAdapter(cx, data); if (isLoadMoreData) { - isLoadMoreData = false; - isRefreshData = false; + setIsLoadMoreData(false); + setIsRefreshData(false); ((WorkflowAdapter) mListView.getAdapter()).addItems(data, previousTotal); } else { mListView.swapAdapter(workflowAdapter, false); @@ -202,7 +217,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); - cx = getActivity(); + setCx(getActivity()); mLinearLayoutManager = new LinearLayoutManager(cx); scrollListener = new InfiniteScrollListener(); workflowObserver = new RecyclerView.AdapterDataObserver() { @@ -228,7 +243,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - rootView = inflater.inflate(R.layout.fragment_item, container, false); + setRootView(inflater.inflate(R.layout.fragment_item, container, false)); noDataText = (TextView) rootView.findViewById(android.R.id.empty); swipeRefreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.refresh); swipeRefreshLayout.setOnRefreshListener(this); @@ -281,7 +296,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout @Override public void onDestroyView() { super.onDestroyView(); - rootView = null; + setRootView(null); } @Override @@ -369,8 +384,8 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout @Override public void onRefresh() { - isRefreshData = true; - isLoadMoreData = false; + setIsRefreshData(true); + setIsLoadMoreData(false); new WorkflowLoader(getActivity(), swipeRefreshLayout).execute("" + 1); } @@ -464,7 +479,7 @@ public class WorkflowItemFragment extends Fragment implements SwipeRefreshLayout visibleThreshold)) { //list has reached end, load more. Toast.makeText(getActivity(), "Loading more", Toast.LENGTH_SHORT).show(); - isLoadMoreData = true; + setIsLoadMoreData(true); currentPage++; new WorkflowLoader(getActivity(), swipeRefreshLayout).execute("" + currentPage); Log.d(TAG, currentPage + ""); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18002d33/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 400eaaf..b4bde68 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)); + 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/18002d33/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 70481f3..eea053e 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); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/18002d33/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 c5f0cae..22a100b 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 @@ -38,8 +38,8 @@ import org.apache.taverna.mobile.tavernamobile.User; import org.apache.taverna.mobile.tavernamobile.Workflow; import org.apache.taverna.mobile.utils.DetailsLoader; import org.apache.taverna.mobile.utils.RunTask; -import org.apache.taverna.mobile.utils.WorkflowDownloadManager; import org.apache.taverna.mobile.utils.WorkflowDB; +import org.apache.taverna.mobile.utils.WorkflowDownloadManager; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -86,6 +86,7 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.Charset; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -105,15 +106,15 @@ 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 static String workflow_uri; + 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 static boolean mLoadState = false; - private static boolean mDropupload = false; + private boolean mLoadState = false; + private boolean mDropupload = false; public AlertDialog runDialog; public AlertDialog.Builder alertDialogBuilder; public boolean isZoomIn; @@ -138,9 +139,6 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList return fragment; } - public static WorkflowdetailFragment getInstance() { - return WorkflowdetailFragment.getInstance(); - } public static void setWorkflowDetails(final Workflow wk) { currentWorkflow = wk; @@ -228,6 +226,14 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList // preview.setOnClickListener(WorkflowdetailFragment.getInstance()); } + public static void setProgressDialog(Context context) { + WorkflowdetailFragment.progressDialog = new ProgressDialog(context); + } + + public static void setRootView(View rootView) { + WorkflowdetailFragment.rootView = rootView; + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -236,8 +242,9 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList AndroidAuthSession session = new AndroidAuthSession(appKeys); mDBApi = new DropboxAPI<AndroidAuthSession>(session); // long workflowid = getActivity().getIntent().getLongExtra("workflowid", 0); - rootView = inflater.inflate(R.layout.fragment_workflow_detail, container, false); - progressDialog = new ProgressDialog(getActivity()); + setRootView(inflater.inflate(R.layout.fragment_workflow_detail, + container, false)); + setProgressDialog(getActivity()); progressDialog.setMessage(getActivity().getResources().getString(R.string.loading)); progressDialog.setCancelable(false); // mWorkfloId = workflowid; @@ -279,7 +286,12 @@ 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. */ @@ -291,7 +303,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList @Override public void onAttach(Context context) { super.onAttach(context); - cont = getActivity(); + setCont(getActivity()); } @Override @@ -495,7 +507,7 @@ 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(), Base64 + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64 .DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -509,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)); + BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); String jsonData = ""; while ((jsonData = br.readLine()) != null) { @@ -656,11 +668,11 @@ 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(), 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())); + .getInputStream(),"UTF-8")); String str = ""; while ((str = bufferedReader.readLine()) != null) { sb.append(str); //in this string builder we have read the workflow( as @@ -695,7 +707,7 @@ public class WorkflowdetailFragment extends Fragment implements View.OnClickList dos.close(); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis)); + 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/18002d33/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 1313e13..66b4f84 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 @@ -48,6 +48,7 @@ import java.net.Authenticator; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.Charset; /** * Loads workflow details from the myexperiment API and presents them on the UI .The class is @@ -100,7 +101,7 @@ 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(), + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64.DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -166,7 +167,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)); + BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); StringBuffer sb = new StringBuffer(); String jsonData = ""; while ((jsonData = br.readLine()) != null) { @@ -208,7 +209,7 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { } return workflow; default: - BufferedReader br = new BufferedReader(new InputStreamReader(dis)); + 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/18002d33/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 3aa06fb..ff9d39c 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 @@ -17,6 +17,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.Charset; /** * Created by root on 7/11/15. @@ -48,7 +49,7 @@ 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(), Base64 + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64 .DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -67,7 +68,7 @@ public class RunTask extends AsyncTask<String, Void, String> { dos.close(); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis)); + 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/18002d33/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 693190a..35ce80b 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 @@ -31,6 +31,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.Charset; /** * Read the selected xml file from storage and upload to player to generate workflowRun @@ -74,7 +75,7 @@ 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(), 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 { @@ -90,7 +91,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { } String data = "{\"document\":\"data:application/octet-stream;base64," + - Base64.encodeToString(sb.toString().getBytes("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 @@ -114,7 +115,7 @@ public class WorkflowOpen extends AsyncTask<String, Void, String> { dos.close(); InputStream dis = connection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(dis)); + BufferedReader br = new BufferedReader(new InputStreamReader(dis,"UTF-8")); while ((str = br.readLine()) != null) { sb.append(str); } @@ -198,7 +199,7 @@ 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(), Base64 + String basicAuth = "Basic " + Base64.encodeToString(userpass.getBytes(Charset.forName("UTF-8")), Base64 .DEFAULT); connection.setRequestProperty("Authorization", basicAuth); @@ -210,7 +211,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)); + 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/18002d33/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java b/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java index a17ce71..638e96c 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/xmlparsers/MyExperimentXmlParserRules.java @@ -40,7 +40,7 @@ import java.util.List; */ public class MyExperimentXmlParserRules { - public static Workflow mWorkflow = new Workflow(); + public static final Workflow mWorkflow = new Workflow(); public MyExperimentXmlParserRules() { }
