Fix Active TokenScript view

AlphaWallet · Dec 10, 2023 · 579ca9e · 579ca9e
1 parent 9dc6963
commit 579ca9e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/src/main/java/com/alphawallet/app/widget/NFTImageView.java b/app/src/main/java/com/alphawallet/app/widget/NFTImageView.java
@@ -212,7 +212,6 @@ private void loadImage(String url, String backgroundColor) throws IllegalArgumen
     private void setWebView(String imageUrl, ImageType hint)
     {
         progressBar.setVisibility(VISIBLE);
-        webView.setOnTouchListener(this);
         webView.setVerticalScrollBarEnabled(false);
         webView.setHorizontalScrollBarEnabled(false);
         webView.setWebChromeClient(new WebChromeClient());
@@ -245,6 +244,7 @@ public void onPageFinished(WebView view, String url)
             else if (useType.getImageType() == ImageType.ANIM)
             {
                 String loaderAnim = loadFile(getContext(), R.raw.token_anim).replace("[URL]", imageUrl).replace("[MIME]", useType.getMimeType());
+                webView.setOnTouchListener(this);
                 webView.getSettings().setJavaScriptEnabled(true);
                 webView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true);
                 webView.getSettings().setMediaPlaybackRequiresUserGesture(false);
@@ -256,6 +256,7 @@ else if (useType.getImageType() == ImageType.ANIM)
             }
             else if (useType.getImageType() == ImageType.MODEL)
             {
+                webView.setOnTouchListener(this);
                 String loader = loadFile(getContext(), R.raw.token_model).replace("[URL]", imageUrl);
                 String base64 = android.util.Base64.encodeToString(loader.getBytes(StandardCharsets.UTF_8), Base64.DEFAULT);
                 webView.loadData(base64, "text/html; charset=utf-8", "base64");
@@ -554,7 +555,11 @@ public DisplayType(String url, ImageType hint)
             {
                 case "":
                     mimeStr = "";
-                    if (hint == ImageType.IMAGE || hint == ImageType.ANIM)
+                    if (url.contains("tokenscript.org"))
+                    {
+                        type = ImageType.WEB;
+                    }
+                    else if (hint == ImageType.IMAGE || hint == ImageType.ANIM)
                     {
                         type = hint;
                     }