Skip to content

Commit c99e3a8

Browse files
Abbondanzofacebook-github-bot
authored andcommitted
Remove packager settings preference on empty host information (facebook#49848)
Summary: Pull Request resolved: facebook#49848 Adds a new method to reset the server host in PackageConnectionSettings to its default state rather than relying on providing a blank string Changelog: [Internal] Reviewed By: rshest Differential Revision: D70584220 fbshipit-source-id: 2862eee5f71bfe318da7199f2288367433d6f887
1 parent 88155fd commit c99e3a8

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3369,6 +3369,7 @@ public class com/facebook/react/packagerconnection/PackagerConnectionSettings {
33693369
public final fun getAdditionalOptionsForPackager ()Ljava/util/Map;
33703370
public fun getDebugServerHost ()Ljava/lang/String;
33713371
public final fun getPackageName ()Ljava/lang/String;
3372+
public fun resetDebugServerHost ()V
33723373
public final fun setAdditionalOptionForPackager (Ljava/lang/String;Ljava/lang/String;)V
33733374
public fun setDebugServerHost (Ljava/lang/String;)V
33743375
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
2626
// Check host setting first. If empty try to detect emulator type and use default
2727
// hostname for those
2828
val hostFromSettings = preferences.getString(PREFS_DEBUG_SERVER_HOST_KEY, null)
29-
if (hostFromSettings?.isNotEmpty() == true) {
29+
if (!hostFromSettings.isNullOrEmpty()) {
3030
return hostFromSettings
3131
}
3232
val host = AndroidInfoHelpers.getServerHost(appContext)
@@ -38,9 +38,17 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
3838
return host
3939
}
4040
set(host) {
41-
preferences.edit().putString(PREFS_DEBUG_SERVER_HOST_KEY, host).apply()
41+
if (host.isEmpty()) {
42+
preferences.edit().remove(PREFS_DEBUG_SERVER_HOST_KEY).apply()
43+
} else {
44+
preferences.edit().putString(PREFS_DEBUG_SERVER_HOST_KEY, host).apply()
45+
}
4246
}
4347

48+
public open fun resetDebugServerHost() {
49+
preferences.edit().remove(PREFS_DEBUG_SERVER_HOST_KEY).apply()
50+
}
51+
4452
public fun setAdditionalOptionForPackager(key: String, value: String) {
4553
_additionalOptionsForPackager[key] = value
4654
}

0 commit comments

Comments
 (0)