Merge pull request #16 from saasquatch/dev

Use loadDataWithBaseURL for WebVIew

Author: slisaasquatch

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [0.1.1] - 2025-06-12
+
+### Changed
+
+- Added base URL for WebView.
+- Internal dependency version bumps.
+
 ## [0.1.0] - 2024-11-22
 
 ### Changed
@@ -67,7 +74,9 @@
 
 ## [0.0.1] - 2021-02-17
 
-[Unreleased]: https://github.com/saasquatch/squatch-android/compare/0.1.0...HEAD
+[Unreleased]: https://github.com/saasquatch/squatch-android/compare/0.1.1...HEAD
+
+[0.1.1]: https://github.com/saasquatch/squatch-android/compare/0.1.0...0.1.1
 
 [0.1.0]: https://github.com/saasquatch/squatch-android/compare/0.0.9...0.1.0
 

README.md

@@ -24,7 +24,7 @@ Add the dependency:
 
 ```gradle
 dependencies {
-    implementation 'com.github.saasquatch:squatch-android:0.1.0'
+    implementation 'com.github.saasquatch:squatch-android:0.1.1'
 }
 ```
 

app/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     api 'com.github.saasquatch:saasquatch-java-sdk:0.2.0'
     api 'org.reactivestreams:reactive-streams:1.0.4'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.9'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.10'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 }

app/src/main/java/com/saasquatch/android/SquatchAndroidImpl.java

@@ -1,9 +1,6 @@
 package com.saasquatch.android;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import android.annotation.SuppressLint;
-import android.util.Base64;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import com.saasquatch.android.input.AndroidRenderWidgetOptions;
@@ -125,8 +122,8 @@ private void loadHtmlToWebView(@Nonnull AndroidRenderWidgetOptions androidRender
     webSettings.setJavaScriptEnabled(true);
     webSettings.setDomStorageEnabled(true);
     SquatchJavascriptInterface.applyToWebView(webView);
-    final String htmlBase64 = Base64.encodeToString(htmlString.getBytes(UTF_8), Base64.DEFAULT);
-    webView.loadData(htmlBase64, "text/html; charset=utf-8", "base64");
+    webView.loadDataWithBaseURL(androidRenderWidgetOptions.getWebViewBaseUrl(), htmlString,
+        "text/html; charset=utf-8", null, null);
   }
 
   private void loadErrorHtmlToWebView(

app/src/main/java/com/saasquatch/android/input/AndroidRenderWidgetOptions.java

@@ -7,15 +7,21 @@
 public final class AndroidRenderWidgetOptions {
 
   private final WebView webView;
+  private final String webViewBaseUrl;
 
-  private AndroidRenderWidgetOptions(WebView webView) {
+  private AndroidRenderWidgetOptions(WebView webView, String webViewBaseUrl) {
     this.webView = webView;
+    this.webViewBaseUrl = webViewBaseUrl;
   }
 
   public WebView getWebView() {
     return webView;
   }
 
+  public String getWebViewBaseUrl() {
+    return webViewBaseUrl;
+  }
+
   public static Builder newBuilder() {
     return new Builder();
   }
@@ -27,6 +33,7 @@ public static AndroidRenderWidgetOptions ofWebView(@Nonnull WebView webView) {
   public static final class Builder {
 
     private WebView webView;
+    private String webViewBaseUrl = "https://fast.ssqt.io/";
 
     private Builder() {}
 
@@ -35,8 +42,14 @@ public Builder setWebView(@Nonnull WebView webView) {
       return this;
     }
 
+    public Builder setWebViewBaseUrl(String webViewBaseUrl) {
+      this.webViewBaseUrl = webViewBaseUrl;
+      return this;
+    }
+
     public AndroidRenderWidgetOptions build() {
-      return new AndroidRenderWidgetOptions(Objects.requireNonNull(webView, "webView"));
+      return new AndroidRenderWidgetOptions(Objects.requireNonNull(webView, "webView"),
+          webViewBaseUrl);
     }
 
   }