From c2b6cee9a2b87d7fb9bbc8a1ff8ce0611821ee1a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 25 Nov 2017 15:44:47 +0000
Subject: [PATCH] ActivityNotFoundException fix

---
 CHANGELOG                                                 | 1 +
 .../main/java/net/i2p/android/help/BrowserAdapter.java    | 8 +++++++-
 app/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8ed07e827..b683db686 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
    * configuring addressbook subscriptions
    * using a configuration wizard
    * saving tunnel settings
+   * installing a browser without a market app
  * Update Firefox browser config instructions for Firefox Quantum
  * Translation updates
 
diff --git a/app/src/main/java/net/i2p/android/help/BrowserAdapter.java b/app/src/main/java/net/i2p/android/help/BrowserAdapter.java
index 3e588d73b..a17e586fc 100644
--- a/app/src/main/java/net/i2p/android/help/BrowserAdapter.java
+++ b/app/src/main/java/net/i2p/android/help/BrowserAdapter.java
@@ -1,5 +1,6 @@
 package net.i2p.android.help;
 
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.ColorMatrix;
@@ -11,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import net.i2p.android.router.R;
 
@@ -84,7 +86,11 @@ public class BrowserAdapter extends RecyclerView.Adapter<BrowserAdapter.ViewHold
                         String uriMarket = "market://search?q=pname:" + browser.packageName;
                         Uri uri = Uri.parse(uriMarket);
                         Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                        mCtx.startActivity(intent);
+                        try {
+                            mCtx.startActivity(intent);
+                        } catch (ActivityNotFoundException e) {
+                            Toast.makeText(mCtx, R.string.no_market_app, Toast.LENGTH_LONG).show();
+                        }
                     }
                 });
                 holder.mStatus.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a04fca177..348cb123f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -410,6 +410,7 @@
     <string name="logs_copied_to_clipboard">Logs copied to clipboard</string>
 
     <string name="label_browser_configuration">Browser configuration</string>
+    <string name="no_market_app">No market app found, please install manually</string>
 
     <string name="unset">Unset</string>
 </resources>