Update minSdkVersion to 25 = Android 7.1 (Nougat)

mikespub · Mar 3, 2022 · b42759b · b42759b
1 parent 909cde1
commit b42759b
Show file tree

Hide file tree

Showing 16 changed files with 166 additions and 137 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,18 +54,24 @@ android {
 }
 
 dependencies {
-    //def appCompatVersion = "1.4.0"
-    def lifeCycleVersion = '2.4.0'
+    //def appCompatVersion = "1.4.1"
+    def lifeCycleVersion = '2.4.1'
+    //def arch_version = '2.1.0'
 
     // https://developer.android.com/studio/projects/android-library
     implementation project(":myutils")
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    // https://developer.android.com/jetpack/androidx/releases/appcompat
     implementation "androidx.appcompat:appcompat:${appCompatVersion}"
     // For loading and tinting drawables on older versions of the platform
     // implementation "androidx.appcompat:appcompat-resources:${appCompatVersion}"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    // https://developer.android.com/jetpack/androidx/releases/constraintlayout
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    // To use constraintlayout in compose
+    //implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0"
     implementation "androidx.webkit:webkit:1.4.0"
+    // https://developer.android.com/jetpack/androidx/releases/lifecycle
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel:${lifeCycleVersion}"
     // LiveData

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 22,
-      "versionName": "1.21",
+      "versionCode": 23,
+      "versionName": "1.22",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/assets/web/about.html b/app/src/main/assets/web/about.html
@@ -19,8 +19,8 @@
 <div id="main">
     <h1><a href="index.html">My WebView</a></h1>
     <h2>About My WebView</h2>
-    <h3>What's New in Version 1.21</h3>
-    <p>Update min API level to 24 = Android 7 (Nougat)</p>
+    <h3>What's New in Version 1.22</h3>
+    <p>Update min API level to 25 = Android 7.1 (Nougat)</p>
     <h3>Product Description</h3>
     <p>Test your websites with Android WebView, using a configurable list of sites and matches to allow or skip.
         Other links will not be handled by the app and will simply ask you to open the standard browser or not.</p>

diff --git a/app/src/main/java/net/mikespub/mywebview/AppJavaScriptProxy.java b/app/src/main/java/net/mikespub/mywebview/AppJavaScriptProxy.java
@@ -43,7 +43,7 @@ public void showMessage(final String message) {
             public void run() {
                 Uri uri = Uri.parse(myWebView.getUrl());
                 if(!uri.getHost().equals(myActivity.getString(R.string.app_host))){
-                    Log.d("WebView", "No Javascript Interface for " + uri.toString());
+                    Log.d("WebView", "No Javascript Interface for " + uri);
                     return;
                 }
 

diff --git a/app/src/main/java/net/mikespub/mywebview/MainActivity.java b/app/src/main/java/net/mikespub/mywebview/MainActivity.java
@@ -1,13 +1,13 @@
 package net.mikespub.mywebview;
 
+import android.annotation.SuppressLint;
 import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
@@ -142,6 +142,7 @@ public void onActivityResult(Uri returnUri) {
     /**
      * @param savedInstanceState    saved instance state
      */
+    @SuppressLint("SetJavaScriptEnabled")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -347,9 +348,9 @@ public void onBackPressed() {
     // https://stackoverflow.com/questions/41025200/android-view-inflateexception-error-inflating-class-android-webkit-webview
     @Override
     public void applyOverrideConfiguration(final Configuration overrideConfiguration) {
-        if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT < 25) {
-            overrideConfiguration.uiMode &= ~Configuration.UI_MODE_NIGHT_MASK;
-        }
+        //if (Build.VERSION.SDK_INT >= 21 && Build.VERSION.SDK_INT < 25) {
+        //    overrideConfiguration.uiMode &= ~Configuration.UI_MODE_NIGHT_MASK;
+        //}
         super.applyOverrideConfiguration(overrideConfiguration);
     }
 
@@ -445,16 +446,16 @@ private Uri getActivityResultUri(int requestCode, int resultCode, Intent returnI
         if (returnUri == null) {
             // Pick text - Samsung Notes
             if (returnExtras != null) {
-                Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent.toString() + " No Uri: " + returnIntent.toUri(0) + " Extras: " + returnExtras.toString());
+                Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent + " No Uri: " + returnIntent.toUri(0) + " Extras: " + returnExtras);
             } else {
-                Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent.toString() + " No Uri: " + returnIntent.toUri(0) + " Extras: " + returnExtras);
+                Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent + " No Uri: " + returnIntent.toUri(0) + " Extras: " + returnExtras);
             }
             return null;
         }
         if (returnExtras != null) {
-            Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent.toString() + " Uri: " + returnUri + " Extras: " + returnExtras.toString());
+            Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent + " Uri: " + returnUri + " Extras: " + returnExtras);
         } else {
-            Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent.toString() + " Uri: " + returnUri + " Extras: " + returnExtras);
+            Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Intent: " + returnIntent + " Uri: " + returnUri + " Extras: " + returnExtras);
         }
         return returnUri;
     }
