PWN-897 - fix webview paste button

p2p-org · Feb 8, 2024 · 7a962bf · 7a962bf
1 parent bc09802
commit 7a962bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/assets/referral_bridge_provider.js b/app/src/main/assets/referral_bridge_provider.js
@@ -13,7 +13,7 @@ window.ReferralBridge = {
         AndroidReferralBridge.showShareDialog(link);
     },
     getClipboardContent: function() {
-        return AndroidReferralBridge.getClipboardValue();
+        return JSON.parse(AndroidReferralBridge.getClipboardValue());
     },
     signMessageAsync: async function(message) {
         const result = AndroidReferralBridge.signMessageAsync(message);

diff --git a/app/src/main/java/org/p2p/wallet/referral/ReferralBridge.kt b/app/src/main/java/org/p2p/wallet/referral/ReferralBridge.kt
@@ -18,6 +18,9 @@ import org.p2p.wallet.utils.getClipboardText
 
 private typealias JsResultWrapper = String
 
+/**
+ * @see [assets/referral_bridge_provider.js]
+ */
 class ReferralWebViewBridge(
     webView: WebView,
     private val tokenKeyProvider: TokenKeyProvider,
@@ -131,7 +134,7 @@ class ReferralWebViewBridge(
 
         @JavascriptInterface
         fun getClipboardValue(): JsResultWrapper {
-            val context = referralWebView?.context ?: return wrapInJsResult("No Android context found")
+            val context = referralWebView?.context ?: return wrapInJsResult(Exception("No Android context found"))
             return wrapInJsResult(context.getClipboardText(trimmed = true).orEmpty())
         }
 

diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
@@ -13,4 +13,4 @@
         <domain includeSubdomains="true">beardict.net:5051</domain>
         <domain includeSubdomains="true">beardict.net</domain>
     </domain-config>
-</network-security-config>
+</network-security-config>