Merge branch 'master' into ai/lsp-skill

Author: ovitrif

AGENTS.md

@@ -192,8 +192,9 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - NEVER hardcode strings and always preserve string resources
 - ALWAYS localize in ViewModels using injected `@ApplicationContext`, e.g. `context.getString()`
 - ALWAYS use `remember` for expensive Compose computations
-- ALWAYS add modifiers to the last place in the argument list when calling composable functions
-- NEVER add parameters with default values BEFORE the `modifier` parameter in composable functions - modifier must be the FIRST optional parameter
+- ALWAYS declare `modifier: Modifier = Modifier,` as the FIRST optional parameter in composable declarations
+- ALWAYS pass `modifier = ...` as the LAST argument in composable calls
+- ALWAYS add trailing commas in multi-line declarations; NEVER add a trailing comma to `modifier = ...` at call sites
 - ALWAYS use `navController.navigateTo(route)` for simple navigation; NEVER use raw `navController.navigate(route)` — `navigateTo` prevents duplicate destinations
 - ALWAYS prefer `VerticalSpacer`, `HorizontalSpacer`, `FillHeight` and `FillWidth` over `Spacer` when applicable
 - PREFER declaring small dependant classes, constants, interfaces or top-level functions in the same file with the core class where these are used

CHANGELOG.md

@@ -7,4 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Fix ANR on RGS server settings screen caused by catastrophic regex backtracking #880
+- Fix crash when returning app to foreground on Receive screen #875
+- Show loading state on Spending tab when node is not running #875
+
+### Added
+- Lightning Connections empty state with onboarding screen #857
+- Unified PIN management screen (enable/disable/change in one place) #857
+- Support entry in drawer menu #857
+- Brand endorsement row (Synonym + Tether logos) in Support screen #857
+- Reset Widgets and Reset Suggestions Cards options in Widgets settings #857
+- Diagonal orange footer background in Support screen #857
+- Mnemonic warning text transitions on reveal #857
+
+### Changed
+- Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857
+- Icons added to all settings rows for faster scanning #857
+- Selected values displayed on right side of settings rows #857
+- Support screen redesigned with About content merged in #857
+- Backup and Reset moved into Security tab #857
+- PIN flow reworked into sheet-based enable/disable/change #857
+- Social links simplified with Brand tint #857
+- Mnemonic warning updated with new copy and red styling #857
+- Security title changed from "Security and Privacy" to "Security" #857
+- Language model updated to use string resources for "System Settings" #857
+
+### Removed
+- About screen (content merged into Support) #857
+- Standalone General, Security, and Advanced settings screens (merged into tabs) #857
+
 [Unreleased]: https://github.com/synonymdev/bitkit-android/compare/v2.1.2...HEAD

app/src/main/java/to/bitkit/di/HttpModule.kt

@@ -12,10 +12,14 @@ import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.plugins.logging.LoggingConfig
+import io.ktor.client.request.head
 import io.ktor.http.ContentType
 import io.ktor.http.contentType
+import io.ktor.http.isSuccess
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
+import to.bitkit.utils.UrlValidator
+import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
 import javax.inject.Singleton
 import io.ktor.client.plugins.logging.Logger as KtorLogger
@@ -43,6 +47,17 @@ object HttpModule {
         }
     }
 
