From 91213c70768744b4efc978e04acc13be6eb18435 Mon Sep 17 00:00:00 2001 From: Thomas Heigl Date: Wed, 15 Oct 2025 19:02:39 +0200 Subject: [PATCH] #8182 Add missing null checks in `BridgeActivity` --- .../main/java/com/getcapacitor/BridgeActivity.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/android/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java b/android/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java index c3779a548..194bbb1ec 100644 --- a/android/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java +++ b/android/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java @@ -66,7 +66,9 @@ public Bridge getBridge() { @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - bridge.saveInstanceState(outState); + if (bridge != null) { + bridge.saveInstanceState(outState); + } } @Override @@ -82,8 +84,10 @@ public void onStart() { @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 void onDestroy() { @Override public void onDetachedFromWindow() { super.onDetachedFromWindow(); - this.bridge.onDetachedFromWindow(); + if (this.bridge != null) { + this.bridge.onDetachedFromWindow(); + } } /**