Merge pull request #225 from jokakilla/master

[feat] Allow opening deeplinks with custom schema
SecUSo · Jul 8, 2024 · 7865cd9 · 7865cd9
2 parents f443d04 + 8355304
commit 7865cd9
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/...com/secuso/privacyfriendlycodescanner/qrscanner/ui/resultfragments/URLResultFragment.java b/...com/secuso/privacyfriendlycodescanner/qrscanner/ui/resultfragments/URLResultFragment.java
@@ -28,6 +28,7 @@
 import java.util.regex.Pattern;
 
 public class URLResultFragment extends ResultFragment {
+    private static final String VALID_RFC3986_PROTOCOL_SCHEME = "^[a-zA-Z][a-zA-Z0-9+.-]*:.*$";
 
     URIParsedResult result;
 
@@ -95,23 +96,14 @@ public void onProceedPressed(Context context) {
         if (!checked) {
             Toast.makeText(context, R.string.conform_url, Toast.LENGTH_LONG).show();
         } else {
-            String caption;
-            String qrurl3;
-            final String lowercase_qrurl = qrurl.toLowerCase();
-            if (!lowercase_qrurl.startsWith("http://") && !lowercase_qrurl.startsWith("https://")) {
-                qrurl3 = "http://" + qrurl;
-
-                Intent url = new Intent(Intent.ACTION_VIEW);/// !!!!
-                url.setData(Uri.parse(qrurl3));
-                caption = getResources().getStringArray(R.array.url_array)[0];
-                startActivity(Intent.createChooser(url, caption));
-            } else {
-                Intent url = new Intent(Intent.ACTION_VIEW);/// !!!!
-                url.setData(Uri.parse(qrurl).normalizeScheme());
-                caption = getResources().getStringArray(R.array.url_array)[0];
-                startActivity(Intent.createChooser(url, caption));
-
+            String urlForIntentData = qrurl;
+            if (!qrurl.matches(VALID_RFC3986_PROTOCOL_SCHEME)) {
+                urlForIntentData = "http://" + qrurl;
             }
+            Intent url = new Intent(Intent.ACTION_VIEW);/// !!!!
+            url.setData(Uri.parse(urlForIntentData).normalizeScheme());
+            String caption = getResources().getStringArray(R.array.url_array)[0];
+            startActivity(Intent.createChooser(url, caption));
         }
     }