Skip to content

Commit 8961abf

Browse files
JamesSmartCellJamesSmartCell
authored
Fix Dappbrowser Intercept (#3369)
* - Fix for WalletConnect V2 Foreground Service * - Fix for Opensea service update * - fix dappbrowser URL intercept
1 parent 5a289e8 commit 8961abf

File tree

3 files changed

+92
-69
lines changed

3 files changed

+92
-69
lines changed

‎app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java‎

Lines changed: 85 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import android.webkit.WebBackForwardList;
3939
import android.webkit.WebChromeClient;
4040
import android.webkit.WebHistoryItem;
41+
import android.webkit.WebResourceRequest;
4142
import android.webkit.WebView;
4243
import android.webkit.WebViewClient;
4344
import android.widget.FrameLayout;
@@ -72,7 +73,6 @@
7273
import com.alphawallet.app.entity.TransactionReturn;
7374
import com.alphawallet.app.entity.URLLoadInterface;
7475
import com.alphawallet.app.entity.Wallet;
75-
import com.alphawallet.app.entity.WalletConnectActions;
7676
import com.alphawallet.app.entity.WalletType;
7777
import com.alphawallet.app.entity.analytics.ActionSheetSource;
7878
import com.alphawallet.app.entity.analytics.QrScanResultType;
@@ -218,7 +218,7 @@ public void onActivityResult(Uri uri)
218218
// Need to handle the inverse event where the keyboard is hidden, and we size the page back
219219
// (Remembering to allow for the navigation bar).
220220
private final View.OnApplyWindowInsetsListener resizeListener = (v, insets) -> {
221-
if (v == null || getActivity() == null)
221+
if (getActivity() == null)
222222
{
223223
return insets;
224224
}
@@ -896,66 +896,11 @@ public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathC
896896
web3.setWebViewClient(new WebViewClient()
897897
{
898898
@Override
899-
public boolean shouldOverrideUrlLoading(WebView view, String url)
899+
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request)
900900
{
901-
String[] prefixCheck = url.split(":");
902-
if (prefixCheck.length > 1)
903-
{
904-
Intent intent;
905-
switch (prefixCheck[0])
906-
{
907-
case C.DAPP_PREFIX_TELEPHONE:
908-
intent = new Intent(Intent.ACTION_DIAL);
909-
intent.setData(Uri.parse(url));
910-
startActivity(Intent.createChooser(intent, "Call " + prefixCheck[1]));
911-
return true;
912-
case C.DAPP_PREFIX_MAILTO:
913-
intent = new Intent(Intent.ACTION_SENDTO);
914-
intent.setData(Uri.parse(url));
915-
startActivity(Intent.createChooser(intent, "Email: " + prefixCheck[1]));
916-
return true;
917-
case C.DAPP_PREFIX_ALPHAWALLET:
918-
if (prefixCheck[1].equals(C.DAPP_SUFFIX_RECEIVE))
919-
{
920-
viewModel.showMyAddress(getContext());
921-
return true;
922-
}
923-
break;
924-
case C.DAPP_PREFIX_WALLETCONNECT:
925-
//start walletconnect
926-
if (wallet.type == WalletType.WATCH)
927-
{
928-
showWalletWatch();
929-
}
930-
else
931-
{
932-
walletConnectSession = url;
933-
if (getContext() != null)
934-
viewModel.handleWalletConnect(getContext(), url, activeNetwork);
935-
}
936-
return true;
937-
default:
938-
break;
939-
}
940-
}
941-
942-
if (fromWalletConnectModal(url))
943-
{
944-
String encodedURL = url.split("=")[1];
945-
try
946-
{
947-
String decodedURL = URLDecoder.decode(encodedURL, Charset.defaultCharset().name());
948-
viewModel.handleWalletConnect(getContext(), decodedURL, activeNetwork);
949-
return true;
950-
}
951-
catch (UnsupportedEncodingException e)
952-
{
953-
Timber.d("Decode URL failed: " + e);
954-
}
955-
}
956-
957-
setUrlText(url);
958-
return false;
901+
final Uri uri = request.getUrl();
902+
final String url = uri.toString();
903+
return handlePrefix(url);
959904
}
960905
});
961906

@@ -978,6 +923,77 @@ public boolean shouldOverrideUrlLoading(WebView view, String url)
978923
}
979924
}
980925

