Skip to content

Handle .ton domains correctly in WebviewActivity.java #1863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle .ton domains correctly in WebviewActivity.java #1863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion TMessagesProj/src/main/java/org/telegram/ui/WebviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import android.view.ViewParent;
import android.webkit.CookieManager;
import android.webkit.JavascriptInterface;
import android.webkit.WebResourceResponse;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
Expand Down Expand Up @@ -263,7 +264,7 @@ private boolean isInternalUrl(String url) {
}
return true;
}
return false;
return Browser.isTonsite(url);
}

@Override
Expand All @@ -279,6 +280,14 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
return isInternalUrl(url) || super.shouldOverrideUrlLoading(view, url);
}

@Override
public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
if (Browser.isTonsite(url)) {
return org.telegram.ui.web.BotWebViewContainer.proxyTON("GET", url, null);
}
return super.shouldInterceptRequest(view, url);
}

@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
Expand Down