@@ -464,7 +465,7 @@ private boolean checkActivityResult(int requestCode, int resultCode, Intent retu
         if (resultCode != RESULT_OK) {
             // Exit without doing anything else
             if (returnIntent != null) {
-                Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Not OK: " + returnIntent.toString());
+                Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Not OK: " + returnIntent);
             } else {
                 Log.d("Activity Result", "Request: " + requestCode + " Result: " + resultCode + " Not OK: " + returnIntent);
             }

diff --git a/app/src/main/java/net/mikespub/mywebview/MyAppWebViewClient.java b/app/src/main/java/net/mikespub/mywebview/MyAppWebViewClient.java
@@ -435,7 +435,7 @@ private boolean testOverrideUrlLoading(WebView view, String url) {
         if (isMatch && isSkip) {
             Intent intent = new Intent(Intent.ACTION_VIEW, uri);
             // Create intent to show chooser
-            String title = uri.toString() + "\n\nOpen with";
+            String title = uri + "\n\nOpen with";
             Intent chooser = Intent.createChooser(intent, title);
             view.getContext().startActivity(chooser);
             return true;
@@ -444,11 +444,11 @@ private boolean testOverrideUrlLoading(WebView view, String url) {
         if (hasNotMatching()) {
             Intent intent = new Intent(Intent.ACTION_VIEW, uri);
             // Create intent to show chooser
-            String title = uri.toString() + "\n\nOpen with";
+            String title = uri + "\n\nOpen with";
             Intent chooser = Intent.createChooser(intent, title);
             view.getContext().startActivity(chooser);
         } else {
-            String message = uri.toString() + "\n\nLink not matching. You can allow opening via regular browser in Advanced Options.";
+            String message = uri + "\n\nLink not matching. You can allow opening via regular browser in Advanced Options.";
             Toast toast = Toast.makeText(
                     view.getContext().getApplicationContext(),
                     message,

diff --git a/app/src/main/java/net/mikespub/mywebview/MyLocalConfigRepository.java b/app/src/main/java/net/mikespub/mywebview/MyLocalConfigRepository.java
@@ -128,7 +128,7 @@ static void saveIconToMedia(AppCompatActivity activity) {
         }
         //Bitmap bitmap = BitmapFactory.decodeResource(activity.getResources(), R.mipmap.ic_launcher);
         if (bitmap != null) {
-            Log.d(TAG, "Bitmap: " + bitmap.toString());
+            Log.d(TAG, "Bitmap: " + bitmap);
             File extDir = activity.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
             if (!extDir.exists() && !extDir.mkdirs()) {
                 Log.e(TAG, "Dir Create: FAIL " + extDir.getAbsolutePath());
@@ -198,7 +198,7 @@ public static void insertImage(ContentResolver cr, File file) {
 
     static boolean updateLocalSites(AppCompatActivity activity, HashMap<String, String> localSites) {
         HashMap<String, String> siteMap = findLocalSites(activity);
-        Log.d(TAG, "Sites: " + siteMap.toString());
+        Log.d(TAG, "Sites: " + siteMap);
         boolean hasAdded = false;
         for (String url: siteMap.keySet()) {
             if (!localSites.containsKey(url)) {