Update Group Chat to Use Dev (#173)

* update the links in android * try to fix releases * point to dev * update the links to correctly access the ports * a few small tweaks
xmtp · Feb 6, 2024 · 165f2b2 · 165f2b2
1 parent 1180190
commit 165f2b2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,6 +13,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Configure JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: '17'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
       - name: Run build with Gradle Wrapper

diff --git a/example/src/main/java/org/xmtp/android/example/ClientManager.kt b/example/src/main/java/org/xmtp/android/example/ClientManager.kt
@@ -18,9 +18,9 @@ object ClientManager {
     fun clientOptions(appContext: Context?): ClientOptions {
         return ClientOptions(
             api = ClientOptions.Api(
-                XMTPEnvironment.LOCAL,
+                XMTPEnvironment.DEV,
                 appVersion = "XMTPAndroidExample/v1.0.0",
-                isSecure = false
+                isSecure = true
             ),
             enableAlphaMls = true,
             appContext = appContext

diff --git a/library/src/main/java/org/xmtp/android/library/ApiClient.kt b/library/src/main/java/org/xmtp/android/library/ApiClient.kt
@@ -91,7 +91,7 @@ data class GRPCApiClient(
     private val channel: ManagedChannel =
         Grpc.newChannelBuilderForAddress(
             environment.getValue(),
-            5556,
+            if (environment == XMTPEnvironment.LOCAL) 5556 else 443,
             if (secure) {
                 TlsChannelCredentials.create()
             } else {

diff --git a/library/src/main/java/org/xmtp/android/library/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt
@@ -279,7 +279,7 @@ class Client() {
     }
 
     private fun isAlphaMlsEnabled(options: ClientOptions?): Boolean {
-        return (options != null && options.enableAlphaMls && options.api.env == XMTPEnvironment.LOCAL && options.appContext != null)
+        return (options != null && options.enableAlphaMls && options.api.env != XMTPEnvironment.PRODUCTION && options.appContext != null)
     }
 
     private suspend fun ffiXmtpClient(
@@ -324,8 +324,8 @@ class Client() {
 
                 createClient(
                     logger = logger,
-                    host = "http://${options.api.env.getValue()}:5556",
-                    isSecure = false,
+                    host = if (options.api.env == XMTPEnvironment.LOCAL) "http://${options.api.env.getValue()}:5556" else "https://${options.api.env.getValue()}:443",
+                    isSecure = options.api.isSecure,
                     db = dbPath,
                     encryptionKey = retrievedKey.encoded,
                     accountAddress = accountAddress,

diff --git a/library/src/main/java/org/xmtp/android/library/XMTPEnvironment.kt b/library/src/main/java/org/xmtp/android/library/XMTPEnvironment.kt
@@ -1,8 +1,8 @@
 package org.xmtp.android.library
 
 enum class XMTPEnvironment(val rawValue: String) {
-    DEV("dev.xmtp.network"),
-    PRODUCTION("production.xmtp.network"),
+    DEV("grpc.dev.xmtp.network"),
+    PRODUCTION("grpc.production.xmtp.network"),
     LOCAL("10.0.2.2") {
         override fun withValue(value: String): XMTPEnvironment {
             return LOCAL.apply { customValue = value }

diff --git a/library/src/main/java/org/xmtp/android/library/push/README.md b/library/src/main/java/org/xmtp/android/library/push/README.md
@@ -35,7 +35,7 @@ This example branch can serve as the basis for what you might want to provide fo
     --xmtp-listener-tls \
     --xmtp-listener \
     --api \
-    -x "production.xmtp.network:5556" \
+    -x "grpc.production.xmtp.network:443:5556" \
     -d "postgres://postgres:xmtp@localhost:25432/postgres?sslmode=disable" \
     --fcm-enabled \
     --fcm-credentials-json=YOURFCMJSON \