Merge branch 'bitrefill-links'

Author: Beerosagos

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Android: fix connectivity misdetection when switching between WIFI and cellular network.
 - Android: dropped support for Android versions lower than 7.
 - Sort backups from newest to oldest in manage backups
+- Android: fix display of external links from Bitrefill
 
 ## v4.49.0
 - Bundle BitBox02 Nova firmware version v9.24.0

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/BitBoxWebChromeClient.java

@@ -3,12 +3,15 @@
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Message;
 import android.webkit.ConsoleMessage;
 import android.webkit.MimeTypeMap;
 import android.webkit.PermissionRequest;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
+import android.webkit.WebViewClient;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
@@ -105,6 +108,33 @@ public void onCameraPermissionResult(boolean granted) {
         }
     }
 
+    @Override
+    public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
+        // Handle window.open()/target=_blank by opening allowed domains externally.
+        WebView tempView = new WebView(view.getContext());
+        tempView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView webView, WebResourceRequest request) {
+                String url = request.getUrl().toString();
+                String host = request.getUrl().getHost();
+                try {
+                    if (Util.isAllowedExternalHost(host)) {
+                        Util.systemOpen((android.app.Application) context, url);
+                        return true;
+                    }
+                } catch (Exception e) {
+                    Util.log(e.getMessage());
+                }
+                Util.log("Blocked: " + url);
+                return true;
+            }
+        });
+        WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
+        transport.setWebView(tempView);
+        resultMsg.sendToTarget();
+        return true;
+    }
+
     public interface CameraPermissionDelegate {
         void requestCameraPermission(); // triggers ActivityCompat.requestPermissions(...)
     }

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/BitBoxWebViewClient.java

@@ -10,9 +10,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
 
 public class BitBoxWebViewClient extends WebViewClient {
     private final String baseUrl;
@@ -72,19 +69,10 @@ public boolean shouldOverrideUrlLoading(WebView view, android.webkit.WebResource
         String url = request.getUrl().toString();
 
         try {
-            // Allow opening in external browser instead, for listed domains.
-            List<Pattern> patterns = new ArrayList<>();
-            patterns.add(Pattern.compile("^(.*\\.)?pocketbitcoin\\.com$"));
-            patterns.add(Pattern.compile("^(.*\\.)?moonpay\\.com$"));
-            patterns.add(Pattern.compile("^(.*\\.)?bitsurance\\.eu$"));
-            patterns.add(Pattern.compile("^(.*\\.)?btcdirect\\.eu$"));
-
-            for (Pattern pattern : patterns) {
-                String host = request.getUrl().getHost();
-                if (host != null && pattern.matcher(host).matches()) {
-                    Util.systemOpen(appContext, url);
-                    return true;
-                }
+            String host = request.getUrl().getHost();
+            if (Util.isAllowedExternalHost(host)) {
+                Util.systemOpen(appContext, url);
+                return true;
             }
         } catch (Exception e) {
             Util.log(e.getMessage());

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/MainActivity.java

@@ -166,6 +166,8 @@ protected void onCreate(Bundle savedInstanceState) {
         vw.getSettings().setJavaScriptEnabled(true);
         vw.getSettings().setAllowUniversalAccessFromFileURLs(true);
         vw.getSettings().setAllowFileAccess(true);
+        // Allow widgets to open external links via window.open (handled in BitBoxWebChromeClient).
+        vw.getSettings().setSupportMultipleWindows(true);
 
         // For Moonpay widget: DOM storage and WebRTC camera access required.
         vw.getSettings().setDomStorageEnabled(true);

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/Util.java

@@ -12,8 +12,29 @@
 import androidx.core.content.FileProvider;
 
 import java.io.File;
+import java.util.regex.Pattern;
 
 public class Util {
+    private static final Pattern[] ALLOWED_EXTERNAL_HOSTS = new Pattern[]{
+            Pattern.compile("^(.*\\.)?pocketbitcoin\\.com$"),
+            Pattern.compile("^(.*\\.)?moonpay\\.com$"),
+            Pattern.compile("^(.*\\.)?bitsurance\\.eu$"),
+            Pattern.compile("^(.*\\.)?btcdirect\\.eu$"),
+            Pattern.compile("^(.*\\.)?bitrefill\\.com$")
+    };
+
+    public static boolean isAllowedExternalHost(String host) {
+        if (host == null) {
+            return false;
+        }
+        for (Pattern pattern : ALLOWED_EXTERNAL_HOSTS) {
+            if (pattern.matcher(host).matches()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static void systemOpen(Application application, String url) throws Exception {
         Context context = application.getApplicationContext();
         Intent intent;