926+
private boolean handlePrefix(String url)
927+
{
928+
String[] prefixCheck = url.split(":");
929+
if (prefixCheck.length > 1)
930+
{
931+
Intent intent;
932+
switch (prefixCheck[0])
933+
{
934+
case C.DAPP_PREFIX_TELEPHONE:
935+
intent = new Intent(Intent.ACTION_DIAL);
936+
intent.setData(Uri.parse(url));
937+
startActivity(Intent.createChooser(intent, "Call " + prefixCheck[1]));
938+
return true;
939+
case C.DAPP_PREFIX_MAILTO:
940+
intent = new Intent(Intent.ACTION_SENDTO);
941+
intent.setData(Uri.parse(url));
942+
startActivity(Intent.createChooser(intent, "Email: " + prefixCheck[1]));
943+
return true;
944+
case C.DAPP_PREFIX_ALPHAWALLET:
945+
if (prefixCheck[1].equals(C.DAPP_SUFFIX_RECEIVE))
946+
{
947+
viewModel.showMyAddress(getContext());
948+
return true;
949+
}
950+
break;
951+
case C.DAPP_PREFIX_AWALLET:
952+
handleAWCode(url);
953+
return true;
954+
case C.DAPP_PREFIX_WALLETCONNECT:
955+
//start walletconnect
956+
if (wallet.type == WalletType.WATCH)
957+
{
958+
showWalletWatch();
959+
}
960+
else
961+
{
962+
walletConnectSession = url;
963+
if (getContext() != null)
964+
viewModel.handleWalletConnect(getContext(), url, activeNetwork);
965+
}
966+
return true;
967+
default:
968+
break;
969+
}
970+
}
971+
972+
if (fromWalletConnectModal(url))
973+
{
974+
String encodedURL = url.split("=")[1];
975+
try
976+
{
977+
String decodedURL = URLDecoder.decode(encodedURL, Charset.defaultCharset().name());
978+
viewModel.handleWalletConnect(getContext(), decodedURL, activeNetwork);
979+
return true;
980+
}
981+
catch (UnsupportedEncodingException e)
982+
{
983+
Timber.d("Decode URL failed: %s", e.getMessage());
984+
}
985+
}
986+
987+
return false;
988+
}
989+
990+
private void handleAWCode(String awCode)
991+
{
992+
Bundle codeBundle = new Bundle();
993+
codeBundle.putString(C.AWALLET_CODE, awCode);
994+
getParentFragmentManager().setFragmentResult(C.AWALLET_CODE, codeBundle);
995+
}
996+
981997
private boolean fromWalletConnectModal(String url)
982998
{
983999
return url.startsWith("https://" + mainnetMagicLinkDomain + "/wc?uri=");
@@ -1477,7 +1493,14 @@ private boolean loadUrl(String urlText)
14771493
detachFragments();
14781494
addToBackStack(DAPP_BROWSER);
14791495
cancelSearchSession();
1480-
if (checkForMagicLink(urlText)) return true;
1496+
if (checkForMagicLink(urlText))
1497+
{
1498+
return true;
1499+
}
1500+
else if (handlePrefix(urlText))
1501+
{
1502+
return true;
1503+
}
14811504
web3.resetView();
14821505
web3.loadUrl(Utils.formatUrl(urlText));
14831506
setUrlText(Utils.formatUrl(urlText));

‎app/src/main/java/com/alphawallet/app/web3/Web3View.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.annotation.SuppressLint;
44
import android.content.Context;
55
import android.graphics.Bitmap;
6-
import android.os.Build;
6+
import android.net.Uri;
77
import android.util.AttributeSet;
88
import android.webkit.WebChromeClient;
99
import android.webkit.WebResourceError;
@@ -14,7 +14,6 @@
1414

1515
import androidx.annotation.NonNull;
1616
import androidx.annotation.Nullable;
17-
import androidx.annotation.RequiresApi;
1817
import androidx.webkit.WebSettingsCompat;
1918
import androidx.webkit.WebViewFeature;
2019

@@ -141,7 +140,7 @@ public void setWebChromeClient(WebChromeClient client)
141140
}
142141

143142
@Override
144-
public void setWebViewClient(WebViewClient client)
143+
public void setWebViewClient(@NonNull WebViewClient client)
145144
{
146145
super.setWebViewClient(new WrapWebViewClient(webViewClient, client));
147146
}
@@ -366,11 +365,12 @@ else if (!loadingError && loadInterface != null)
366365
}
367366

368367
@Override
369-
public boolean shouldOverrideUrlLoading(WebView view, String url)
370-
{
368+
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
369+
final Uri uri = request.getUrl();
370+
final String url = uri.toString();
371371
redirect = true;
372372

373-
return externalClient.shouldOverrideUrlLoading(view, url)
373+
return externalClient.shouldOverrideUrlLoading(view, request)
374374
|| internalClient.shouldOverrideUrlLoading(view, url);
375375
}
376376

‎app/src/main/java/com/alphawallet/app/widget/AddressBar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class AddressBar extends MaterialToolbar implements ItemClickListener
4747
private ImageView home;
4848

4949
@Nullable
50-
private Disposable disposable;
50+
private Disposable disposable; // awallet://openURL?https%3A%2F%2Fsmart-layer.vercel.app
5151
private boolean focused;
5252

5353
public AddressBar(Context context, AttributeSet attributeSet)

0 commit comments

Comments
 (0)