Skip to content

fix(android): Add missing null checks in BridgeActivity #8185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(android): Add missing null checks in BridgeActivity #8185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions android/capacitor/src/main/java/com/getcapacitor/BridgeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -131,7 +135,9 @@ public void onDestroy() {
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
this.bridge.onDetachedFromWindow();
if (this.bridge != null) {
this.bridge.onDetachedFromWindow();
}
}

/**
Expand Down