+    @Provides
+    @Singleton
+    fun provideUrlValidator(httpClient: HttpClient) = UrlValidator { url ->
+        runCatching {
+            val response = httpClient.head(url)
+            if (!response.status.isSuccess()) {
+                throw AppError("Server returned '${response.status}'")
+            }
+        }
+    }
+
     @Suppress("MagicNumber")
     private fun HttpTimeoutConfig.defaultTimeoutConfig() {
         requestTimeoutMillis = 60_000

app/src/main/java/to/bitkit/models/Language.kt

@@ -1,35 +1,38 @@
 package to.bitkit.models
 
+import androidx.annotation.StringRes
 import kotlinx.serialization.Serializable
+import to.bitkit.R
 import java.util.Locale
 
 @Serializable
 enum class Language(
-    val displayName: String,
+    @StringRes val displayNameResId: Int? = null,
+    val nativeName: String? = null,
     val languageCode: String,
     val countryCode: String? = null,
     val isSystemDefault: Boolean = false,
 ) {
     SYSTEM_DEFAULT(
-        displayName = "System Default",
+        displayNameResId = R.string.settings__language_system_default,
         languageCode = "system",
         countryCode = null,
         isSystemDefault = true
     ),
-    ARABIC("العربية", "ar"),
-    CATALAN("Català", "ca"),
-    CZECH("Čeština", "cs"),
-    DUTCH("Nederlands", "nl"),
-    ENGLISH("English", "en", "US"),
-    FRENCH("Français", "fr", "FR"),
-    GERMAN("Deutsch", "de"),
-    GREEK("Ελληνικά", "el"),
-    ITALIAN("Italiano", "it"),
-    POLISH("Polski", "pl"),
-    PORTUGUESE("Português", "pt", "BR"),
-    RUSSIAN("Русский", "ru"),
-    SPANISH("Español", "es", "ES"),
-    SPANISH_LATIN_AMERICA("Español (Latinoamérica)", "es", "419");
+    ARABIC(nativeName = "العربية", languageCode = "ar"),
+    CATALAN(nativeName = "Català", languageCode = "ca"),
+    CZECH(nativeName = "Čeština", languageCode = "cs"),
+    DUTCH(nativeName = "Nederlands", languageCode = "nl"),
+    ENGLISH(nativeName = "English", languageCode = "en", countryCode = "US"),
+    FRENCH(nativeName = "Français", languageCode = "fr", countryCode = "FR"),
+    GERMAN(nativeName = "Deutsch", languageCode = "de"),
+    GREEK(nativeName = "Ελληνικά", languageCode = "el"),
+    ITALIAN(nativeName = "Italiano", languageCode = "it"),
+    POLISH(nativeName = "Polski", languageCode = "pl"),
+    PORTUGUESE(nativeName = "Português", languageCode = "pt", countryCode = "BR"),
+    RUSSIAN(nativeName = "Русский", languageCode = "ru"),
+    SPANISH(nativeName = "Español", languageCode = "es", countryCode = "ES"),
+    SPANISH_LATIN_AMERICA(nativeName = "Español (Latinoamérica)", languageCode = "es", countryCode = "419");
 
     companion object {
         fun fromLanguageCode(languageCode: String, countryCode: String? = null): Language? {

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -79,6 +79,7 @@ import to.bitkit.services.NodeEventHandler
 import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
 import to.bitkit.utils.ServiceError
+import to.bitkit.utils.UrlValidator
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
@@ -105,6 +106,7 @@ class LightningRepo @Inject constructor(
     private val preActivityMetadataRepo: PreActivityMetadataRepo,
     private val connectivityRepo: ConnectivityRepo,
     private val vssBackupClientLdk: VssBackupClientLdk,
+    private val urlValidator: UrlValidator,
 ) {
     private val _lightningState = MutableStateFlow(LightningState())
     val lightningState = _lightningState.asStateFlow()
@@ -619,6 +621,11 @@ class LightningRepo @Inject constructor(
     suspend fun restartWithRgsServer(newRgsUrl: String): Result<Unit> = withContext(bgDispatcher) {
         Logger.info("Changing ldk-node RGS server to: '$newRgsUrl'", context = TAG)
 
+        validateRgsUrl(newRgsUrl).onFailure {
+            Logger.warn("RGS server unreachable at '$newRgsUrl'", it, context = TAG)
+            return@withContext Result.failure(it)
+        }
+
         waitForNodeToStop().onFailure { return@withContext Result.failure(it) }
         stop().onFailure {
             Logger.error("Failed to stop node during RGS server change", it, context = TAG)
@@ -640,6 +647,12 @@ class LightningRepo @Inject constructor(
         }
     }
 
+    private suspend fun validateRgsUrl(url: String): Result<Unit> = withContext(bgDispatcher) {
+        val initialTimestamp = 0
+        val testUrl = "${url.trimEnd('/')}/$initialTimestamp"
+        urlValidator.validate(testUrl)
+    }
+
     suspend fun getBalanceForAddressType(addressType: AddressType): Result<ULong> = withContext(bgDispatcher) {
         executeWhenNodeRunning("getBalanceForAddressType") {
             runCatching {