Skip to content

Commit fae0190

Browse files
committed
Register the ReactActivity back callback on Android 13+ for apps targeting SDK 36
1 parent 880b108 commit fae0190

2 files changed

Lines changed: 82 additions & 1 deletion

File tree

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import android.content.Intent;
1111
import android.content.res.Configuration;
12+
import android.os.Build;
1213
import android.os.Bundle;
1314
import android.view.KeyEvent;
1415
import androidx.activity.OnBackPressedCallback;
@@ -60,7 +61,11 @@ protected ReactActivityDelegate createReactActivityDelegate() {
6061
protected void onCreate(Bundle savedInstanceState) {
6162
super.onCreate(savedInstanceState);
6263
mDelegate.onCreate(savedInstanceState);
63-
if (AndroidVersion.isAtLeastTargetSdk36(this)) {
64+
// From API 33, an app that sets android:enableOnBackInvokedCallback="true" receives Back
65+
// through OnBackInvokedDispatcher, and onBackPressed() is not called. Register the callback
66+
// on API 33+ so that BackHandler keeps working there, not only on API 36+.
67+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
68+
&& getApplicationInfo().targetSdkVersion >= AndroidVersion.VERSION_CODE_BAKLAVA) {
6469
getOnBackPressedDispatcher().addCallback(this, mBackPressedCallback);
6570
}
6671
}
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
package com.facebook.react
9+
10+
import android.os.Bundle
11+
import org.assertj.core.api.Assertions.assertThat
12+
import org.junit.Test
13+
import org.junit.runner.RunWith
14+
import org.robolectric.Robolectric
15+
import org.robolectric.RobolectricTestRunner
16+
import org.robolectric.RuntimeEnvironment
17+
import org.robolectric.annotation.Config
18+
19+
@RunWith(RobolectricTestRunner::class)
20+
class ReactActivityBackCallbackTest {
21+
22+
@Test
23+
@Config(sdk = [33, 34, 35])
24+
fun targetSdk36_backFromDispatcher_reachesReactDelegate() {
25+
val activity = createActivity(targetSdkVersion = 36, handledByJs = true)
26+
27+
assertThat(activity.onBackPressedDispatcher.hasEnabledCallbacks()).isTrue()
28+
29+
activity.onBackPressedDispatcher.onBackPressed()
30+
31+
assertThat(activity.delegatedBackPressCount).isEqualTo(1)
32+
assertThat(activity.isFinishing).isFalse()
33+
assertThat(activity.onBackPressedDispatcher.hasEnabledCallbacks()).isTrue()
34+
}
35+
36+
@Test
37+
@Config(sdk = [33, 34, 35])
38+
fun targetSdk36_backNotHandledByJs_finishesActivity() {
39+
val activity = createActivity(targetSdkVersion = 36, handledByJs = false)
40+
41+
activity.onBackPressedDispatcher.onBackPressed()
42+
43+
assertThat(activity.delegatedBackPressCount).isEqualTo(1)
44+
assertThat(activity.isFinishing).isTrue()
45+
}
46+
47+
@Test
48+
@Config(sdk = [33, 35])
49+
fun targetSdk35_doesNotRegisterCallback() {
50+
val activity = createActivity(targetSdkVersion = 35, handledByJs = true)
51+
52+
assertThat(activity.onBackPressedDispatcher.hasEnabledCallbacks()).isFalse()
53+
}
54+
55+
private fun createActivity(targetSdkVersion: Int, handledByJs: Boolean): TestReactActivity {
56+
RuntimeEnvironment.getApplication().applicationInfo.targetSdkVersion = targetSdkVersion
57+
val activity = Robolectric.buildActivity(TestReactActivity::class.java).create().start().get()
58+
activity.handledByJs = handledByJs
59+
return activity
60+
}
61+
62+
class TestReactActivity : ReactActivity() {
63+
var delegatedBackPressCount: Int = 0
64+
var handledByJs: Boolean = true
65+
66+
override fun createReactActivityDelegate(): ReactActivityDelegate =
67+
object : ReactActivityDelegate(this, "Test") {
68+
override fun onCreate(savedInstanceState: Bundle?) = Unit
69+
70+
override fun onBackPressed(): Boolean {
71+
delegatedBackPressCount++
72+
return handledByJs
73+
}
74+
}
75+
}
76+
}

0 commit comments

Comments
 (0)