Skip to content

Fix Linking.openSettings() rejecting on Android when there is no current activity #59567

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
Nezz wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −3
Open

Fix Linking.openSettings() rejecting on Android when there is no current activity #59567

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions ...react-native/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

package com.facebook.react.modules.intent

import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.nfc.NfcAdapter
Expand Down Expand Up @@ -169,7 +168,7 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
override fun openSettings(promise: Promise) {
try {
val intent = Intent()
val currentActivity: Activity = checkNotNull(reactApplicationContext.getCurrentActivity())
val currentActivity = reactApplicationContext.getCurrentActivity()
val selfPackageName = reactApplicationContext.packageName

intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
Expand All @@ -178,7 +177,11 @@ public open class IntentModule(reactContext: ReactApplicationContext) :
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
currentActivity.startActivity(intent)
if (currentActivity != null) {
currentActivity.startActivity(intent)
} else {
reactApplicationContext.startActivity(intent)
}

promise.resolve(true)
} catch (e: Exception) {
Expand Down
17 changes: 17 additions & 0 deletions ...t-native/ReactAndroid/src/test/java/com/facebook/react/modules/intent/IntentModuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

package com.facebook.react.modules.intent

import android.content.Intent
import android.provider.Settings
import com.facebook.react.bridge.LifecycleEventListener
import com.facebook.react.bridge.Promise
import com.facebook.react.bridge.ReactApplicationContext
Expand Down Expand Up @@ -65,6 +67,21 @@ class IntentModuleTest {
assertThat(promise.rejected).isEqualTo(0)
}

@Test
fun openSettings_withNullActivity_startsSettingsFromApplicationContext() {
whenever(context.currentActivity).thenReturn(null)

val promise = SimplePromise()
intentModule.openSettings(promise)

val intentCaptor = argumentCaptor<Intent>()
verify(context).startActivity(intentCaptor.capture())
assertThat(intentCaptor.firstValue.action)
.isEqualTo(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
assertThat(promise.resolved).isEqualTo(1)
assertThat(promise.rejected).isEqualTo(0)
}

internal class SimplePromise : Promise {
companion object {
private const val ERROR_DEFAULT_CODE = "EUNSPECIFIED"
Expand Down
Loading