@capacitor/android 7.4.5 → 7.6.0

package/capacitor/build.gradle

@@ -54,7 +54,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     lintOptions {

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

@@ -66,7 +66,9 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        bridge.saveInstanceState(outState);
+        if (bridge != null) {
+            bridge.saveInstanceState(outState);
+        }
     }
 
     @Override
@@ -82,8 +84,10 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onRestart() {
         super.onRestart();
-        this.bridge.onRestart();
-        Logger.debug("App restarted");
+        if (this.bridge != null) {
+            this.bridge.onRestart();
+            Logger.debug("App restarted");
+        }
     }
 
     @Override
@@ -131,7 +135,9 @@ public class BridgeActivity extends AppCompatActivity {
     @Override
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        this.bridge.onDetachedFromWindow();
+        if (this.bridge != null) {
+            this.bridge.onDetachedFromWindow();
+        }
     }
 
     /**

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

@@ -128,9 +128,22 @@ public class WebViewLocalServer {
             return reasonPhrase;
         }
 
+        /**
+         * @deprecated This method may return incorrect headers in concurrent range requests.
+         * <p>
+         * Use {@link #buildDefaultResponseHeaders()} instead, which returns a copy of the map.
+         * </p>
+         * This method will be removed in a future major version of Capacitor.
+         * </p>
+         */
+        @Deprecated(forRemoval = true) // adjust version as appropriate
         public Map<String, String> getResponseHeaders() {
             return responseHeaders;
         }
+
+        public Map<String, String> buildDefaultResponseHeaders() {
+            return new HashMap<>(responseHeaders);
+        }
     }
 
     WebViewLocalServer(Context context, Bridge bridge, JSInjector jsInjector, ArrayList<String> authorities, boolean html5mode) {
@@ -326,14 +339,16 @@ public class WebViewLocalServer {
     private WebResourceResponse handleLocalRequest(WebResourceRequest request, PathHandler handler) {
         String path = request.getUrl().getPath();
 
-        if (request.getRequestHeaders().get("Range") != null) {
+        Map<String, String> requestHeaders = request.getRequestHeaders();
+        String rangeString = requestHeaders.get("Range") != null ? requestHeaders.get("Range") : requestHeaders.get("range");
+
+        if (rangeString != null) {
             InputStream responseStream = new LollipopLazyInputStream(handler, request);
             String mimeType = getMimeType(path, responseStream);
-            Map<String, String> tempResponseHeaders = handler.getResponseHeaders();
+            Map<String, String> tempResponseHeaders = handler.buildDefaultResponseHeaders();
             int statusCode = 206;
             try {
                 int totalRange = responseStream.available();
-                String rangeString = request.getRequestHeaders().get("Range");
                 String[] parts = rangeString.split("=");
                 String[] streamParts = parts[1].split("-");
                 String fromRange = streamParts[0];
@@ -365,7 +380,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -376,7 +391,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 handler.getStatusCode(),
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 null
             );
         }
@@ -411,7 +426,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -442,7 +457,7 @@ public class WebViewLocalServer {
                 handler.getEncoding(),
                 statusCode,
                 handler.getReasonPhrase(),
-                handler.getResponseHeaders(),
+                handler.buildDefaultResponseHeaders(),
                 responseStream
             );
         }
@@ -517,7 +532,7 @@ public class WebViewLocalServer {
                             handler.getEncoding(),
                             handler.getStatusCode(),
                             handler.getReasonPhrase(),
-                            handler.getResponseHeaders(),
+                            handler.buildDefaultResponseHeaders(),
                             responseStream
                         );
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "7.4.5",
+  "version": "7.6.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,7 +23,7 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^7.4.0"
+    "@capacitor/core": "^7.6.0"
   },
   "publishConfig": {
     "access": "public"