@capacitor/android 9.0.0-alpha.3 → 9.0.0-alpha.5

package/capacitor/build.gradle

@@ -20,7 +20,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath 'com.android.tools.build:gradle:9.2.1'
 
         if (System.getenv("CAP_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
@@ -40,10 +40,9 @@ if (System.getenv("CAP_PUBLISH") == "true") {
 
 android {
     namespace = "com.getcapacitor.android"
-    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 37
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26
         versionCode 1
         versionName "1.0"
         consumerProguardFiles 'proguard-rules.pro'

package/capacitor/src/main/java/com/getcapacitor/Bridge.java

@@ -11,7 +11,6 @@ import android.content.pm.PackageInfo;
 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.Handler;
 import android.os.HandlerThread;
@@ -51,7 +50,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.json.JSONException;
@@ -294,63 +292,19 @@ public class Bridge {
 
     @SuppressLint("WebViewApiAvailability")
     public boolean isMinimumWebViewInstalled() {
-        PackageManager pm = getContext().getPackageManager();
-
-        // Check getCurrentWebViewPackage() directly if above Android 8
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            PackageInfo info = WebView.getCurrentWebViewPackage();
-            Pattern pattern = Pattern.compile("(\\d+)");
-            Matcher matcher = pattern.matcher(info.versionName);
-            if (matcher.find()) {
-                String majorVersionStr = matcher.group(0);
-                int majorVersion = Integer.parseInt(majorVersionStr);
-                if (info.packageName.equals("com.huawei.webview")) {
-                    return majorVersion >= config.getMinHuaweiWebViewVersion();
-                }
-                return majorVersion >= config.getMinWebViewVersion();
-            } else {
-                return false;
-            }
-        }
-
-        // Otherwise manually check WebView versions
-        try {
-            PackageInfo info = InternalUtils.getPackageInfo(pm, "com.android.chrome");
-            String majorVersionStr = info.versionName.split("\\.")[0];
-            int majorVersion = Integer.parseInt(majorVersionStr);
-            return majorVersion >= config.getMinWebViewVersion();
-        } catch (Exception ex) {
-            Logger.warn("Unable to get package info for 'com.google.android.webview'" + ex.toString());
-        }
-
-        try {
-            PackageInfo info = InternalUtils.getPackageInfo(pm, "com.android.webview");
-            String majorVersionStr = info.versionName.split("\\.")[0];
+        PackageInfo info = WebView.getCurrentWebViewPackage();
+        Pattern pattern = Pattern.compile("(\\d+)");
+        Matcher matcher = pattern.matcher(info.versionName);
+        if (matcher.find()) {
+            String majorVersionStr = matcher.group(0);
             int majorVersion = Integer.parseInt(majorVersionStr);
+            if (info.packageName.equals("com.huawei.webview")) {
+                return majorVersion >= config.getMinHuaweiWebViewVersion();
+            }
             return majorVersion >= config.getMinWebViewVersion();
-        } catch (Exception ex) {
-            Logger.warn("Unable to get package info for 'com.android.webview'" + ex.toString());
-        }
-
-        final int amazonFireMajorWebViewVersion = extractWebViewMajorVersion(pm, "com.amazon.webview.chromium");
-        if (amazonFireMajorWebViewVersion >= config.getMinWebViewVersion()) {
-            return true;
-        }
-
-        // Could not detect any webview, return false
-        return false;
-    }
-
-    private int extractWebViewMajorVersion(final PackageManager pm, final String webViewPackageName) {
-        try {
-            final PackageInfo info = InternalUtils.getPackageInfo(pm, webViewPackageName);
-            final String majorVersionStr = info.versionName.split("\\.")[0];
-            final int majorVersion = Integer.parseInt(majorVersionStr);
-            return majorVersion;
-        } catch (Exception ex) {
-            Logger.warn(String.format("Unable to get package info for '%s' with err '%s'", webViewPackageName, ex));
+        } else {
+            return false;
         }
-        return 0;
     }
 
     public boolean launchIntent(Uri url) {

package/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java

@@ -282,7 +282,7 @@ public class BridgeWebChromeClient extends WebChromeClient {
         boolean captureEnabled = fileChooserParams.isCaptureEnabled();
         boolean capturePhoto = captureEnabled && acceptTypes.contains("image/*");
         final boolean captureVideo = captureEnabled && acceptTypes.contains("video/*");
-        if ((capturePhoto || captureVideo)) {
+        if (capturePhoto || captureVideo) {
             if (isMediaCaptureSupported()) {
                 showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo);
             } else {
@@ -447,7 +447,7 @@ public class BridgeWebChromeClient extends WebChromeClient {
     }
 
     public boolean isValidMsg(String msg) {
-        return !(msg.contains("%cresult %c") || (msg.contains("%cnative %c")) || msg.equalsIgnoreCase("console.groupEnd"));
+        return !(msg.contains("%cresult %c") || msg.contains("%cnative %c") || msg.equalsIgnoreCase("console.groupEnd"));
     }
 
     private Uri createImageFileUri() throws IOException {

package/capacitor/src/main/java/com/getcapacitor/FileUtils.java

@@ -218,7 +218,7 @@ public class FileUtils {
         Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
         int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
         cursor.moveToFirst();
-        String name = (cursor.getString(nameIndex));
+        String name = cursor.getString(nameIndex);
         String fileName = sanitizeFilename(name);
         File file = new File(context.getFilesDir(), fileName);
         try {

package/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java

@@ -208,7 +208,7 @@ public class WebViewLocalServer {
     }
 
     private boolean isMainUrl(Uri loadingUrl) {
-        return (bridge.getServerUrl() == null && loadingUrl.getHost().equalsIgnoreCase(bridge.getHost()));
+        return bridge.getServerUrl() == null && loadingUrl.getHost().equalsIgnoreCase(bridge.getHost());
     }
 
     private boolean isAllowedUrl(Uri loadingUrl) {
@@ -709,31 +709,31 @@ public class WebViewLocalServer {
         @Override
         public int available() throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.available() : -1;
+            return is != null ? is.available() : -1;
         }
 
         @Override
         public int read() throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.read() : -1;
+            return is != null ? is.read() : -1;
         }
 
         @Override
         public int read(byte[] b) throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.read(b) : -1;
+            return is != null ? is.read(b) : -1;
         }
 
         @Override
         public int read(byte[] b, int off, int len) throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.read(b, off, len) : -1;
+            return is != null ? is.read(b, off, len) : -1;
         }
 
         @Override
         public long skip(long n) throws IOException {
             InputStream is = getInputStream();
-            return (is != null) ? is.skip(n) : 0;
+            return is != null ? is.skip(n) : 0;
         }
     }
 

package/capacitor/src/main/java/com/getcapacitor/plugin/CapacitorCookieManager.java

@@ -192,12 +192,12 @@ public class CapacitorCookieManager extends CookieManager {
     @Override
     public void put(URI uri, Map<String, List<String>> responseHeaders) {
         // make sure our args are valid
-        if ((uri == null) || (responseHeaders == null)) return;
+        if (uri == null || responseHeaders == null) return;
 
         // go over the headers
         for (String headerKey : responseHeaders.keySet()) {
             // ignore headers which aren't cookie related
-            if ((headerKey == null) || !(headerKey.equalsIgnoreCase("Set-Cookie2") || headerKey.equalsIgnoreCase("Set-Cookie"))) continue;
+            if (headerKey == null || !(headerKey.equalsIgnoreCase("Set-Cookie2") || headerKey.equalsIgnoreCase("Set-Cookie"))) continue;
 
             // process each of the headers
             for (String headerValue : Objects.requireNonNull(responseHeaders.get(headerKey))) {
@@ -215,7 +215,7 @@ public class CapacitorCookieManager extends CookieManager {
     @Override
     public Map<String, List<String>> get(URI uri, Map<String, List<String>> requestHeaders) {
         // make sure our args are valid
-        if ((uri == null) || (requestHeaders == null)) throw new IllegalArgumentException("Argument is null");
+        if (uri == null || requestHeaders == null) throw new IllegalArgumentException("Argument is null");
 
         // save our url once
         String url = uri.toString();

package/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java

@@ -1,6 +1,5 @@
 package com.getcapacitor.plugin.util;
 
-import android.os.Build;
 import android.os.LocaleList;
 import android.text.TextUtils;
 import com.getcapacitor.Bridge;
@@ -211,9 +210,7 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
             this.writeRequestBody(dataString != null ? dataString : "");
         } else if (bodyType != null && bodyType.equals("file")) {
             try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    os.write(Base64.getDecoder().decode(body.toString()));
-                }
+                os.write(Base64.getDecoder().decode(body.toString()));
                 os.flush();
             }
         } else if (contentType.contains("application/x-www-form-urlencoded")) {
@@ -295,13 +292,7 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
                         os.writeBytes("Content-Type: " + fileContentType + lineEnd);
                         os.writeBytes("Content-Transfer-Encoding: binary" + lineEnd);
                         os.writeBytes(lineEnd);
-
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                            os.write(Base64.getDecoder().decode(value));
-                        } else {
-                            os.write(android.util.Base64.decode(value, android.util.Base64.DEFAULT));
-                        }
-
+                        os.write(Base64.getDecoder().decode(value));
                         os.writeBytes(lineEnd);
                     }
                 }

package/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java

@@ -168,8 +168,8 @@ public class HttpRequestHandler {
                 "://" +
                 uri.getAuthority() +
                 uri.getPath() +
-                ((!urlQuery.equals("")) ? "?" + urlQuery : "") +
-                ((uri.getFragment() != null) ? uri.getFragment() : "");
+                (!urlQuery.equals("") ? "?" + urlQuery : "") +
+                (uri.getFragment() != null ? uri.getFragment() : "");
             this.url = new URL(unEncodedUrlString);
 
             return this;

package/capacitor-cordova/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath 'com.android.tools.build:gradle:9.2.1'
     }
 }
 
@@ -17,10 +17,9 @@ apply plugin: 'com.android.library'
 
 android {
     namespace = "com.getcapacitor.cordova"
-    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 37
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26
         versionCode 1
         versionName "1.0"
         consumerProguardFiles 'proguard-rules.pro'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "9.0.0-alpha.3",
+  "version": "9.0.0-alpha.5",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,10 +23,10 @@
     "capacitor-cordova/src/main/"
   ],
   "scripts": {
-    "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
+    "verify": "./gradlew :capacitor-android:clean :capacitor-android:lint :capacitor-android:build :capacitor-android:test"
   },
   "peerDependencies": {
-    "@capacitor/core": "^9.0.0-alpha.3"
+    "@capacitor/core": "^9.0.0-alpha.5"
   },
   "publishConfig": {
     "access": "public"