Don't crash if ApolloDebugServerInitializer is not run (e.g. in unit …

…tests) (#5484)
apollographql · Dec 15, 2023 · ed21a52 · ed21a52
1 parent 192b91e
commit ed21a52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...om/apollographql/apollo3/debugserver/internal/initializer/ApolloDebugServerInitializer.kt b/...om/apollographql/apollo3/debugserver/internal/initializer/ApolloDebugServerInitializer.kt
@@ -11,6 +11,6 @@ internal class ApolloDebugServerInitializer : Initializer<Unit> {
   override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
 
   companion object {
-    lateinit var packageName: String
+    var packageName: String? = null
   }
 }
diff --git a/...ndroidMain/kotlin/com/apollographql/apollo3/debugserver/internal/server/Server.android.kt b/...ndroidMain/kotlin/com/apollographql/apollo3/debugserver/internal/server/Server.android.kt
@@ -35,7 +35,8 @@ private class AndroidServer(
 
   override fun start() {
     if (localServerSocket != null) error("Already started")
-    val localServerSocket = LocalServerSocket("$SOCKET_NAME_PREFIX${ApolloDebugServerInitializer.packageName}")
+    val packageName = ApolloDebugServerInitializer.packageName ?: "unknown.${System.currentTimeMillis()}"
+    val localServerSocket = LocalServerSocket("$SOCKET_NAME_PREFIX$packageName")
     this.localServerSocket = localServerSocket
     coroutineScope.launch {
       while (true) {