feat: send user settings on app foreground

bmc08gt · bmc08gt · commit 4dbd8e88b538 · 2026-03-20T16:15:32.000-04:00
locale (realistically languageTag), and region (currency code) - used for formatting appreciation push notifications

Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt
@@ -52,9 +52,6 @@ sealed interface MessageMetadata {
     @Serializable
     data object Unknown : MessageMetadata
 
-    @Serializable
-    data object WelcomeBonus : MessageMetadata
-
     @Serializable
     data object GaveCrypto : MessageMetadata
 
diff --git a/apps/flipcash/shared/permissions/src/main/kotlin/com/flipcash/app/permissions/CameraPermissionScreen.kt b/apps/flipcash/shared/permissions/src/main/kotlin/com/flipcash/app/permissions/CameraPermissionScreen.kt
diff --git a/apps/flipcash/shared/persistence/sources/src/main/kotlin/com/flipcash/app/persistence/sources/mapper/notifications/NotificationToEntityMapper.kt b/apps/flipcash/shared/persistence/sources/src/main/kotlin/com/flipcash/app/persistence/sources/mapper/notifications/NotificationToEntityMapper.kt
@@ -59,7 +59,6 @@ class MetadataMapper @Inject constructor(): Mapper<NotificationMetadata?, Messag
             NotificationMetadata.ReceivedCrypto -> MessageMetadata.ReceivedCrypto
             is NotificationMetadata.SentCrypto -> MessageMetadata.SentCrypto(from.creator, from.canCancel)
             NotificationMetadata.Unknown -> MessageMetadata.Unknown
-            NotificationMetadata.WelcomeBonus -> MessageMetadata.WelcomeBonus
             NotificationMetadata.WithdrewCrypto -> MessageMetadata.WithdrewCrypto
             NotificationMetadata.DepositedCrypto -> MessageMetadata.DepositedCrypto
             NotificationMetadata.BoughtToken -> MessageMetadata.BoughtToken
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt
@@ -31,6 +31,7 @@ import com.flipcash.app.tokens.TokenCoordinator
 import com.flipcash.app.tokens.TokenUpdater
 import com.flipcash.core.R
 import com.flipcash.services.controllers.AccountController
+import com.flipcash.services.controllers.SettingsController
 import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
 import com.getcode.manager.BottomBarAction
@@ -105,6 +106,7 @@ class RealSessionController @Inject constructor(
     private val billController: BillController,
     private val userManager: UserManager,
     private val accountController: AccountController,
+    private val settingsController: SettingsController,
     private val feedCoordinator: ActivityFeedCoordinator,
     private val transactionController: TransactionController,
     private val networkObserver: NetworkConnectivityListener,
@@ -205,6 +207,7 @@ class RealSessionController @Inject constructor(
         )
         startPolling()
         updateUserFlags()
+        updateSettings()
         checkPendingItemsInFeed()
         bringActivityFeedCurrent()
         shareSheetController.checkForShare()
@@ -258,6 +261,14 @@ class RealSessionController @Inject constructor(
         }
     }
 
+    private fun updateSettings() {
+        if (userManager.authState.canAccessAuthenticatedApis) {
+            scope.launch {
+                settingsController.update()
+            }
+        }
+    }
+
     private fun checkPendingItemsInFeed() {
         if (userManager.authState.canAccessAuthenticatedApis) {
             scope.launch {
diff --git a/definitions/flipcash/protos/src/main/proto/activity/v1/model.proto b/definitions/flipcash/protos/src/main/proto/activity/v1/model.proto
@@ -24,7 +24,6 @@ message Notification {
     NotificationState state = 5;
     // Additional metadata for this notification specific to the notification
     oneof additional_metadata {
-        WelcomeBonusNotificationMetadata      welcome_bonus      = 6;
         GaveCryptoNotificationMetadata        gave_crypto        = 7;
         ReceivedCryptoNotificationMetadata    received_crypto    = 8;
         WithdrewCryptoNotificationMetadata    withdrew_crypto    = 9;
@@ -33,8 +32,7 @@ message Notification {
         BoughtCryptoNotificationMetadata      bought_crypto      = 12;
         SoldCryptoNotificationMetadata        sold_crypto        = 13;
     }
-}
-message WelcomeBonusNotificationMetadata {
+    reserved 6; // Deprecated WelcomeBonusNotificationMetadata
 }
 message GaveCryptoNotificationMetadata {
 }
diff --git a/definitions/flipcash/protos/src/main/proto/common/v1/common.proto b/definitions/flipcash/protos/src/main/proto/common/v1/common.proto
@@ -100,3 +100,11 @@ message CountryCode {
     // ISO 3166-1 Alpha-2
     string value = 1 ;
 }
+// Locale represents an IETF BCP 47 language tag (e.g. "en", "en-US", "zh-Hans-CN")
+message Locale {
+    string value = 1 ;
+}
+// Region represents a fiat currency region identified by its ISO 4217 alpha-3 currency code (e.g. "usd", "eur")
+message Region {
+    string value = 1 ;
+}
diff --git a/definitions/flipcash/protos/src/main/proto/settings/v1/settings_service.proto b/definitions/flipcash/protos/src/main/proto/settings/v1/settings_service.proto
@@ -0,0 +1,26 @@
+syntax = "proto3";
+package flipcash.settings.v1;
+option go_package = "github.com/code-payments/flipcash2-protobuf-api/generated/go/settings/v1;settingspb";
+option java_package = "com.codeinc.flipcash.gen.settings.v1";
+option objc_class_prefix = "FPBSettingsV1";
+import "common/v1/common.proto";
+
+service Settings {
+	rpc UpdateSettings(UpdateSettingsRequest) returns (UpdateSettingsResponse);
+}
+message UpdateSettingsRequest {
+	// Locale setting, only updated if present
+	common.v1.Locale locale = 1;
+	// Region setting, only updated if present
+	common.v1.Region region = 2;
+	common.v1.Auth auth = 10;
+}
+message UpdateSettingsResponse {
+	Result result = 1;
+	enum Result {
+		OK             = 0;
+		DENIED         = 1;
+		INVALID_LOCALE = 2;
+		INVALID_REGION = 3;
+	}
+}
diff --git a/libs/locale/impl/src/main/kotlin/com/getcode/util/locale/AndroidLocale.kt b/libs/locale/impl/src/main/kotlin/com/getcode/util/locale/AndroidLocale.kt
@@ -8,6 +8,10 @@ import javax.inject.Inject
 class AndroidLocale @Inject constructor(
     @ApplicationContext private val context: Context,
 ): LocaleHelper {
+    override fun getLanguageTag(): String {
+        return LocaleUtils.getLanguageTag()
+    }
+
     override fun getDefaultCurrencyName(): String {
         return LocaleUtils.getDefaultCurrency(context)
     }
diff --git a/libs/locale/public/src/main/kotlin/com/getcode/util/locale/LocaleHelper.kt b/libs/locale/public/src/main/kotlin/com/getcode/util/locale/LocaleHelper.kt
@@ -1,6 +1,7 @@
 package com.getcode.util.locale
 
 interface LocaleHelper {
+    fun getLanguageTag(): String
     fun getDefaultCurrencyName(): String
     suspend fun getDefaultCountry(): String?
 }
diff --git a/libs/locale/public/src/main/kotlin/com/getcode/util/locale/LocaleUtils.kt b/libs/locale/public/src/main/kotlin/com/getcode/util/locale/LocaleUtils.kt
@@ -14,6 +14,9 @@ import java.util.*
 import java.util.concurrent.TimeUnit
 
 object LocaleUtils {
+
+    fun getLanguageTag() = Locale.getDefault().toLanguageTag()
+
     suspend fun getDefaultCountry(context: Context): String? {
         val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
         val networkCountryIso = tm.networkCountryIso.uppercase()
@@ -36,7 +39,7 @@ object LocaleUtils {
             val request = Request.Builder().url("http://ip-api.com/json/?fields=countryCode").build()
             val response = client.newCall(request).execute()
             if (response.isSuccessful) {
-                val json = JSONObject(response.body?.string() ?: "{}")
+                val json = JSONObject(response.body.string())
                 val ipCountry = json.optString("countryCode", "").uppercase()
                 if (ipCountry.length == 2) ipCountry else "US"
             } else null
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/controllers/SettingsController.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/controllers/SettingsController.kt
@@ -0,0 +1,23 @@
+package com.flipcash.services.controllers
+
+import com.flipcash.services.repository.SettingsRepository
+import com.flipcash.services.user.UserManager
+import com.getcode.util.locale.LocaleHelper
+import javax.inject.Inject
+
+class SettingsController @Inject constructor(
+    private val repository: SettingsRepository,
+    private val localeHelper: LocaleHelper,
+    private val userManager: UserManager,
+) {
+    suspend fun update(): Result<Unit> {
+        val locale = localeHelper.getLanguageTag()
+        val region = localeHelper.getDefaultCurrencyName()
+
+        println("locale=$locale, region=$region")
+        val owner = userManager.accountCluster?.authority?.keyPair
+            ?: return Result.failure(Throwable("No account cluster in UserManager"))
+
+        return repository.update(locale, region, owner)
+    }
+}
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/inject/FlipcashModule.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/inject/FlipcashModule.kt
@@ -14,20 +14,23 @@ import com.flipcash.services.internal.network.services.PhoneVerificationService
 import com.flipcash.services.internal.network.services.ProfileService
 import com.flipcash.services.internal.network.services.PurchaseService
 import com.flipcash.services.internal.network.services.PushService
+import com.flipcash.services.internal.network.services.SettingsService
 import com.flipcash.services.internal.network.services.ThirdPartyService
 import com.flipcash.services.internal.repositories.InternalAccountRepository
 import com.flipcash.services.internal.repositories.InternalActivityFeedRepository
 import com.flipcash.services.internal.repositories.InternalContactVerificationRepository
 import com.flipcash.services.internal.repositories.InternalProfileRepository
 import com.flipcash.services.internal.repositories.InternalPurchaseRepository
 import com.flipcash.services.internal.repositories.InternalPushRepository
+import com.flipcash.services.internal.repositories.InternalSettingsRepository
 import com.flipcash.services.internal.repositories.InternalThirdPartyRepository
 import com.flipcash.services.repository.AccountRepository
 import com.flipcash.services.repository.ActivityFeedRepository
 import com.flipcash.services.repository.ContactVerificationRepository
 import com.flipcash.services.repository.ProfileRepository
 import com.flipcash.services.repository.PurchaseRepository
 import com.flipcash.services.repository.PushRepository
+import com.flipcash.services.repository.SettingsRepository
 import com.flipcash.services.repository.ThirdPartyRepository
 import com.getcode.libs.logging.BuildConfig
 import com.getcode.opencode.ProtocolConfig
@@ -108,6 +111,11 @@ internal object FlipcashModule {
         service: PushService,
     ): PushRepository = InternalPushRepository(service)
 
+    @Provides
+    internal fun providesSettingsRepository(
+        service: SettingsService
+    ): SettingsRepository = InternalSettingsRepository(service)
+
     @Provides
     internal fun providesThirdPartyRepository(
         service: ThirdPartyService,
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt
@@ -60,7 +60,6 @@ internal class ActivityFeedMessageMapper @Inject constructor(
                 null -> NotificationState.UNKNOWN
             },
             metadata = when (from.additionalMetadataCase) {
-                Model.Notification.AdditionalMetadataCase.WELCOME_BONUS -> NotificationMetadata.WelcomeBonus
                 Model.Notification.AdditionalMetadataCase.GAVE_CRYPTO -> NotificationMetadata.GaveCrypto
                 Model.Notification.AdditionalMetadataCase.RECEIVED_CRYPTO -> NotificationMetadata.ReceivedCrypto
                 Model.Notification.AdditionalMetadataCase.WITHDREW_CRYPTO -> NotificationMetadata.WithdrewCrypto
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/api/SettingsApi.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/api/SettingsApi.kt
@@ -0,0 +1,46 @@
+package com.flipcash.services.internal.network.api
+
+import com.codeinc.flipcash.gen.common.v1.Common
+import com.codeinc.flipcash.gen.settings.v1.SettingsGrpcKt
+import com.codeinc.flipcash.gen.settings.v1.SettingsService
+import com.flipcash.services.internal.annotations.FlipcashManagedChannel
+import com.flipcash.services.internal.network.extensions.authenticate
+import com.getcode.ed25519.Ed25519
+import com.getcode.opencode.internal.network.core.GrpcApi
+import io.grpc.ManagedChannel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+internal class SettingsApi @Inject constructor(
+    @FlipcashManagedChannel
+    managedChannel: ManagedChannel,
+) : GrpcApi(managedChannel) {
+    private val api = SettingsGrpcKt.SettingsCoroutineStub(managedChannel)
+        .withWaitForReady()
+
+    suspend fun update(
+        locale: String?,
+        region: String?,
+        owner: Ed25519.KeyPair,
+    ): SettingsService.UpdateSettingsResponse {
+        val request = SettingsService.UpdateSettingsRequest.newBuilder()
+            .apply {
+                if (locale != null) {
+                    setLocale(Common.Locale.newBuilder().setValue(locale))
+                }
+
+                if (region != null) {
+                    setRegion(Common.Region.newBuilder().setValue(region.lowercase()))
+                }
+            }
+            .apply { setAuth(authenticate(owner)) }
+            .build()
+
+        return withContext(Dispatchers.IO) {
+            api.updateSettings(request)
+        }
+    }
+}
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/services/SettingsService.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/services/SettingsService.kt
@@ -0,0 +1,35 @@
+package com.flipcash.services.internal.network.services
+
+import com.codeinc.flipcash.gen.settings.v1.SettingsService
+import com.flipcash.services.internal.network.api.SettingsApi
+import com.flipcash.services.models.UpdateSettingsError
+import com.getcode.ed25519.Ed25519
+import com.getcode.opencode.internal.network.extensions.foldWithSuppression
+import javax.inject.Inject
+
+internal class SettingsService @Inject constructor(
+    private val api: SettingsApi,
+) {
+    suspend fun update(
+        locale: String?,
+        region: String?,
+        owner: Ed25519.KeyPair,
+    ): Result<Unit> {
+        return runCatching {
+            api.update(locale, region, owner)
+        }.foldWithSuppression(
+            onSuccess = { response ->
+                when (response.result) {
+                    SettingsService.UpdateSettingsResponse.Result.OK -> Result.success(Unit)
+                    SettingsService.UpdateSettingsResponse.Result.DENIED -> Result.failure(UpdateSettingsError.Denied())
+                    SettingsService.UpdateSettingsResponse.Result.INVALID_LOCALE -> Result.failure(UpdateSettingsError.InvalidLocale())
+                    SettingsService.UpdateSettingsResponse.Result.INVALID_REGION -> Result.failure(UpdateSettingsError.InvalidRegion())
+                    SettingsService.UpdateSettingsResponse.Result.UNRECOGNIZED -> Result.failure(UpdateSettingsError.Unrecognized())
+                }
+            },
+            onFailure = {
+                Result.failure(UpdateSettingsError.Other(it))
+            }
+        )
+    }
+}
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/repositories/InternalSettingsRepository.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/repositories/InternalSettingsRepository.kt
@@ -0,0 +1,17 @@
+package com.flipcash.services.internal.repositories
+
+import com.flipcash.services.internal.network.services.SettingsService
+import com.flipcash.services.repository.SettingsRepository
+import com.getcode.ed25519.Ed25519
+import com.getcode.utils.ErrorUtils
+
+internal class InternalSettingsRepository(
+    private val service: SettingsService,
+) : SettingsRepository {
+    override suspend fun update(
+        locale: String?,
+        region: String?,
+        owner: Ed25519.KeyPair
+    ): Result<Unit> = service.update(locale, region, owner)
+        .onFailure { ErrorUtils.handleError(it) }
+}
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt
@@ -52,9 +52,6 @@ sealed interface NotificationMetadata {
     @Serializable
     data object Unknown : NotificationMetadata
 
-    @Serializable
-    data object WelcomeBonus : NotificationMetadata
-
     @Serializable
     data object GaveCrypto : NotificationMetadata
 
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/models/Errors.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/models/Errors.kt
@@ -212,3 +212,14 @@ sealed class UnlinkSocialAccountError(
     data class Other(override val cause: Throwable? = null) : UnlinkSocialAccountError(message = cause?.message, cause = cause)
 }
 
+sealed class UpdateSettingsError(
+    override val message: String? = null,
+    override val cause: Throwable? = null
+): CodeServerError(message, cause) {
+    class Denied : UpdateSettingsError("Denied")
+    class Unrecognized : UpdateSettingsError("Unrecognized")
+    class InvalidLocale : UpdateSettingsError("Invalid locale")
+    class InvalidRegion : UpdateSettingsError("Invalid region")
+    data class Other(override val cause: Throwable? = null) : UpdateSettingsError(message = cause?.message, cause = cause)
+
+}
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/repository/SettingsRepository.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/repository/SettingsRepository.kt
@@ -0,0 +1,7 @@
+package com.flipcash.services.repository
+
+import com.getcode.ed25519.Ed25519
+
+interface SettingsRepository {
+    suspend fun update(locale: String?, region: String?, owner: Ed25519.KeyPair): Result<Unit>
+}

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ message Notification {`
`24`	`24`	`NotificationState state = 5;`
`25`	`25`	`// Additional metadata for this notification specific to the notification`
`26`	`26`	`oneof additional_metadata {`
`27`		`- WelcomeBonusNotificationMetadata welcome_bonus = 6;`
`28`	`27`	`GaveCryptoNotificationMetadata gave_crypto = 7;`
`29`	`28`	`ReceivedCryptoNotificationMetadata received_crypto = 8;`
`30`	`29`	`WithdrewCryptoNotificationMetadata withdrew_crypto = 9;`
`@@ -33,8 +32,7 @@ message Notification {`
`33`	`32`	`BoughtCryptoNotificationMetadata bought_crypto = 12;`
`34`	`33`	`SoldCryptoNotificationMetadata sold_crypto = 13;`
`35`	`34`	`}`
`36`		`-}`
`37`		`-message WelcomeBonusNotificationMetadata {`
	`35`	`+ reserved 6; // Deprecated WelcomeBonusNotificationMetadata`
`38`	`36`	`}`
`39`	`37`	`message GaveCryptoNotificationMetadata {`
`40`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.getcode.util.locale`
`2`	`2`
`3`	`3`	`interface LocaleHelper {`
	`4`	`+ fun getLanguageTag(): String`
`4`	`5`	`fun getDefaultCurrencyName(): String`
`5`	`6`	`suspend fun getDefaultCountry(): String?`
`6`	`7`	`}`