Skip to content

Commit 6047d99

Browse files
committed
finish the activity when we fail init or null extras
* Prevent flicker or blocking, finish activity before returning early
1 parent 59fa734 commit 6047d99

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/activities/PermissionsActivity.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ class PermissionsActivity : Activity() {
2323
super.onCreate(savedInstanceState)
2424

2525
if (!OneSignal.initWithContext(this)) {
26+
finishActivity()
2627
return
2728
}
2829

2930
if (intent.extras == null) {
3031
// This should never happen, but extras is null in rare crash reports
32+
finishActivity()
3133
return
3234
}
3335

@@ -42,12 +44,16 @@ class PermissionsActivity : Activity() {
4244
handleBundleParams(intent.extras)
4345
}
4446

47+
private fun finishActivity() {
48+
finish()
49+
overridePendingTransition(R.anim.onesignal_fade_in, R.anim.onesignal_fade_out)
50+
}
51+
4552
private fun handleBundleParams(extras: Bundle?) {
4653
// https://github.com/OneSignal/OneSignal-Android-SDK/issues/30
4754
// Activity maybe invoked directly through automated testing, omit prompting on old Android versions.
4855
if (Build.VERSION.SDK_INT < 23) {
49-
finish()
50-
overridePendingTransition(R.anim.onesignal_fade_in, R.anim.onesignal_fade_out)
56+
finishActivity()
5157
return
5258
}
5359

@@ -132,8 +138,7 @@ class PermissionsActivity : Activity() {
132138
}, DELAY_TIME_CALLBACK_CALL.toLong())
133139
}
134140

135-
finish()
136-
overridePendingTransition(R.anim.onesignal_fade_in, R.anim.onesignal_fade_out)
141+
finishActivity()
137142
}
138143

139144
private fun shouldShowSettings(permission: String): Boolean {

0 commit comments

Comments
 (0)