Merge pull request #180 from SanojPunchihewa/dev

Update data set url
SanojPunchihewa · Jun 3, 2020 · 30352c1 · 30352c1
2 parents b08e458 + 6970485
commit 30352c1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/app/src/main/java/com/mobilegenomics/genopo/activity/DemoActivity.java b/app/src/main/java/com/mobilegenomics/genopo/activity/DemoActivity.java
@@ -41,8 +41,6 @@ public class DemoActivity extends AppCompatActivity {
 
     private static final String TAG = DemoActivity.class.getSimpleName();
 
-    private static final String ecoliDataSetURL = "https://zanojmobiapps.com/_tmp/genome/ecoli/ecoli-data-set.zip";
-
     private static final String folderName = "mobile-genomics";
 
     private static final String fileName = "ecoli-data-set.zip";
@@ -132,7 +130,7 @@ public void onClick(final View v) {
                 String datasetFolder = Environment.getExternalStorageDirectory() + "/" + folderName
                         + "/ecoli-data-set";
                 FileUtil.deleteFolder(new File(datasetFolder));
-                downloadDataSet(ecoliDataSetURL);
+                downloadDataSet(getResources().getString(R.string.ecoli_data_set_url));
             }
         });
         linearLayout.addView(btnDownloadAndExtract);

diff --git a/app/src/main/java/com/mobilegenomics/genopo/activity/DownloadActivity.java b/app/src/main/java/com/mobilegenomics/genopo/activity/DownloadActivity.java
@@ -37,8 +37,6 @@ public class DownloadActivity extends AppCompatActivity {
 
     private static String folderPath;
 
-    private static final String ecoliDataSetURL = "https://zanojmobiapps.com/_tmp/genome/ecoli/ecoli-data-set.zip";
-
     Button btnDownload;
 
     Button btnDownloadEcoli;
@@ -130,7 +128,7 @@ public void onClick(final View v) {
         btnDownloadEcoli.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(final View v) {
-                downloadDataSet(ecoliDataSetURL);
+                downloadDataSet(getResources().getString(R.string.ecoli_data_set_url));
             }
         });
 

diff --git a/app/src/main/java/com/mobilegenomics/genopo/support/DownloadManager.java b/app/src/main/java/com/mobilegenomics/genopo/support/DownloadManager.java
@@ -115,7 +115,7 @@ public void taskEnd(@NonNull final DownloadTask task, @NonNull final EndCause ca
                 final String statusWithSpeed = cause.toString() + " " + taskSpeed.averageSpeed();
                 statusTextView.setText(statusWithSpeed);
                 if (realCause != null) {
-                    Log.e(TAG, "Download Error : " + realCause);
+                    statusTextView.setText("Download Error : " + realCause.getMessage());
                 }
                 downloadListener.onComplete(cause, realCause);
             }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -105,4 +105,7 @@
 
     <string name="btn_single_tool">Run a Single Tool\n<font color="#5F5F5F" size="12">(Artic_C, Bcftools, Bioawk)</font></string>
     <string name="txt_how_to_run_subtool">To run an individual analysis tool, select a pipeline that has the particular tool. <b>GUI Mode</b> is provided only for a limited number of sub-tools. Use <b>Terminal Mode</b> to run any sub-tool of an analysis tool</string>
+
+    <string name="ecoli_data_set_url">https://mobile-genomics.github.io/genopo/data/ecoli-data-set.zip</string>
+
 </resources>