Fix: a rare NPE from PermissionViewModel #2504
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
One Line Summary
Fixed a rare NPE from
PermissionsViewModel.Details
Motivation
Fixed an NPE introduced in
5.4.0with the newPermissionsActivity+PermissionsViewModelflow for handling permission prompts. This refactor introduced a rare lifecycle edge case involving process death during a permission prompt.Edge Case Explain
adb).PermissionsActivityto deliveronRequestPermissionsResult.onCreateonly calledhandleBundleParams(...)whensavedInstanceState == null, the recreated activity did not re-runinitialize(...)on thePermissionsViewModel.permissionRequestTyperemainednull, butonRequestPermissionsResultstill executed and calledexecuteCallback(permissionRequestType!!)→ NPE.Scope
Two changes:
onCreate, removing thesavedInstanceState == nullguard.This is safe because
shouldRequestPermission()already prevents duplicate permission requests.permissionRequestTypebefore resolving the callback insidePermissionsViewModel.executeCallback(...).This provides defensive hardening if
onRequestPermissionsResultis invoked before initialization completes. This also acts as a safety net for any future lifecycle edge cases that might call onRequestPermissionsResult before initialization completes.Testing
Unit testing
Added a few test cases covering
PermissionsViewModel.onRequestPermissionsResult().Manual testing
Step to reproduce on emulator Pixel 9 API 35:
adb shell ps | grep com.onesignal.sdktestto find the app process ID, then runadb shell run-as com.onesignal.sdktest kill -9 xxxxx(replace xxxxx with the PID) to kill the app process.After the fix, no crash is thrown and the permission is granted correctly after restarting the app. No duplicate request on config change.
Affected code checklist
Checklist
Overview
Testing
Final pass
This change is