Revert "Fixes #124: Handle download failures, fix URL parsing (#127)"

This reverts commit c4f36c9.
d4rken-org · Sep 6, 2017 · 343a161 · 343a161
1 parent f3ce793
commit 343a161
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/...src/main/java/subreddit/android/appstore/backend/reddit/wiki/parser/NameColumnParser.java b/...src/main/java/subreddit/android/appstore/backend/reddit/wiki/parser/NameColumnParser.java
@@ -28,7 +28,7 @@ public void parse(AppInfo appInfo, Map<Column, String> rawColumns) {
         if (matcher.matches()) {
             appName = matcher.group(1);
 
-            downloadUrl = matcher.group(2).replaceAll(" ","");
+            downloadUrl = matcher.group(2);
             // TODO more parsing of different types
             if (downloadUrl.contains("://play.google.com/store") || downloadUrl.contains("://market.android.com")) {
                 downloadType = Download.Type.GPLAY;

diff --git a/app/src/main/java/subreddit/android/appstore/screens/details/AppDetailsFragment.java b/app/src/main/java/subreddit/android/appstore/screens/details/AppDetailsFragment.java
@@ -183,12 +183,7 @@ void onContactClicked() {
     }
 
     void openDownload(Download d) {
-        try {
-            startActivity(new Intent(Intent.ACTION_VIEW, d.getDownloadUri()));
-        } catch (Exception e) {
-            Timber.e(e, "Problem launching intent for a Download link");
-            displayToast(R.string.no_download_client);
-        }
+        startActivity(new Intent(Intent.ACTION_VIEW, d.getDownloadUri()));
     }
 
     void openContact(Contact c) {
@@ -198,7 +193,8 @@ void openContact(Contact c) {
                     startActivity(new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", c.getTarget(), null)));
                 } catch (Exception e) {
                     Timber.e(e, "Problem launching intent for Email contact");
-                    displayToast(R.string.no_email_client);
+                    Toast.makeText(getContext(), getContext().getResources().getString(R.string.no_email_client), Toast.LENGTH_LONG).show();
+                    //note: translations pulled straight from google translate, someone might want to double check
                 }
 
                 break;
@@ -279,10 +275,6 @@ private void openInChrome(String url) {
         customTabsIntent.launchUrl(getActivity(), Uri.parse(url));
     }
 
-    private void displayToast(int message) {
-        Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
-    }
-
     @Override
     public void displayScreenshots(@Nullable ScrapeResult scrapeResult) {
         if (scrapeResult != null) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -56,5 +56,4 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-    <string name="no_download_client">No client available for this download</string>
 </resources>