From d1a850c918d8b8a87037c94ff569945ee97b6cea Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Tue, 6 Feb 2024 07:40:00 -0800 Subject: [PATCH 1/5] update the links in android --- .../src/main/java/org/xmtp/android/library/XMTPEnvironment.kt | 4 ++-- library/src/main/java/org/xmtp/android/library/push/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/org/xmtp/android/library/XMTPEnvironment.kt b/library/src/main/java/org/xmtp/android/library/XMTPEnvironment.kt index a24779d32..5e6e2994f 100644 --- 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:443"), + PRODUCTION("grpc.production.xmtp.network:443"), 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 index 2615fa406..5cd83806e 100644 --- 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 \ From cd0e256f236330ec9bf6c0fe4a33f9b28b08caee Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Tue, 6 Feb 2024 07:47:05 -0800 Subject: [PATCH 2/5] try to fix releases --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7165bf086..180e2dbf8 100644 --- 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 From 060c23486300a164230bdfb8a87d1bd32a195349 Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Tue, 6 Feb 2024 07:47:59 -0800 Subject: [PATCH 3/5] point to dev --- example/src/main/java/org/xmtp/android/example/ClientManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/src/main/java/org/xmtp/android/example/ClientManager.kt b/example/src/main/java/org/xmtp/android/example/ClientManager.kt index 77f89fc88..610d4398a 100644 --- a/example/src/main/java/org/xmtp/android/example/ClientManager.kt +++ b/example/src/main/java/org/xmtp/android/example/ClientManager.kt @@ -18,7 +18,7 @@ object ClientManager { fun clientOptions(appContext: Context?): ClientOptions { return ClientOptions( api = ClientOptions.Api( - XMTPEnvironment.LOCAL, + XMTPEnvironment.DEV, appVersion = "XMTPAndroidExample/v1.0.0", isSecure = false ), From ada12f463e70b85cc1bc8b8bc1a6cd7d2a515795 Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Tue, 6 Feb 2024 10:34:55 -0800 Subject: [PATCH 4/5] update the links to correctly access the ports --- library/src/main/java/org/xmtp/android/library/ApiClient.kt | 2 +- .../src/main/java/org/xmtp/android/library/XMTPEnvironment.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/org/xmtp/android/library/ApiClient.kt b/library/src/main/java/org/xmtp/android/library/ApiClient.kt index 1f4fc204d..19beca893 100644 --- 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/XMTPEnvironment.kt b/library/src/main/java/org/xmtp/android/library/XMTPEnvironment.kt index 5e6e2994f..f5bd4da95 100644 --- 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("grpc.dev.xmtp.network:443"), - PRODUCTION("grpc.production.xmtp.network:443"), + 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 } From 94994dadb7596613fa15becce5be9ce4974afabd Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Tue, 6 Feb 2024 10:46:10 -0800 Subject: [PATCH 5/5] a few small tweaks --- .../src/main/java/org/xmtp/android/example/ClientManager.kt | 2 +- library/src/main/java/org/xmtp/android/library/Client.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/src/main/java/org/xmtp/android/example/ClientManager.kt b/example/src/main/java/org/xmtp/android/example/ClientManager.kt index 610d4398a..84bfd63ae 100644 --- a/example/src/main/java/org/xmtp/android/example/ClientManager.kt +++ b/example/src/main/java/org/xmtp/android/example/ClientManager.kt @@ -20,7 +20,7 @@ object ClientManager { api = ClientOptions.Api( 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/Client.kt b/library/src/main/java/org/xmtp/android/library/Client.kt index cd14aeedc..8b0ef064b 100644 --- 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,