upgrade sdk to 30, support to level 19; refactor codes

plateaukao · Feb 26, 2021 · b03941f · b03941f
1 parent dad067c
commit b03941f
Show file tree

Hide file tree

Showing 7 changed files with 236 additions and 241 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,13 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
-        applicationId "de.baumann.browser"
-        minSdkVersion 23
-        targetSdkVersion 29
+        //applicationId "de.baumann.browser"
+        applicationId "info.plateaukao.einkbro"
+        minSdkVersion 19
+        targetSdkVersion 30
         versionCode 104
         versionName "7.2"
         vectorDrawables.useSupportLibrary = true
@@ -33,17 +34,11 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.mobapphome.library:mah-encryptor-lib:1.0.1'
     implementation 'androidx.preference:preference:1.1.0'
-    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation "androidx.core:core-ktx:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-repositories {
-    mavenCentral()
+
+    implementation 'com.google.android:flexbox:2.0.1'
 }
diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt
diff --git a/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.java b/app/src/main/java/de/baumann/browser/browser/NinjaWebViewClient.java
@@ -15,17 +15,14 @@
 import androidx.annotation.NonNull;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import com.google.android.material.textfield.TextInputLayout;
 import android.view.View;
 import android.webkit.CookieManager;
-import android.webkit.HttpAuthHandler;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
 
 import java.io.ByteArrayInputStream;
@@ -67,8 +64,6 @@ public NinjaWebViewClient(NinjaWebView ninjaWebView) {
 
     @Override
     public void onPageFinished(WebView view, String url) {
-        //super.onPageFinished(view, url);
-
         if (sp.getBoolean("saveHistory", true)) {
             RecordAction action = new RecordAction(context);
             action.open(true);
@@ -80,12 +75,14 @@ public void onPageFinished(WebView view, String url) {
             }
             action.close();
         }
+        /* Daniel
 
         if (ninjaWebView.isForeground()) {
             ninjaWebView.invalidate();
         } else {
             ninjaWebView.postInvalidate();
         }
+         */
     }
 
     @Override

diff --git a/app/src/main/java/de/baumann/browser/unit/BrowserUnit.java b/app/src/main/java/de/baumann/browser/unit/BrowserUnit.java
@@ -399,4 +399,9 @@ public static boolean deleteDir(File dir) {
         }
         return dir != null && dir.delete();
     }
+
+    public static void printTimestamp(String function) {
+        Long timestamp = System.currentTimeMillis();
+        Log.v("timestamp", function + " timestamp:" + timestamp);
+    }
 }
diff --git a/app/src/main/java/de/baumann/browser/view/NinjaWebView.java b/app/src/main/java/de/baumann/browser/view/NinjaWebView.java
@@ -13,19 +13,19 @@
 
 import android.util.AttributeSet;
 import android.util.Base64;
+import android.util.Log;
 import android.view.*;
 import android.webkit.CookieManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
+import de.baumann.browser.Ninja.BuildConfig;
 import de.baumann.browser.browser.*;
 import de.baumann.browser.Ninja.R;
 import de.baumann.browser.unit.BrowserUnit;
 import de.baumann.browser.unit.ViewUnit;
 
-import java.io.InputStream;
 import java.util.HashMap;
-import java.util.Objects;
 
 public class NinjaWebView extends WebView implements AlbumController {
 
@@ -136,8 +136,10 @@ public NinjaWebView(Context context) {
         initAlbum();
     }
 
-    private synchronized void initWebView() {
-        //WebView.setWebContentsDebuggingEnabled(true);
+    private void initWebView() {
+        if (BuildConfig.DEBUG) {
+            WebView.setWebContentsDebuggingEnabled(true);
+        }
         setWebViewClient(webViewClient);
         setWebChromeClient(webChromeClient);
         setDownloadListener(downloadListener);
@@ -152,7 +154,7 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
     }
 
     @TargetApi(Build.VERSION_CODES.O)
-    private synchronized void initWebSettings() {
+    private void initWebSettings() {
         webSettings = getSettings();
         webSettings.setBuiltInZoomControls(true);
         webSettings.setDisplayZoomControls(false);
@@ -165,7 +167,7 @@ private synchronized void initWebSettings() {
         }
     }
 
-    public synchronized void initPreferences() {
+    public void initPreferences() {
         sp = PreferenceManager.getDefaultSharedPreferences(context);
         String userAgent = sp.getString("userAgent", "");
         webSettings = getSettings();
@@ -180,6 +182,7 @@ public synchronized void initPreferences() {
             webSettings.setUserAgentString(BrowserUnit.UA_DESKTOP);
         } else {
             webSettings.setUserAgentString(defaultUserAgent.replace("wv", ""));
+            //webSettings.setUserAgentString("Mozilla/5.0 (Linux; Android 11; sdk_gphone_x86_64_arm64 Build/RPB3.200720.005; ) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/83.0.4103.106 Safari/537.36");
         }
         webSettings.setUseWideViewPort(isDesktopMode);
         webSettings.setLoadWithOverviewMode(isDesktopMode);
@@ -198,13 +201,13 @@ public synchronized void initPreferences() {
         manager.setAcceptCookie(sp.getBoolean(context.getString(R.string.sp_cookies), true));
     }
 
-    private synchronized void initAlbum() {
+    private void initAlbum() {
         album.setAlbumCover(null);
         album.setAlbumTitle(context.getString(R.string.app_name));
         album.setBrowserController(browserController);
     }
 
-    public synchronized HashMap<String, String> getRequestHeaders() {
+    public HashMap<String, String> getRequestHeaders() {
         HashMap<String, String> requestHeaders = new HashMap<>();
         requestHeaders.put("DNT", "1");
         if (sp.getBoolean(context.getString(R.string.sp_savedata), false)) {
@@ -216,7 +219,7 @@ public synchronized HashMap<String, String> getRequestHeaders() {
 
     @SuppressLint("SetJavaScriptEnabled")
     @Override
-    public synchronized void loadUrl(String url) {
+    public void loadUrl(String url) {
         /*
         if(url.startsWith("javascript")) {
             // Daniel