From 863cbb6b792775c0622e23a88f35d864e94a8678 Mon Sep 17 00:00:00 2001 From: ltadeu6 Date: Mon, 25 May 2026 16:34:24 -0300 Subject: [PATCH] Externalize PUSH_GATEWAY_URL and clean up signing config - Move PUSH_GATEWAY_URL from hardcoded constant to BuildConfig field, read from PUSH_GATEWAY_URL env var at build time - Hardcode keyAlias="release" and remove storeType (PKCS12 is default), since these are fixed values in android-signing-env - Remove unused okhttp3.Interceptor import Co-Authored-By: Claude Sonnet 4.6 --- app/build.gradle.kts | 5 +++-- app/src/main/java/com/ltadeu6/matrix/matrix/MatrixSession.kt | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 26e07bd..ac3d8d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,13 +16,14 @@ android { targetSdk = 35 versionCode = 1 versionName = "0.1.0" + buildConfigField("String", "PUSH_GATEWAY_URL", + "\"${System.getenv("PUSH_GATEWAY_URL") ?: ""}\"") } signingConfigs { create("release") { storeFile = file(System.getenv("ANDROID_KEYSTORE_PATH") ?: "") - storeType = System.getenv("ANDROID_KEYSTORE_TYPE") ?: "PKCS12" - keyAlias = System.getenv("ANDROID_KEY_ALIAS") ?: "" + keyAlias = "release" storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD") ?: "" keyPassword = System.getenv("ANDROID_KEY_PASSWORD") ?: "" } diff --git a/app/src/main/java/com/ltadeu6/matrix/matrix/MatrixSession.kt b/app/src/main/java/com/ltadeu6/matrix/matrix/MatrixSession.kt index d412285..123b8f8 100644 --- a/app/src/main/java/com/ltadeu6/matrix/matrix/MatrixSession.kt +++ b/app/src/main/java/com/ltadeu6/matrix/matrix/MatrixSession.kt @@ -26,7 +26,6 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.Request import com.ltadeu6.matrix.BuildConfig -import okhttp3.Interceptor import retrofit2.Retrofit import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger @@ -1360,8 +1359,7 @@ class MatrixSession private constructor(private val appContext: Context) { companion object { private const val TAG = "MatrixCrypto" - /** Cloudflare Worker push gateway URL. */ - const val PUSH_GATEWAY_URL = "https://matrix-push-gateway.ltadeu6.workers.dev" + val PUSH_GATEWAY_URL: String get() = BuildConfig.PUSH_GATEWAY_URL @Volatile private var instance: MatrixSession? = null fun getInstance(context: Context): MatrixSession =