Merge branch 'master' into master
This commit is contained in:
@ -1,13 +1,12 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 25
|
||||
buildToolsVersion '27.0.3'
|
||||
compileSdkVersion 28
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.example.app"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 25
|
||||
targetSdkVersion 28
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
@ -1,9 +1,8 @@
|
||||
package com.example.app;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.webkit.WebSettings;
|
||||
import android.webkit.WebView;
|
||||
import android.webkit.WebViewClient;
|
||||
@ -12,12 +11,13 @@ public class MainActivity extends Activity {
|
||||
|
||||
private WebView mWebView;
|
||||
|
||||
@SuppressLint("SetJavaScriptEnabled")
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
mWebView = (WebView) findViewById(R.id.activity_main_webview);
|
||||
mWebView = findViewById(R.id.activity_main_webview);
|
||||
|
||||
// Force links and redirects to open in the WebView instead of in a browser
|
||||
mWebView.setWebViewClient(new WebViewClient());
|
||||
|
@ -5,8 +5,11 @@ import android.net.Uri;
|
||||
import android.webkit.WebView;
|
||||
import android.webkit.WebViewClient;
|
||||
|
||||
public class MyWebViewClient extends WebViewClient {
|
||||
import java.util.Objects;
|
||||
|
||||
class MyWebViewClient extends WebViewClient {
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public boolean shouldOverrideUrlLoading(WebView view, String url) {
|
||||
Uri uri = Uri.parse(url);
|
||||
|
Reference in New Issue
Block a user