add back the env

Author: nplasterer

library/src/androidTest/java/org/xmtp/android/library/LocalInstrumentedTest.kt

@@ -72,7 +72,6 @@ class LocalInstrumentedTest {
         }
         val api = GRPCApiClient(
             environment = XMTPEnvironment.LOCAL,
-            secure = false,
             rustV2Client = v2Client
         )
         api.setAuthToken(authToken)
@@ -109,7 +108,6 @@ class LocalInstrumentedTest {
         }
         val api = GRPCApiClient(
             environment = XMTPEnvironment.LOCAL,
-            secure = false,
             rustV2Client = v2Client
         )
         api.setAuthToken(authToken)
@@ -777,7 +775,6 @@ class LocalInstrumentedTest {
         }
         val api = GRPCApiClient(
             environment = XMTPEnvironment.LOCAL,
-            secure = false,
             rustV2Client = v2Client
         )
         api.setAuthToken(authToken)

library/src/main/java/org/xmtp/android/library/ApiClient.kt

@@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit
 import kotlin.coroutines.cancellation.CancellationException
 
 interface ApiClient {
+    val environment: XMTPEnvironment
     fun setAuthToken(token: String)
     suspend fun query(
         topic: String,
@@ -57,6 +58,7 @@ interface ApiClient {
 }
 
 data class GRPCApiClient(
+    override val environment: XMTPEnvironment,
     val appVersion: String? = null,
     val rustV2Client: FfiV2ApiClient,
 ) :

library/src/main/java/org/xmtp/android/library/Client.kt

@@ -154,7 +154,7 @@ class Client() {
                 )
             }
             clientOptions.api.appVersion?.let { v2Client.setAppVersion(it) }
-            val api = GRPCApiClient(rustV2Client = v2Client)
+            val api = GRPCApiClient(environment = clientOptions.api.env, rustV2Client = v2Client)
             return runBlocking {
                 val topics = api.queryTopic(Topic.contact(peerAddress)).envelopesList
                 topics.isNotEmpty()
@@ -195,7 +195,7 @@ class Client() {
             )
         }
         clientOptions.api.appVersion?.let { v2Client.setAppVersion(it) }
-        val apiClient = GRPCApiClient(rustV2Client = v2Client)
+        val apiClient = GRPCApiClient(environment = clientOptions.api.env, rustV2Client = v2Client)
         val (v3Client, dbPath) = if (isAlphaMlsEnabled(options)) {
             runBlocking {
                 ffiXmtpClient(
@@ -231,7 +231,7 @@ class Client() {
             )
         }
         clientOptions.api.appVersion?.let { v2Client.setAppVersion(it) }
-        val apiClient = GRPCApiClient(rustV2Client = v2Client)
+        val apiClient = GRPCApiClient(environment = clientOptions.api.env, rustV2Client = v2Client)
         return create(
             account = account,
             apiClient = apiClient,
@@ -300,7 +300,7 @@ class Client() {
             )
         }
         newOptions.api.appVersion?.let { v2Client.setAppVersion(it) }
-        val apiClient = GRPCApiClient(rustV2Client = v2Client)
+        val apiClient = GRPCApiClient(environment = newOptions.api.env, rustV2Client = v2Client)
         val (v3Client, dbPath) = if (isAlphaMlsEnabled(options)) {
             runBlocking {
                 ffiXmtpClient(