From 07f7b71e4d8e1634be308d3ed801b547808207ac Mon Sep 17 00:00:00 2001 From: GothwadTech <295316515+GothwadTech@users.noreply.github.com> Date: Sun, 18 Oct 2026 06:33:10 +0000 Subject: [PATCH] fix: sync Android app with Kiwi Store domains Co-authored-by: arena-agent <297053741+arena-agent@users.noreply.github.com> --- README.md | 2 +- app/build.gradle.kts | 8 ++++---- .../com/gothwad/store/ui/screens/AccountScreens.kt | 4 ++-- .../java/com/gothwad/store/ui/screens/HomeScreen.kt | 2 +- .../java/com/gothwad/store/ui/screens/MiscScreens.kt | 10 +++++----- .../com/gothwad/store/ui/screens/SettingsScreens.kt | 4 ++-- .../test/java/com/gothwad/store/CatalogModelsTest.kt | 6 +++--- .../test/java/com/gothwad/store/InstallActionTest.kt | 2 +- scripts/ci/check-store-api.py | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e8c3b9e..b046288 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Gradle 9.3.1 wrapper. Android 7.0 / API 24 is the minimum device version. # APK: app/build/outputs/apk/debug/app-debug.apk ``` -Default API: `https://store.gothwadtech.com/api/`. For an HTTPS staging Worker: +Default API: `https://kiwistore.gothwadtech.com/api/`. For an HTTPS staging Worker: ```sh ./gradlew assembleDebug -PSTORE_API_BASE_URL=https://your-staging-host/api/ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5583fa4..bf16417 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -31,13 +31,13 @@ android { require(it.matches(Regex("[0-9][0-9A-Za-z.+_-]{0,63}"))) { "Invalid versionName" } } - buildConfigField("String", "STORE_API_BASE_URL", "\"${httpsProperty("STORE_API_BASE_URL", "https://store.gothwadtech.com/api/")}\"") - buildConfigField("String", "CONSOLE_URL", "\"${httpsProperty("CONSOLE_URL", "https://console.gothwadtech.com/")}\"") - buildConfigField("String", "STORE_WEB_URL", "\"${httpsProperty("STORE_WEB_URL", "https://store.gothwadtech.com/")}\"") + buildConfigField("String", "STORE_API_BASE_URL", "\"${httpsProperty("STORE_API_BASE_URL", "https://kiwistore.gothwadtech.com/api/")}\"") + buildConfigField("String", "CONSOLE_URL", "\"${httpsProperty("CONSOLE_URL", "https://kiwiconsole.gothwadtech.com/")}\"") + buildConfigField("String", "STORE_WEB_URL", "\"${httpsProperty("STORE_WEB_URL", "https://kiwistore.gothwadtech.com/")}\"") buildConfigField("String", "ACCOUNTS_API_BASE_URL", "\"${httpsProperty("ACCOUNTS_API_BASE_URL", "https://accounts.gothwadtech.com/api/")}\"") buildConfigField("String", "ACCOUNTS_SIGNIN_URL", "\"${httpsProperty("ACCOUNTS_SIGNIN_URL", "https://accounts.gothwadtech.com/")}\"") buildConfigField("String", "SHIZUKU_DOWNLOAD_URL", "\"${httpsProperty("SHIZUKU_DOWNLOAD_URL", "https://shizuku.rikka.app/")}\"") - buildConfigField("String", "OAUTH_CLIENT_ID", "\"${providers.gradleProperty("OAUTH_CLIENT_ID").orElse("gothwad-store").get()}\"") + buildConfigField("String", "OAUTH_CLIENT_ID", "\"${providers.gradleProperty("OAUTH_CLIENT_ID").orElse("kiwi-store").get()}\"") buildConfigField("String", "OAUTH_REDIRECT_URI", "\"gothwadstore://oauth/callback\"") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/gothwad/store/ui/screens/AccountScreens.kt b/app/src/main/java/com/gothwad/store/ui/screens/AccountScreens.kt index 00cafd6..2a20d66 100644 --- a/app/src/main/java/com/gothwad/store/ui/screens/AccountScreens.kt +++ b/app/src/main/java/com/gothwad/store/ui/screens/AccountScreens.kt @@ -211,7 +211,7 @@ fun AccountScreen(vm: StoreViewModel, nav: NavController) { ) SettingRow( title = "Developer Console", - subtitle = "Publish and manage your own apps at console.gothwadtech.com", + subtitle = "Publish and manage your own apps at kiwiconsole.gothwadtech.com", icon = Icons.Filled.Dashboard, onClick = { nav.navigate(Routes.DEVELOPER_CONSOLE) }, trailingText = "Open", @@ -637,7 +637,7 @@ fun AccountDetailsScreen(vm: StoreViewModel, nav: NavController) { ) SettingRow( title = "Developer Console", - subtitle = "console.gothwadtech.com", + subtitle = "kiwiconsole.gothwadtech.com", onClick = { nav.navigate(Routes.DEVELOPER_CONSOLE) }, ) SettingRow( diff --git a/app/src/main/java/com/gothwad/store/ui/screens/HomeScreen.kt b/app/src/main/java/com/gothwad/store/ui/screens/HomeScreen.kt index 0e8d4f4..45471d2 100644 --- a/app/src/main/java/com/gothwad/store/ui/screens/HomeScreen.kt +++ b/app/src/main/java/com/gothwad/store/ui/screens/HomeScreen.kt @@ -277,7 +277,7 @@ private fun HomeContent( Column(Modifier.padding(Spacing.screenH)) { DividerLine() Text( - "Live catalogue · store.gothwadtech.com", + "Live catalogue · kiwistore.gothwadtech.com", modifier = Modifier.padding(top = 14.dp), style = MaterialTheme.typography.bodySmall, color = GothwadTheme.extra.textTertiary, diff --git a/app/src/main/java/com/gothwad/store/ui/screens/MiscScreens.kt b/app/src/main/java/com/gothwad/store/ui/screens/MiscScreens.kt index f5da760..22e0126 100644 --- a/app/src/main/java/com/gothwad/store/ui/screens/MiscScreens.kt +++ b/app/src/main/java/com/gothwad/store/ui/screens/MiscScreens.kt @@ -66,7 +66,7 @@ private fun openUrl(context: android.content.Context, url: String, onFail: (Stri if (!ok) onFail("No browser is available to open $url") } -/** console.gothwadtech.com bridge — publishers manage releases there. */ +/** kiwiconsole.gothwadtech.com bridge — publishers manage releases there. */ @Composable fun DeveloperConsoleScreen(vm: StoreViewModel, nav: NavController) { val context = LocalContext.current @@ -86,7 +86,7 @@ fun DeveloperConsoleScreen(vm: StoreViewModel, nav: NavController) { Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp)) { BrandAvatar(text = "GC", size = 46.dp) Column { - Text("console.gothwadtech.com", fontSize = 16.sp, fontWeight = FontWeight.SemiBold) + Text("kiwiconsole.gothwadtech.com", fontSize = 16.sp, fontWeight = FontWeight.SemiBold) Text( "Upload APKs, write listing copy and follow the review queue", fontSize = 12.sp, @@ -228,7 +228,7 @@ fun AboutScreen(vm: StoreViewModel, nav: NavController) { InfoBanner( title = "Live data only", message = "Listings, releases and reviews come from the Gothwad Worker " + - "(store.gothwadtech.com/api). There is no bundled demo catalogue.", + "(kiwistore.gothwadtech.com/api). There is no bundled demo catalogue.", ) } } @@ -253,12 +253,12 @@ fun AboutScreen(vm: StoreViewModel, nav: NavController) { ) SettingRow( title = "Terms of service", - subtitle = "store.gothwadtech.com/terms", + subtitle = "kiwistore.gothwadtech.com/terms", onClick = { openUrl(context, "${BuildConfig.STORE_WEB_URL}terms") { vm.emit(StoreEvent.Message(it)) } }, ) SettingRow( title = "Privacy policy", - subtitle = "store.gothwadtech.com/privacy", + subtitle = "kiwistore.gothwadtech.com/privacy", icon = Icons.Filled.PrivacyTip, onClick = { openUrl(context, "${BuildConfig.STORE_WEB_URL}privacy") { vm.emit(StoreEvent.Message(it)) } }, ) diff --git a/app/src/main/java/com/gothwad/store/ui/screens/SettingsScreens.kt b/app/src/main/java/com/gothwad/store/ui/screens/SettingsScreens.kt index 9fbe72d..f5a49fa 100644 --- a/app/src/main/java/com/gothwad/store/ui/screens/SettingsScreens.kt +++ b/app/src/main/java/com/gothwad/store/ui/screens/SettingsScreens.kt @@ -496,7 +496,7 @@ fun PrivacyScreen(vm: StoreViewModel, nav: NavController) { item { InfoBanner( title = "No trackers, no analytics SDKs", - message = "Kiwi Store talks to two hosts: store.gothwadtech.com (catalogue, downloads, " + + message = "Kiwi Store talks to two hosts: kiwistore.gothwadtech.com (catalogue, downloads, " + "reviews) and accounts.gothwadtech.com (sign-in). Everything else is on-device.", ) } @@ -558,7 +558,7 @@ fun PrivacyScreen(vm: StoreViewModel, nav: NavController) { Column(Modifier.padding(Spacing.screenH)) { Spacer(Modifier.height(10.dp)) Text( - "Full policy: store.gothwadtech.com/privacy", + "Full policy: kiwistore.gothwadtech.com/privacy", fontSize = 12.sp, color = GothwadTheme.extra.textTertiary, ) diff --git a/app/src/test/java/com/gothwad/store/CatalogModelsTest.kt b/app/src/test/java/com/gothwad/store/CatalogModelsTest.kt index 5f2656a..666a630 100644 --- a/app/src/test/java/com/gothwad/store/CatalogModelsTest.kt +++ b/app/src/test/java/com/gothwad/store/CatalogModelsTest.kt @@ -160,15 +160,15 @@ class CatalogModelsTest { @Test fun `release urls resolve against the api origin`() { assertEquals( - "https://store.gothwadtech.com/api/download/rel-519dd30f-c4ec-4f28-972a-2ff60437e2bd", + "https://kiwistore.gothwadtech.com/api/download/rel-519dd30f-c4ec-4f28-972a-2ff60437e2bd", StoreNetwork.downloadUrl("rel-519dd30f-c4ec-4f28-972a-2ff60437e2bd"), ) assertEquals( - "https://store.gothwadtech.com/api/download/rel-1", + "https://kiwistore.gothwadtech.com/api/download/rel-1", StoreNetwork.absoluteUrl("/api/download/rel-1"), ) assertEquals( - "https://store.gothwadtech.com/api/download/rel-1", + "https://kiwistore.gothwadtech.com/api/download/rel-1", StoreNetwork.absoluteUrl("download/rel-1"), ) assertEquals( diff --git a/app/src/test/java/com/gothwad/store/InstallActionTest.kt b/app/src/test/java/com/gothwad/store/InstallActionTest.kt index b01d24f..76c2778 100644 --- a/app/src/test/java/com/gothwad/store/InstallActionTest.kt +++ b/app/src/test/java/com/gothwad/store/InstallActionTest.kt @@ -23,7 +23,7 @@ class InstallActionTest { appId = "app-1", versionCode = versionCode, versionName = "1.0.$versionCode", - apkUrl = "https://store.gothwadtech.com/api/download/rel-$versionCode", + apkUrl = "https://kiwistore.gothwadtech.com/api/download/rel-$versionCode", apkSizeBytes = 4_274_549, apkSha256 = "cc08fc96d2c386679d4be4058610e8924d206f5976eedbd1bfe7921e7ce423f0", minSdk = minSdk, diff --git a/scripts/ci/check-store-api.py b/scripts/ci/check-store-api.py index bba95a9..c9a5c7f 100644 --- a/scripts/ci/check-store-api.py +++ b/scripts/ci/check-store-api.py @@ -5,7 +5,7 @@ import urllib.parse import urllib.request -BASE = 'https://store.gothwadtech.com/api/' +BASE = 'https://kiwistore.gothwadtech.com/api/' def read(path): req = urllib.request.Request(BASE + path, headers={'Accept': 'application/json', 'User-Agent': 'KiwiStore-CI/1.0'})