From 7bdaf186f360cab7d18ea841cbe12637e9050c4c Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 24 Nov 2022 18:42:54 +0800
Subject: [PATCH] Drop Compat for Webview

---
 app/build.gradle                              |  1 -
 .../preference/SignInRequiredPreference.java  |  5 ---
 .../hippo/ehviewer/ui/scene/SignInScene.java  |  5 ---
 .../main/java/com/hippo/util/WebViewUtil.java | 43 -------------------
 4 files changed, 54 deletions(-)
 delete mode 100644 app/src/main/java/com/hippo/util/WebViewUtil.java

diff --git a/app/build.gradle b/app/build.gradle
index 4afb2d01c..398cd2588 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -173,7 +173,6 @@ dependencies {
     implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
     implementation 'androidx.viewpager:viewpager:1.1.0-alpha01'
     implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
-    implementation 'androidx.webkit:webkit:1.5.0'
 
     implementation 'com.drakeet.drawer:drawer:1.0.3'
     implementation 'com.google.android.material:material:1.8.0-SNAPSHOT'
diff --git a/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java b/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java
index 9d55753bf..f916eb20b 100644
--- a/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java
+++ b/app/src/main/java/com/hippo/ehviewer/preference/SignInRequiredPreference.java
@@ -28,7 +28,6 @@ import com.hippo.ehviewer.client.EhCookieStore;
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.ui.SettingsActivity;
 import com.hippo.ehviewer.ui.scene.BaseScene;
-import com.hippo.util.WebViewUtil;
 
 import okhttp3.HttpUrl;
 
@@ -59,10 +58,6 @@ public class SignInRequiredPreference extends Preference implements Preference.O
 
     @Override
     public boolean onPreferenceClick(Preference preference) {
-        if (!WebViewUtil.available(getContext())) {
-            mActivity.showTip(R.string.error_no_webview, BaseScene.LENGTH_SHORT);
-            return true;
-        }
         EhCookieStore store = EhApplication.getEhCookieStore(getContext());
         HttpUrl e = HttpUrl.get(EhUrl.HOST_E);
         HttpUrl ex = HttpUrl.get(EhUrl.HOST_EX);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
index 59ea3db09..2ca6da18b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java
@@ -45,7 +45,6 @@ import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.scene.Announcer;
 import com.hippo.scene.SceneFragment;
 import com.hippo.util.ExceptionUtils;
-import com.hippo.util.WebViewUtil;
 import com.hippo.yorozuya.AssertUtils;
 import com.hippo.yorozuya.IntIdGenerator;
 import com.hippo.yorozuya.ViewUtils;
@@ -226,10 +225,6 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc
         } else if (mSignIn == v) {
             signIn();
         } else if (mSignInViaWebView == v) {
-            if (!WebViewUtil.available(getContext())) {
-                showTip(R.string.error_no_webview, BaseScene.LENGTH_SHORT);
-                return;
-            }
             startScene(new Announcer(WebViewSignInScene.class).setRequestCode(this, REQUEST_CODE_WEBVIEW));
         } else if (mSignInViaCookies == v) {
             startScene(new Announcer(CookieSignInScene.class).setRequestCode(this, REQUEST_CODE_COOKIE));
diff --git a/app/src/main/java/com/hippo/util/WebViewUtil.java b/app/src/main/java/com/hippo/util/WebViewUtil.java
deleted file mode 100644
index 671a849b3..000000000
--- a/app/src/main/java/com/hippo/util/WebViewUtil.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2022 Tarsin Norbin
- *
- * This file is part of EhViewer
- *
- * EhViewer is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * EhViewer is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with EhViewer.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.hippo.util;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.webkit.WebViewCompat;
-
-public class WebViewUtil {
-    private static final String TAG = "WebViewUtil";
-
-    public static boolean available(Context context) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return false;
-        }
-        PackageInfo webViewPackageInfo = WebViewCompat.getCurrentWebViewPackage(context);
-        if (webViewPackageInfo == null) {
-            Log.d(TAG, "WebView not available");
-            return false;
-        }
-        Log.d(TAG, "WebView version: " + webViewPackageInfo.versionName);
-        return true;
-    }
-}