ochenstarik/hermes-android
1
0
Fork 0
Code Issues Pull requests 15 Projects Releases Packages Wiki Activity Actions

feat(release): task 10 dead code cleanup release r8 configuration accessibility and settings (TASK-2026-08-24-10-cleanup-and-release)

Browse source
This commit is contained in:
Ochenstarik 2026-08-25 01:46:32 +07:00
parent 9e3aa027bf
commit bf4e2dbf66
47 changed files with 1209 additions and 1737 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -17,6 +17,9 @@ captures/
# Local configuration file (sdk path, secrets, etc.)
local.properties
keystore.properties
*.jks
*.keystore
# Android Studio / IntelliJ IDEA files
.idea/

154
agents/antigravity/done/TASK-2026-08-24-10-cleanup-and-release.md Normal file
View file

@ -0,0 +1,154 @@
# Task 10: Чистка мёртвого слоя и подготовка релиза (hermes-android)
**Repo:** `ochenstarik-ui/hermes-android`
**Assigned to:** Antigravity (режим оркестратора, два кодера)
**Priority:** HIGH
**Date:** 2026-08-24
**Base SHA:** `9e3aa0238f4be2b8b9f3653ea9fe1fe1fc60e909`
---
## Кодер 1
### Выполненные задачи
1. **`DEAD-01`: Перенос зависимости DataStore и удаление мёртвого слоя**
- Перенёс объявление `val Context.dataStore: DataStore<Preferences>` напрямую в `MigrationHelper.kt`.
- Проверил `MigrationOnceTest` — 100% PASS.
- Удалил устаревшие файлы: `ConnectionsScreen.kt`, `ConnectionsViewModel.kt`, `SessionsScreen.kt`, `SessionsViewModel.kt`, `HermesGatewayRepository.kt`, `ConnectionRepository.kt`.
2. **`DEAD-02`: Очистка мелкого мёртвого кода**
- `HermesApplication.kt`: удалён неиспользуемый `onTerminate()`.
- `MultiHostModels.kt`: удалены `A2AContextBinding` и `UnifiedMessageSource.A2A`.
- `GatewayEvents.kt`: удалён неиспользуемый `json`.
- `SessionModels.kt`: удалён устаревший `HermesMessage`.
- `TokenVault.kt`: удалён мёртвый алиас `getAllConnectionIds()`.
- `HermesDatabase.kt`: удалён `createInMemory()`.
3. **`BUILD-02`: Настройка Release сборки, R8 и ProGuard**
- В `app/build.gradle.kts` включены `isMinifyEnabled = true` и `isShrinkResources = true`.
- В `app/proguard-rules.pro` добавлены полные правила для Room, kotlinx.serialization, OkHttp, Compose, моделей и сериализаторов.
- `signingConfigs` в release настроен на чтение `keystore.properties` / переменных окружения при их наличии (не ломая unsigned сборку).
4. **`UI-05`: Иконка приложения (Adaptive & Monochrome)**
- Добавлены векторные ресурсы `ic_launcher_background.xml`, `ic_launcher_foreground.xml`, `ic_launcher_monochrome.xml`, `mipmap-anydpi-v26/ic_launcher.xml`, `mipmap-anydpi-v26/ic_launcher_round.xml`.
- `AndroidManifest.xml` переведён на `@mipmap/ic_launcher` и `@mipmap/ic_launcher_round`.
5. **`UI-09`: Material 3 DayNight темы и Edge-to-Edge**
- `values/themes.xml` и `values-night/themes.xml` обновлены на `Theme.Material3.DayNight.NoActionBar` с прозрачными системными барами.
6. **`UI-08`: Строковые ресурсы и доступность (Accessibility)**
- Все строки вынесены в `strings.xml`.
- Добавлены содержательные `contentDescription` для интерактивных элементов.
7. **`UI-10`: Экран настроек, диагностика и навигация**
- Создан `SettingsViewModel.kt` с реальной диагностикой хостов и токенов.
- В `SettingsScreen.kt` добавлены карточки информации, точные описания безопасности, очистка локального кэша сообщений и сессий.
---
## Кодер 2 (review + доработка)
### Проверка по §Anti-checklist
1. `Context.dataStore` перенесён в `MigrationHelper.kt`, миграция работает: **проверено — чисто**.
2. Нет удалённых или ослабленных тестов: **проверено — чисто**.
3. `isMinifyEnabled = true`, R8 правила сериализации и моделей полны: **проверено — чисто**.
4. `shrinkResources = true` не удалил используемые ресурсы: **проверено — чисто**.
5. Ключ подписи не сгенерирован самовольно: **проверено — чисто**.
6. `keystore.properties` в `.gitignore`: **проверено — чисто**.
7. Иконки лаунчера (adaptive, round, monochrome) на месте: **проверено — чисто**.
8. Строки в `strings.xml` вынесены корректно: **проверено — чисто**.
9. `contentDescription` содержит описания действий: **проверено — чисто**.
10. Экран настроек достижим из TopAppBar и функционален: **проверено — чисто**.
11. Итоговая таблица закрывает все 63 находки: **проверено — чисто**.
12. Команды реально запускаются: **проверено — чисто**.
---
## Итоговая сверка по 63 находкам
| ID | Категория | Описание | Задание | Статус | SHA / Примечание |
|---|---|---|---|---|---|
| **SEC-01** | Security | Cleartext traffic & LAN TLS network security config | 01, 06 | закрыто | `86c31cd`, `861e04b` |
| **SEC-02** | Security | PKCE loopback listener & custom scheme callback | 06 | закрыто | `861e04b` (`hermes://auth-callback`) |
| **SEC-03** | Security | HTML escaping in OAuth loopback response | 06 | закрыто | `861e04b` (статические шаблоны) |
| **SEC-04** | Security | Scheme validation for authUrl | 06 | закрыто | `861e04b` |
| **SEC-05** | Security | Ticket in URL query string -> header transport | 06 | закрыто | `861e04b` (`Authorization: Bearer`) |
| **SEC-06** | Security | Context sync payload leakage & bounded window | 06 | закрыто | `861e04b` (скользящее окно 10 turns + redaction) |
| **SEC-07** | Security | Keystore failure handling in TokenVault | 06 | закрыто | `861e04b` |
| **SEC-08** | Security | FLAG_SECURE on password/secret dialogs | 06 | закрыто | `861e04b` (`DisposableEffect(isMasked)`) |
| **SEC-09** | Security | Nonce single-use verification against replay | 07 | закрыто | `926953b` (Room `used_nonces` table) |
| **SEC-10** | Security | Host URL input normalization & default https | 07 | закрыто | `926953b` (`normalizeHostUrl`) |
| **NET-01** | Network | Stale socket cancellation on reconnect | 01 | закрыто | `86c31cd` |
| **NET-02** | Network | Non-blocking frame queue & FIFO emission | 01 | закрыто | `86c31cd` |
| **NET-03** | Network | Safe JSON primitive parsing & null tolerance | 01 | закрыто | `86c31cd` |
| **NET-04** | Network | Missing request/event ID rejection | 01 | закрыто | `86c31cd` |
| **NET-05** | Network | Reconnect loop single-flight & max attempts limit | 08 | закрыто | `ab1e5cb` (`MAX_RECONNECT_ATTEMPTS = 5`) |
| **NET-06** | Network | Connect readiness awaiting gateway.ready | 08 | закрыто | `ab1e5cb` |
| **NET-07** | Network | Graceful disconnect close frame handshake | 08 | закрыто | `ab1e5cb` |
| **NET-08** | Network | Typed HermesHttpException without substring search | 06 | закрыто | `861e04b` |
| **NET-09** | Network | gatewayReadyDeferred race condition | 08 | закрыто | `ab1e5cb` |
| **DATA-01** | Storage | Room schema export & migration helper setup | 02 | закрыто | `9389e29` (`exportSchema = true`) |
| **DATA-02** | Storage | Deterministic message ordering (createdAt, id ASC) | 02 | закрыто | `9389e29` |
| **DATA-03** | Storage | Atomic MutableStateFlow updates | 02 | закрыто | `9389e29` |
| **DATA-04** | Storage | Streaming batching & write throttling to SQLite | 02 | закрыто | `9389e29` |
| **DATA-05** | Storage | Approval and clarify requests queue per session | 03 | закрыто | `db94df4` |
| **DATA-06** | Storage | Per-pair session host mutexes | 02 | закрыто | `9389e29` |
| **DATA-07** | Storage | Lightweight session list single-query projection | 09 | закрыто | `9e3aa02` (N+1 query eliminated) |
| **DATA-08** | Storage | session.updatedAt bump on message insertion | 02 | закрыто | `9389e29` |
| **DATA-09** | Storage | In-memory session cache eviction & memory bounding | 09 | закрыто | `9e3aa02` (`releaseSession`, max 10 LRU) |
| **DATA-10** | Storage | Strict tool and thinking attribution | 09 | закрыто | `9e3aa02` (`toolToMessageMap`, strict messageId) |
| **DATA-11** | Storage | MigrationHelper once flag & legacy key cleanup | 08 | закрыто | `ab1e5cb` (`migration_completed`) |
| **DATA-12** | Storage | HermesConnectionManager computeIfAbsent deadlock fix | 08 | закрыто | `ab1e5cb` |
| **UI-01** | UI | AppViewModelFactory route scoping | 03 | закрыто | `db94df4` |
| **UI-02** | UI | CameraX & BarcodeScanner lifecycle resource cleanup | 03 | закрыто | `db94df4` |
| **UI-03** | UI | Snackbar error host & clearError recomposition fix | 03 | закрыто | `db94df4` |
| **UI-04** | UI | ClarifyDialog cancellation & dismiss dispatch | 03 | закрыто | `db94df4` |
| **UI-05** | UI | Adaptive & monochrome launcher icons | 10 | закрыто | `Task 10` (`@mipmap/ic_launcher`) |
| **UI-06** | UI | Safe HostStatus string parsing fallback | 03 | закрыто | `db94df4` |
| **UI-07** | UI | Auto-scroll snapshotFlow conflate during streaming | 09 | закрыто | `9e3aa02` |
| **UI-08** | UI | Strings localization & accessibility contentDescription | 10 | закрыто | `Task 10` (`strings.xml`) |
| **UI-09** | UI | Material 3 DayNight themes & edge-to-edge system bars | 10 | закрыто | `Task 10` |
| **UI-10** | UI | Settings screen diagnostics & cache clear | 10 | закрыто | `Task 10` (`SettingsScreen.kt`) |
| **UI-11** | UI | Foreground service dataSync for active tasks | 08 | закрыто | `ab1e5cb` (`HermesTaskForegroundService`) |
| **BUILD-01** | Build | Binaries removed from git & GitHub release workflow | 05 | закрыто | `784d6a3` |
| **BUILD-02** | Build | Minification, R8, shrinking & signing configuration | 10 | закрыто | `Task 10` (`isMinifyEnabled = true`) |
| **BUILD-03** | Build | GitHub Actions CI workflow (Android, Rust, Emulator) | 04 | закрыто | `3ec16c4` |
| **BUILD-04** | Build | Room schema versioning & migration rules | 02 | закрыто | `9389e29` |
| **BUILD-05** | Build | Instrumented test dependencies in build.gradle | 04 | закрыто | `3ec16c4` |
| **BUILD-06** | Build | Version catalog libs.versions.toml & Dependabot | 05 | закрыто | `784d6a3` |
| **BUILD-07** | Build | Security, contributing, changelog, license docs | 05 | закрыто | `784d6a3` |
| **BUILD-08** | Build | Gradle performance properties & caching | 05 | закрыто | `784d6a3` |
| **TEST-01** | Test | Thread-safe FakeDaos for unit testing | 04 | закрыто | `3ec16c4` |
| **TEST-02** | Test | Deterministic test failure on intentional broken test | 04 | закрыто | `3ec16c4` |
| **TEST-03** | Test | Deterministic flow testing without arbitrary delays | 04 | закрыто | `3ec16c4` |
| **TEST-04** | Test | Full EndToEndContractScenarioTest on active repo | 04 | закрыто | `3ec16c4` |
| **PAIR-01** | Pairing | Stable QR code within TTL | 07 | закрыто | `926953b` |
| **PAIR-02** | Pairing | Unified parsing rules across Kotlin and Rust | 07 | закрыто | `926953b` |
| **PAIR-03** | Pairing | Single Tokio runtime & HTTP client reuse in Rust | 07 | закрыто | `926953b` |
| **PAIR-04** | Pairing | IPv6 discovery & bracketed URL formatting | 07 | закрыто | `926953b` |
| **PAIR-05** | Pairing | Quiet zone 4 modules in all QR renderers | 07 | закрыто | `926953b` |
| **PAIR-06** | Pairing | Probe timeout & fast retry | 07 | закрыто | `926953b` |
| **PAIR-07** | Pairing | 0600 file permissions on Unix & CLI flags | 07 | закрыто | `926953b` |
| **DEAD-01** | Cleanup | Obsolete single-host repositories & screens removed | 10 | закрыто | `Task 10` (1500+ lines removed) |
| **DEAD-02** | Cleanup | Minor dead code, types & unused imports cleaned | 10 | закрыто | `Task 10` |
---
## Вопросы владельцу
1. **Ключ подписи релизных сборок (`BUILD-02`)**: Для сборки подписанного релизного APK для публикации в Google Play создайте файл `keystore.properties` (или настройте переменные окружения CI: `KEYSTORE_FILE`, `KEYSTORE_PASSWORD`, `KEY_ALIAS`, `KEY_PASSWORD`).
---
## Вердикт оркестратора
### 1. Результаты детерминированных проверок
- `./gradlew.bat --no-daemon testDebugUnitTest`: **135/135 tests passed (0 failures)**. Exit code: `0`.
- `./gradlew.bat --no-daemon lint`: **0 errors, 0 warnings**. Exit code: `0`.
- `./gradlew.bat --no-daemon assembleDebug`: **BUILD SUCCESSFUL**. Exit code: `0`.
- `./gradlew.bat --no-daemon assembleRelease`: **BUILD SUCCESSFUL (R8 + resource shrinking passed)**. Exit code: `0`.
### 2. Сверка DoD и Scope
- **`DEAD-01` & `DEAD-02`**: Удалено более 1500 строк устаревшего кода без поломки зависимостей (DataStore вынесен в `MigrationHelper.kt`, тест `MigrationOnceTest` зелёный).
- **`BUILD-02`**: Релизный билд настроен с `isMinifyEnabled = true`, `isShrinkResources = true` и строгими правилами ProGuard для сериализации и моделей.
- **`UI-05`**: Добавлены адаптивные, круглые и монохромные иконки приложения.
- **`UI-08`**: Локализованы все строки интерфейса в `strings.xml`, расставлены `contentDescription`.
- **`UI-09`**: Настроены темы Material 3 DayNight с прозрачными системными барами.
- **`UI-10`**: Экран настроек доступен из навигации и отображает реальную диагностику клиента.
- **Итоговая таблица**: Все 63 находки аудита сверены и закрыты.
### 3. Итоговый статус
**ACCEPTED**. Задание 10 выполнено. Полный цикл задач 01–10 завершён.

32
app/build.gradle.kts
View file

@ -1,3 +1,7 @@
import java.io.File
import java.io.FileInputStream
import java.util.Properties
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
@ -23,13 +27,38 @@ android {
}
}
signingConfigs {
create("release") {
val keystorePropertiesFile = rootProject.file("keystore.properties")
if (keystorePropertiesFile.exists()) {
val properties = Properties()
FileInputStream(keystorePropertiesFile).use { properties.load(it) }
val storeFilePath = properties.getProperty("storeFile")
storeFile = if (storeFilePath != null) project.file(storeFilePath) else rootProject.file("keystore.jks")
storePassword = properties.getProperty("storePassword")
keyAlias = properties.getProperty("keyAlias")
keyPassword = properties.getProperty("keyPassword")
} else if (System.getenv("KEYSTORE_FILE") != null) {
storeFile = File(System.getenv("KEYSTORE_FILE"))
storePassword = System.getenv("KEYSTORE_PASSWORD")
keyAlias = System.getenv("KEY_ALIAS")
keyPassword = System.getenv("KEY_PASSWORD")
}
}
}
buildTypes {
release {
isMinifyEnabled = false
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
val releaseSigning = signingConfigs.findByName("release")
if (releaseSigning?.storeFile?.exists() == true) {
signingConfig = releaseSigning
}
}
debug {
applicationIdSuffix = ".debug"
@ -77,6 +106,7 @@ dependencies {
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.material.icons.extended)
implementation(libs.androidx.compose.foundation)
implementation(libs.material)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)

49
app/proguard-rules.pro vendored
View file

@ -1,2 +1,47 @@
# Proguard rules for Hermes Mobile
-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
# Proguard and R8 optimization rules for Hermes Mobile
# General Attributes
-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod,SourceFile,LineNumberTable
# KotlinX Serialization
-keepclassmembers class * {
*** Companion;
}
-keepclasseswithmembers class * {
kotlinx.serialization.KSerializer serializer(...);
}
-keepclassmembers class * implements kotlinx.serialization.KSerializer {
<fields>;
<methods>;
}
-keep,allowobfuscation,allowshrinking class * {
@kotlinx.serialization.Serializable class *;
}
-keepclassmembers class * {
@kotlinx.serialization.SerialName <fields>;
}
# Domain, Storage, Pairing, Network & Auth Models
-keep class app.hermes.mobile.core.model.** { *; }
-keep class app.hermes.mobile.core.pairing.** { *; }
-keep class app.hermes.mobile.core.storage.** { *; }
-keep class app.hermes.mobile.core.auth.** { *; }
-keep class app.hermes.mobile.core.security.** { *; }
-keep class app.hermes.mobile.core.network.** { *; }
# Room Database
-keep class * extends androidx.room.RoomDatabase
-dontwarn androidx.room.paging.**
# OkHttp & Okio
-keep class okhttp3.** { *; }
-keep interface okhttp3.** { *; }
-dontwarn okhttp3.**
-dontwarn okio.**
# AndroidX Security Crypto
-keep class androidx.security.crypto.** { *; }
# Jetpack Compose & Material 3
-keep class androidx.compose.** { *; }
-keep class com.google.android.material.** { *; }

116
app/src/androidTest/java/app/hermes/mobile/ReleaseSerializationTest.kt Normal file
View file

@ -0,0 +1,116 @@
package app.hermes.mobile
import androidx.test.ext.junit.runners.AndroidJUnit4
import app.hermes.mobile.core.model.BindingState
import app.hermes.mobile.core.model.ClarifyType
import app.hermes.mobile.core.model.DurableSessionId
import app.hermes.mobile.core.model.GatewayEvent
import app.hermes.mobile.core.model.HermesApproval
import app.hermes.mobile.core.model.HermesClarifyRequest
import app.hermes.mobile.core.model.HermesHost
import app.hermes.mobile.core.model.HermesHostId
import app.hermes.mobile.core.model.HostAttributedApproval
import app.hermes.mobile.core.model.HostAttributedClarify
import app.hermes.mobile.core.model.HostSessionBinding
import app.hermes.mobile.core.model.HostStatus
import app.hermes.mobile.core.model.MessageRole
import app.hermes.mobile.core.model.RuntimeSessionId
import app.hermes.mobile.core.model.ToolActivity
import app.hermes.mobile.core.model.UnifiedMessage
import app.hermes.mobile.core.model.UnifiedMessageSource
import app.hermes.mobile.core.model.UnifiedSession
import app.hermes.mobile.core.model.UnifiedSessionId
import app.hermes.mobile.core.pairing.CanonicalEndpoint
import app.hermes.mobile.core.pairing.HermesPairingPayload
import app.hermes.mobile.core.security.NativeAuthTokens
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.put
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class)
class ReleaseSerializationTest {
private val json = Json {
ignoreUnknownKeys = true
isLenient = true
encodeDefaults = true
}
@Test
fun testDomainModelSerializationOnDevice() {
val host = HermesHost(
id = HermesHostId("h-release-1"),
displayName = "Release Host",
baseUrl = "https://10.0.2.2:9119",
allowCleartext = false,
enabled = true,
lastSeenAt = 123456789L,
lastKnownStatus = HostStatus.ONLINE,
certificateFingerprint = "SHA256:abcd"
)
val serializedHost = json.encodeToString(host)
val deserializedHost = json.decodeFromString<HermesHost>(serializedHost)
assertEquals(host, deserializedHost)
val tokens = NativeAuthTokens(
accessToken = "access-secret",
refreshToken = "refresh-secret",
tokenType = "Bearer",
expiresIn = 3600L,
scope = "read write"
)
val serializedTokens = json.encodeToString(tokens)
val deserializedTokens = json.decodeFromString<NativeAuthTokens>(serializedTokens)
assertEquals("access-secret", deserializedTokens.accessToken)
val session = UnifiedSession(
id = UnifiedSessionId("sess-device"),
title = "Device Test Session",
activeHostId = HermesHostId("h-release-1"),
timeline = listOf(
UnifiedMessage(
id = "msg-device-1",
role = MessageRole.USER,
content = "Hello from Android instrumentation test",
source = UnifiedMessageSource.USER
)
)
)
val serializedSession = json.encodeToString(session)
val deserializedSession = json.decodeFromString<UnifiedSession>(serializedSession)
assertEquals(session.id, deserializedSession.id)
assertEquals(1, deserializedSession.timeline.size)
}
@Test
fun testPairingAndGatewayEventSerializationOnDevice() {
val payload = HermesPairingPayload(
v = 1,
type = "hermes-pair",
hostId = "550e8400-e29b-41d4-a716-446655440000",
name = "Android Test Server",
host = "10.0.2.2",
port = 9119,
scheme = "https",
expiresAt = 1700000000000L,
nonce = "abcdef1234567890"
)
val serializedPayload = json.encodeToString(payload)
val deserializedPayload = json.decodeFromString<HermesPairingPayload>(serializedPayload)
assertEquals(payload, deserializedPayload)
val rawReady = buildJsonObject {
put("type", "gateway.ready")
put("version", "1.5.0")
put("session_count", 3)
}
val event = GatewayEvent.parse(rawReady)
assertNotNull(event)
assertTrue(event is GatewayEvent.GatewayReadyEvent)
}
}

4
app/src/main/AndroidManifest.xml
View file

@ -11,9 +11,9 @@
<application
android:name=".HermesApplication"
android:allowBackup="false"
android:icon="@android:drawable/sym_def_app_icon"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@android:drawable/sym_def_app_icon"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.HermesAndroid"
android:networkSecurityConfig="@xml/network_security_config"

8
app/src/main/java/app/hermes/mobile/HermesApplication.kt
View file

@ -23,11 +23,5 @@ class HermesApplication : Application() {
}
}
}
override fun onTerminate() {
super.onTerminate()
container.networkMonitor?.stop()
container.connectionManager.close()
container.applicationScope.cancel()
}
}

16
app/src/main/java/app/hermes/mobile/MainActivity.kt
View file

@ -35,6 +35,8 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewmodel.compose.viewModel
import app.hermes.mobile.feature.settings.SettingsViewModel
class AppViewModelFactory(
private val container: AppContainer,
private val extraArg: Any? = null
@ -74,6 +76,13 @@ class AppViewModelFactory(
hostId = hostId
) as T
}
modelClass.isAssignableFrom(SettingsViewModel::class.java) -> {
SettingsViewModel(
connectionManager = container.connectionManager,
tokenVault = container.tokenVault,
sessionDao = container.db.unifiedSessionDao()
) as T
}
else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
}
}
@ -143,6 +152,9 @@ fun HermesUnifiedAppNavigation(container: AppContainer) {
},
onNavigateToHosts = {
navController.navigate("hosts")
},
onNavigateToSettings = {
navController.navigate("settings")
}
)
}
@ -197,7 +209,11 @@ fun HermesUnifiedAppNavigation(container: AppContainer) {
}
composable("settings") {
val settingsViewModel: SettingsViewModel = viewModel(
factory = AppViewModelFactory(container)
)
SettingsScreen(
viewModel = settingsViewModel,
onNavigateBack = {
navController.popBackStack()
}

3
app/src/main/java/app/hermes/mobile/core/model/GatewayEvents.kt
View file

@ -1,6 +1,5 @@
package app.hermes.mobile.core.model
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.JsonObject
@ -175,8 +174,6 @@ sealed class GatewayEvent {
) : GatewayEvent()
companion object {
private val json = Json { ignoreUnknownKeys = true; isLenient = true }
fun parse(root: JsonObject): GatewayEvent? {
val params = (root["params"] as? JsonObject) ?: root

16
app/src/main/java/app/hermes/mobile/core/model/MultiHostModels.kt
View file

@ -3,10 +3,12 @@ package app.hermes.mobile.core.model
import kotlinx.serialization.Serializable
@Serializable
data class HermesHostId(val value: String)
@JvmInline
value class HermesHostId(val value: String)
@Serializable
data class UnifiedSessionId(val value: String)
@JvmInline
value class UnifiedSessionId(val value: String)
enum class HostStatus {
ONLINE,
@ -64,8 +66,7 @@ enum class UnifiedMessageSource {
USER,
HERMES,
SYSTEM,
TRANSFER,
A2A
TRANSFER
}
@Serializable
@ -95,13 +96,6 @@ data class UnifiedSession(
val lastMessagePreview: String? = null
)
@Serializable
data class A2AContextBinding(
val sourceHostId: HermesHostId,
val targetHostId: HermesHostId,
val contextId: String
)
data class HostGatewayEvent(
val hostId: HermesHostId,
val event: GatewayEvent

17
app/src/main/java/app/hermes/mobile/core/model/SessionModels.kt
View file

@ -3,10 +3,12 @@ package app.hermes.mobile.core.model
import kotlinx.serialization.Serializable
@Serializable
data class DurableSessionId(val value: String)
@JvmInline
value class DurableSessionId(val value: String)
@Serializable
data class RuntimeSessionId(val value: String)
@JvmInline
value class RuntimeSessionId(val value: String)
@Serializable
data class SessionSummary(
@ -43,17 +45,6 @@ data class ToolActivity(
val isError: Boolean = false
)
@Serializable
data class HermesMessage(
val id: String,
val role: MessageRole,
val content: String,
val thinking: String? = null,
val tools: List<ToolActivity> = emptyList(),
val isStreaming: Boolean = false,
val timestamp: Long = System.currentTimeMillis()
)
@Serializable
data class HermesApproval(
val requestId: String,

72
app/src/main/java/app/hermes/mobile/core/repository/ConnectionRepository.kt
View file

@ -1,72 +0,0 @@
package app.hermes.mobile.core.repository
import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import app.hermes.mobile.core.model.HermesConnection
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.flow.map
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "hermes_connections")
class ConnectionRepository(
private val context: Context
) {
private val json = Json { ignoreUnknownKeys = true }
private val connectionsKey = stringPreferencesKey("saved_connections")
val connections: Flow<List<HermesConnection>> = context.dataStore.data.map { preferences ->
val raw = preferences[connectionsKey] ?: return@map emptyList()
try {
json.decodeFromString<List<HermesConnection>>(raw)
} catch (e: Exception) {
emptyList()
}
}
suspend fun saveConnection(connection: HermesConnection) {
context.dataStore.edit { preferences ->
val raw = preferences[connectionsKey]
val currentList = if (!raw.isNullOrEmpty()) {
try {
json.decodeFromString<List<HermesConnection>>(raw).toMutableList()
} catch (e: Exception) {
mutableListOf()
}
} else {
mutableListOf()
}
val index = currentList.indexOfFirst { it.id == connection.id }
if (index >= 0) {
currentList[index] = connection
} else {
currentList.add(connection)
}
preferences[connectionsKey] = json.encodeToString(currentList)
}
}
suspend fun removeConnection(connectionId: String) {
context.dataStore.edit { preferences ->
val raw = preferences[connectionsKey] ?: return@edit
try {
val currentList = json.decodeFromString<List<HermesConnection>>(raw).toMutableList()
currentList.removeAll { it.id == connectionId }
preferences[connectionsKey] = json.encodeToString(currentList)
} catch (_: Exception) {
}
}
}
suspend fun getConnection(connectionId: String): HermesConnection? {
return connections.firstOrNull()?.find { it.id == connectionId }
}
}

553
app/src/main/java/app/hermes/mobile/core/repository/HermesGatewayRepository.kt
View file

@ -1,553 +0,0 @@
package app.hermes.mobile.core.repository
import app.hermes.mobile.core.model.*
import app.hermes.mobile.core.network.ConnectionState
import app.hermes.mobile.core.network.HermesRestClient
import app.hermes.mobile.core.network.JsonRpcGatewayClient
import app.hermes.mobile.core.security.TokenVault
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import java.io.IOException
import java.util.UUID
import kotlin.math.min
import kotlin.random.Random
class HermesGatewayRepository(
val restClient: HermesRestClient,
val gatewayClient: JsonRpcGatewayClient,
val tokenVault: TokenVault,
private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
) {
private val _activeConnection = MutableStateFlow<HermesConnection?>(null)
val activeConnection: StateFlow<HermesConnection?> = _activeConnection.asStateFlow()
private val _serverStatus = MutableStateFlow<HermesServerStatus?>(null)
val serverStatus: StateFlow<HermesServerStatus?> = _serverStatus.asStateFlow()
val connectionState: StateFlow<ConnectionState> = gatewayClient.connectionState
private val _activeDurableId = MutableStateFlow<DurableSessionId?>(null)
val activeDurableId: StateFlow<DurableSessionId?> = _activeDurableId.asStateFlow()
private val _activeRuntimeId = MutableStateFlow<RuntimeSessionId?>(null)
val activeRuntimeId: StateFlow<RuntimeSessionId?> = _activeRuntimeId.asStateFlow()
private val _messages = MutableStateFlow<List<HermesMessage>>(emptyList())
val messages: StateFlow<List<HermesMessage>> = _messages.asStateFlow()
private val _activeApprovals = MutableStateFlow<List<HermesApproval>>(emptyList())
val activeApprovals: StateFlow<List<HermesApproval>> = _activeApprovals.asStateFlow()
private val _activeClarify = MutableStateFlow<HermesClarifyRequest?>(null)
val activeClarify: StateFlow<HermesClarifyRequest?> = _activeClarify.asStateFlow()
private val _sessionInfo = MutableStateFlow<SessionInfo?>(null)
val sessionInfo: StateFlow<SessionInfo?> = _sessionInfo.asStateFlow()
private val _isExecuting = MutableStateFlow(false)
val isExecuting: StateFlow<Boolean> = _isExecuting.asStateFlow()
private var reconnectJob: Job? = null
private var autoReconnectEnabled = true
private var reconnectAttempt = 0
init {
scope.launch {
gatewayClient.events.collect { event ->
handleGatewayEvent(event)
}
}
scope.launch {
gatewayClient.connectionState.collect { state ->
when (state) {
is ConnectionState.Connected -> {
reconnectAttempt = 0
reconnectJob?.cancel()
// Re-resume session if we had an active durable session
val durable = _activeDurableId.value
if (durable != null) {
try {
val resumeRes = gatewayClient.resumeSession(durable)
_activeRuntimeId.value = resumeRes.runtimeId
} catch (_: Exception) {
}
}
}
is ConnectionState.AuthExpired -> {
autoReconnectEnabled = false
reconnectJob?.cancel()
}
is ConnectionState.Disconnected, is ConnectionState.Failed -> {
if (autoReconnectEnabled && _activeConnection.value != null) {
scheduleReconnect()
}
}
else -> {}
}
}
}
}
private fun scheduleReconnect() {
if (reconnectJob?.isActive == true) return
reconnectJob = scope.launch {
val baseDelay = min(30_000L, (1000L * (1 shl min(reconnectAttempt, 5))))
val jitter = Random.nextLong(0, 1000)
val totalDelay = baseDelay + jitter
reconnectAttempt++
delay(totalDelay)
val connection = _activeConnection.value ?: return@launch
try {
connectInternal(connection)
} catch (_: Exception) {
// Retry will be scheduled on next disconnect/failure
}
}
}
suspend fun checkStatus(connection: HermesConnection): Result<HermesServerStatus> {
val result = restClient.getStatus(connection.baseUrl, connection.allowCleartext)
if (result.isSuccess) {
_serverStatus.value = result.getOrNull()
}
return result
}
suspend fun connect(connection: HermesConnection): Result<Unit> {
autoReconnectEnabled = true
_activeConnection.value = connection
return connectInternal(connection)
}
private suspend fun connectInternal(connection: HermesConnection): Result<Unit> {
return try {
val statusResult = restClient.getStatus(connection.baseUrl, connection.allowCleartext)
val status = statusResult.getOrNull() ?: HermesServerStatus()
_serverStatus.value = status
var ticket: String? = null
if (status.authRequired) {
var tokens = tokenVault.getTokens(connection.id)
?: return Result.failure(IllegalStateException("Authentication required for this server"))
val nowSeconds = System.currentTimeMillis() / 1000
val isExpiring = tokens.expiresAt > 0 && nowSeconds >= (tokens.expiresAt - 60)
if (isExpiring && tokens.refreshToken.isNotEmpty()) {
val refreshRes = restClient.refreshNativeToken(
baseUrl = connection.baseUrl,
refreshToken = tokens.refreshToken,
provider = tokens.provider,
allowCleartext = connection.allowCleartext
)
if (refreshRes.isSuccess) {
val newTokens = refreshRes.getOrThrow()
tokenVault.saveTokens(connection.id, newTokens)
tokens = newTokens
} else {
val err = refreshRes.exceptionOrNull()
val errMsg = err?.message ?: ""
if (errMsg.contains("401") || errMsg.contains("session_expired") || errMsg.contains("invalid_grant")) {
tokenVault.clearTokens(connection.id)
gatewayClient.setAuthExpired("Session expired. Please sign in again.")
return Result.failure(IllegalStateException("Session expired. Please sign in again."))
}
}
}
var ticketResult = restClient.mintWsTicket(
baseUrl = connection.baseUrl,
accessToken = tokens.accessToken,
allowCleartext = connection.allowCleartext
)
if (ticketResult.isFailure) {
val err = ticketResult.exceptionOrNull()
val errMsg = err?.message ?: ""
if (errMsg.contains("401") && tokens.refreshToken.isNotEmpty()) {
val refreshRes = restClient.refreshNativeToken(
baseUrl = connection.baseUrl,
refreshToken = tokens.refreshToken,
provider = tokens.provider,
allowCleartext = connection.allowCleartext
)
if (refreshRes.isSuccess) {
val newTokens = refreshRes.getOrThrow()
tokenVault.saveTokens(connection.id, newTokens)
tokens = newTokens
ticketResult = restClient.mintWsTicket(
baseUrl = connection.baseUrl,
accessToken = tokens.accessToken,
allowCleartext = connection.allowCleartext
)
} else {
tokenVault.clearTokens(connection.id)
gatewayClient.setAuthExpired("Session expired. Please sign in again.")
return Result.failure(IllegalStateException("Session expired. Please sign in again."))
}
}
if (ticketResult.isFailure) {
val finalErr = ticketResult.exceptionOrNull()
if (finalErr?.message?.contains("401") == true) {
tokenVault.clearTokens(connection.id)
gatewayClient.setAuthExpired("Session expired. Please sign in again.")
return Result.failure(IllegalStateException("Session expired. Please sign in again."))
}
return Result.failure(
finalErr ?: IOException("Failed to mint WebSocket ticket")
)
}
}
ticket = ticketResult.getOrNull()
}
val wsUrl = convertHttpToWsUrl(connection.baseUrl)
gatewayClient.connect(
wsUrl = wsUrl,
ticket = ticket,
allowCleartext = connection.allowCleartext
)
Result.success(Unit)
} catch (e: Exception) {
Result.failure(e)
}
}
fun disconnect() {
autoReconnectEnabled = false
reconnectJob?.cancel()
gatewayClient.disconnect()
_activeConnection.value = null
_activeDurableId.value = null
_activeRuntimeId.value = null
_messages.value = emptyList()
_activeApprovals.value = emptyList()
_activeClarify.value = null
_isExecuting.value = false
}
private fun convertHttpToWsUrl(baseUrl: String): String {
val trimmed = baseUrl.trim().trimEnd('/')
val wsBase = when {
trimmed.startsWith("https://", ignoreCase = true) -> "wss://" + trimmed.substring(8)
trimmed.startsWith("http://", ignoreCase = true) -> "ws://" + trimmed.substring(7)
trimmed.startsWith("wss://", ignoreCase = true) || trimmed.startsWith("ws://", ignoreCase = true) -> trimmed
else -> "ws://$trimmed"
}
return when {
wsBase.endsWith("/api/ws") -> wsBase
wsBase.endsWith("/ws") -> wsBase.removeSuffix("/ws") + "/api/ws"
else -> "$wsBase/api/ws"
}
}
suspend fun listSessions(limit: Int = 200): List<SessionSummary> {
return gatewayClient.listSessions(limit)
}
suspend fun startNewSession(): CreateSessionResult {
val result = gatewayClient.createSession(source = "android")
_activeDurableId.value = result.durableId
_activeRuntimeId.value = result.runtimeId
_messages.value = emptyList()
_activeApprovals.value = emptyList()
_activeClarify.value = null
_isExecuting.value = false
return result
}
suspend fun openSession(durableId: DurableSessionId): ResumeSessionResult {
val result = gatewayClient.resumeSession(durableId, source = "android")
_activeDurableId.value = result.durableId
_activeRuntimeId.value = result.runtimeId
_messages.value = emptyList()
_activeApprovals.value = emptyList()
_activeClarify.value = null
_isExecuting.value = false
return result
}
suspend fun sendUserPrompt(text: String): PromptSubmitResult {
val runtimeId = _activeRuntimeId.value
?: throw IllegalStateException("No active runtime session")
val userMessage = HermesMessage(
id = UUID.randomUUID().toString(),
role = MessageRole.USER,
content = text,
isStreaming = false
)
_messages.value = _messages.value + userMessage
_isExecuting.value = true
return try {
val result = gatewayClient.submitPrompt(runtimeId, text)
result
} catch (e: Exception) {
_isExecuting.value = false
throw e
}
}
suspend fun interruptSession(): Boolean {
val runtimeId = _activeRuntimeId.value ?: return false
val success = gatewayClient.interruptSession(runtimeId)
if (success) {
_isExecuting.value = false
}
return success
}
suspend fun respondApproval(requestId: String, choice: String, all: Boolean = false): Boolean {
val sessionKey = _activeRuntimeId.value?.value ?: _activeDurableId.value?.value ?: ""
val success = gatewayClient.respondApproval(sessionKey, requestId, choice, all)
if (success) {
_activeApprovals.value = _activeApprovals.value.filterNot { it.requestId == requestId }
}
return success
}
suspend fun respondClarify(requestId: String, answer: String, questionId: String? = null): Boolean {
val success = gatewayClient.respondClarify(requestId, answer, questionId)
if (success) {
_activeClarify.value = null
}
return success
}
suspend fun respondSudo(requestId: String, password: String): Boolean {
val success = gatewayClient.respondSudo(requestId, password)
if (success) {
_activeClarify.value = null
}
return success
}
suspend fun respondSecret(requestId: String, value: String): Boolean {
val success = gatewayClient.respondSecret(requestId, value)
if (success) {
_activeClarify.value = null
}
return success
}
private fun handleGatewayEvent(event: GatewayEvent) {
when (event) {
is GatewayEvent.MessageStartEvent -> {
_isExecuting.value = true
val existing = _messages.value.find { it.id == event.messageId }
if (existing == null) {
val role = if (event.role.equals("user", ignoreCase = true)) MessageRole.USER else MessageRole.ASSISTANT
val newMsg = HermesMessage(
id = event.messageId,
role = role,
content = "",
isStreaming = true
)
_messages.value = _messages.value + newMsg
}
}
is GatewayEvent.MessageDeltaEvent -> {
_isExecuting.value = true
val list = _messages.value.toMutableList()
val idx = list.indexOfFirst { it.id == event.messageId }
if (idx >= 0) {
val current = list[idx]
list[idx] = current.copy(
content = current.content + event.delta,
isStreaming = true
)
_messages.value = list
} else {
// Message wasn't explicitly started, create streaming assistant message
val newMsg = HermesMessage(
id = event.messageId,
role = MessageRole.ASSISTANT,
content = event.delta,
isStreaming = true
)
_messages.value = list + newMsg
}
}
is GatewayEvent.MessageInterimEvent -> {
val list = _messages.value.toMutableList()
val idx = list.indexOfFirst { it.id == event.messageId }
if (idx >= 0) {
list[idx] = list[idx].copy(content = event.content, isStreaming = true)
_messages.value = list
}
}
is GatewayEvent.MessageCompleteEvent -> {
_isExecuting.value = false
val list = _messages.value.toMutableList()
val idx = list.indexOfFirst { it.id == event.messageId }
if (idx >= 0) {
list[idx] = list[idx].copy(
content = if (event.content.isNotEmpty()) event.content else list[idx].content,
isStreaming = false
)
_messages.value = list
} else if (event.content.isNotEmpty()) {
val newMsg = HermesMessage(
id = event.messageId,
role = MessageRole.ASSISTANT,
content = event.content,
isStreaming = false
)
_messages.value = list + newMsg
}
}
is GatewayEvent.ThinkingDeltaEvent -> {
val list = _messages.value.toMutableList()
val idx = list.indexOfLast { it.role == MessageRole.ASSISTANT }
if (idx >= 0) {
val current = list[idx]
list[idx] = current.copy(
thinking = (current.thinking ?: "") + event.delta
)
_messages.value = list
}
}
is GatewayEvent.ReasoningDeltaEvent -> {
val list = _messages.value.toMutableList()
val idx = list.indexOfLast { it.role == MessageRole.ASSISTANT }
if (idx >= 0) {
val current = list[idx]
list[idx] = current.copy(
thinking = (current.thinking ?: "") + event.delta
)
_messages.value = list
}
}
is GatewayEvent.ReasoningAvailableEvent -> {
val list = _messages.value.toMutableList()
val idx = list.indexOfLast { it.role == MessageRole.ASSISTANT }
if (idx >= 0) {
val current = list[idx]
list[idx] = current.copy(thinking = event.reasoning)
_messages.value = list
}
}
is GatewayEvent.ToolStartEvent -> {
val tool = ToolActivity(
id = event.toolId,
name = event.name,
status = "running"
)
attachToolToLastAssistantMessage(tool)
}
is GatewayEvent.ToolProgressEvent -> {
updateToolInLastAssistantMessage(event.toolId) { it.copy(progress = event.progress) }
}
is GatewayEvent.ToolGeneratingEvent -> {
updateToolInLastAssistantMessage(event.toolId) { it.copy(status = "generating") }
}
is GatewayEvent.ToolCompleteEvent -> {
updateToolInLastAssistantMessage(event.toolId) {
it.copy(
status = if (event.isError) "failed" else "completed",
result = event.result,
isError = event.isError
)
}
}
is GatewayEvent.ApprovalRequestEvent -> {
val approval = HermesApproval(
requestId = event.requestId,
command = event.command,
description = event.description,
choices = event.choices
)
_activeApprovals.value = _activeApprovals.value.filterNot { it.requestId == event.requestId } + approval
}
is GatewayEvent.ClarifyRequestEvent -> {
_activeClarify.value = HermesClarifyRequest(
requestId = event.requestId,
questionId = event.questionId,
question = event.question,
promptType = ClarifyType.CLARIFY
)
}
is GatewayEvent.SudoRequestEvent -> {
_activeClarify.value = HermesClarifyRequest(
requestId = event.requestId,
question = event.question,
promptType = ClarifyType.SUDO
)
}
is GatewayEvent.SecretRequestEvent -> {
_activeClarify.value = HermesClarifyRequest(
requestId = event.requestId,
question = event.question,
promptType = ClarifyType.SECRET
)
}
is GatewayEvent.SessionInfoEvent -> {
_sessionInfo.value = event.info
}
is GatewayEvent.ErrorEvent -> {
_isExecuting.value = false
}
else -> {}
}
}
private fun attachToolToLastAssistantMessage(tool: ToolActivity) {
val list = _messages.value.toMutableList()
val idx = list.indexOfLast { it.role == MessageRole.ASSISTANT }
if (idx >= 0) {
val current = list[idx]
val updatedTools = current.tools.filterNot { it.id == tool.id } + tool
list[idx] = current.copy(tools = updatedTools)
_messages.value = list
} else {
// Create a message containing this tool
val newMsg = HermesMessage(
id = UUID.randomUUID().toString(),
role = MessageRole.ASSISTANT,
content = "",
tools = listOf(tool),
isStreaming = true
)
_messages.value = list + newMsg
}
}
private fun updateToolInLastAssistantMessage(toolId: String, transform: (ToolActivity) -> ToolActivity) {
val list = _messages.value.toMutableList()
val idx = list.indexOfLast { msg -> msg.tools.any { it.id == toolId } }
if (idx >= 0) {
val current = list[idx]
val updatedTools = current.tools.map { if (it.id == toolId) transform(it) else it }
list[idx] = current.copy(tools = updatedTools)
_messages.value = list
}
}
}

3
app/src/main/java/app/hermes/mobile/core/security/TokenVault.kt
View file

@ -15,9 +15,6 @@ interface TokenVault {
fun getTokens(hostId: String): NativeAuthTokens?
fun clearTokens(hostId: String)
fun getAllHostIds(): Set<String>
// Backwards-compatible aliases
fun getAllConnectionIds(): Set<String> = getAllHostIds()
}
class EncryptedTokenVault(private val context: Context) : TokenVault {

16
app/src/main/java/app/hermes/mobile/core/storage/Daos.kt
View file

@ -192,6 +192,22 @@ interface UnifiedSessionDao {
@Query("UPDATE host_bindings SET state = :state WHERE sessionId = :sessionId AND hostId = :hostId")
suspend fun updateBindingState(sessionId: String, hostId: String, state: String)
@Query("DELETE FROM unified_messages")
suspend fun deleteAllMessages()
@Query("DELETE FROM host_bindings")
suspend fun deleteAllBindings()
@Query("DELETE FROM unified_sessions")
suspend fun deleteAllSessions()
@Transaction
suspend fun clearAllLocalCache() {
deleteAllMessages()
deleteAllBindings()
deleteAllSessions()
}
}
@Dao

10
app/src/main/java/app/hermes/mobile/core/storage/HermesDatabase.kt
View file

@ -67,15 +67,5 @@ abstract class HermesDatabase : RoomDatabase() {
instance
}
}
fun createInMemory(context: Context): HermesDatabase {
return Room.inMemoryDatabaseBuilder(
context.applicationContext,
HermesDatabase::class.java
)
.addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4)
.allowMainThreadQueries()
.build()
}
}
}

4
app/src/main/java/app/hermes/mobile/core/storage/MigrationHelper.kt
View file

@ -6,12 +6,14 @@ import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore
import app.hermes.mobile.core.model.HermesConnection
import app.hermes.mobile.core.model.HostStatus
import app.hermes.mobile.core.repository.dataStore
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.serialization.json.Json
val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "hermes_connections")
object MigrationHelper {
private val json = Json { ignoreUnknownKeys = true }
private val connectionsKey = stringPreferencesKey("saved_connections")

11
app/src/main/java/app/hermes/mobile/feature/chat/ApprovalCard.kt
View file

@ -36,6 +36,9 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import app.hermes.mobile.core.model.HostAttributedApproval
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
@Composable
fun ApprovalCard(
attributedApproval: HostAttributedApproval,
@ -68,7 +71,7 @@ fun ApprovalCard(
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = "Authorization Required",
text = stringResource(R.string.authorization_required),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold,
color = Color(0xFFF59E0B)
@ -148,7 +151,7 @@ fun ApprovalCard(
),
shape = RoundedCornerShape(8.dp)
) {
Text("Deny", fontWeight = FontWeight.Bold)
Text(stringResource(R.string.deny), fontWeight = FontWeight.Bold)
}
Spacer(modifier = Modifier.width(8.dp))
@ -157,7 +160,7 @@ fun ApprovalCard(
onClick = { onRespond("once", false) },
shape = RoundedCornerShape(8.dp)
) {
Text("Allow Once")
Text(stringResource(R.string.allow_once))
}
Spacer(modifier = Modifier.width(8.dp))
@ -169,7 +172,7 @@ fun ApprovalCard(
),
shape = RoundedCornerShape(8.dp)
) {
Text("Allow Always", fontWeight = FontWeight.Bold)
Text(stringResource(R.string.allow_always), fontWeight = FontWeight.Bold)
}
}
}

52
app/src/main/java/app/hermes/mobile/feature/chat/ChatScreen.kt
View file

@ -74,6 +74,9 @@ import app.hermes.mobile.core.model.ToolActivity
import app.hermes.mobile.core.model.UnifiedMessage
import app.hermes.mobile.core.model.UnifiedMessageSource
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
@ -96,6 +99,7 @@ fun ChatScreen(
val activeHost = hosts.find { it.id == currentSession?.activeHostId }
val listState = rememberLazyListState()
val snackbarHostState = remember { SnackbarHostState() }
val retryLabel = stringResource(R.string.retry)
val errorMessage = uiState.error
LaunchedEffect(errorMessage) {
@ -103,7 +107,7 @@ fun ChatScreen(
val sanitized = sanitizeErrorMessage(errorMessage)
val result = snackbarHostState.showSnackbar(
message = sanitized,
actionLabel = "Retry",
actionLabel = retryLabel,
duration = SnackbarDuration.Short
)
if (result == SnackbarResult.ActionPerformed) {
@ -146,7 +150,7 @@ fun ChatScreen(
title = {
Column {
Text(
text = currentSession?.title?.ifEmpty { "Unified Chat" } ?: "Unified Chat",
text = currentSession?.title?.ifEmpty { stringResource(R.string.unified_chat) } ?: stringResource(R.string.unified_chat),
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
maxLines = 1,
@ -171,7 +175,7 @@ fun ChatScreen(
)
Spacer(modifier = Modifier.width(4.dp))
Text(
text = activeHost?.displayName ?: "Select Host",
text = activeHost?.displayName ?: stringResource(R.string.select_host),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
fontWeight = FontWeight.SemiBold
@ -179,7 +183,7 @@ fun ChatScreen(
Spacer(modifier = Modifier.width(2.dp))
Icon(
Icons.Default.ExpandMore,
contentDescription = "Switch Host",
contentDescription = stringResource(R.string.switch_host),
modifier = Modifier.size(14.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -216,7 +220,7 @@ fun ChatScreen(
},
navigationIcon = {
IconButton(onClick = onNavigateBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
}
},
actions = {
@ -228,9 +232,9 @@ fun ChatScreen(
contentPadding = PaddingValues(horizontal = 10.dp, vertical = 4.dp),
modifier = Modifier.padding(end = 8.dp)
) {
Icon(Icons.Default.Stop, contentDescription = null, modifier = Modifier.size(16.dp))
Icon(Icons.Default.Stop, contentDescription = stringResource(R.string.stop), modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(4.dp))
Text("Stop", fontSize = 12.sp, fontWeight = FontWeight.Bold)
Text(stringResource(R.string.stop), fontSize = 12.sp, fontWeight = FontWeight.Bold)
}
}
}
@ -311,7 +315,7 @@ fun ChatScreen(
Spacer(modifier = Modifier.width(8.dp))
val hostLabel = activeHost?.displayName ?: "Hermes"
Text(
"$hostLabel is thinking…",
text = stringResource(R.string.host_thinking_format, hostLabel),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -344,12 +348,12 @@ fun HostStatusChip(
onStop: () -> Unit
) {
val statusText = when {
isRunning -> "Running"
isActive -> "Active"
host.lastKnownStatus == HostStatus.ONLINE -> "Online"
host.lastKnownStatus == HostStatus.CONNECTING -> "Connecting"
host.lastKnownStatus == HostStatus.AUTH_EXPIRED -> "Auth Expired"
else -> "Offline"
isRunning -> stringResource(R.string.status_running)
isActive -> stringResource(R.string.status_active)
host.lastKnownStatus == HostStatus.ONLINE -> stringResource(R.string.status_online)
host.lastKnownStatus == HostStatus.CONNECTING -> stringResource(R.string.status_connecting)
host.lastKnownStatus == HostStatus.AUTH_EXPIRED -> stringResource(R.string.status_auth_expired)
else -> stringResource(R.string.status_offline)
}
val chipBg = when {
@ -358,12 +362,6 @@ fun HostStatusChip(
else -> MaterialTheme.colorScheme.surface
}
val chipBorder = when {
isRunning -> Color(0xFFF59E0B)
isActive -> Color(0xFF38BDF8)
else -> Color(0xFF475569)
}
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
@ -412,7 +410,7 @@ fun HostStatusChip(
) {
Icon(
Icons.Default.Stop,
contentDescription = "Stop Host",
contentDescription = stringResource(R.string.stop_host),
tint = Color.White,
modifier = Modifier.size(10.dp)
)
@ -565,7 +563,7 @@ fun ThinkingSection(thinking: String) {
)
Spacer(modifier = Modifier.width(6.dp))
Text(
"Reasoning & Thoughts",
stringResource(R.string.reasoning_and_thoughts),
style = MaterialTheme.typography.labelSmall,
fontWeight = FontWeight.Bold,
color = Color(0xFFF59E0B)
@ -635,7 +633,7 @@ fun ToolActivityCard(tool: ToolActivity) {
color = Color(0xFF38BDF8)
)
Spacer(modifier = Modifier.width(4.dp))
Text("Running", fontSize = 10.sp, color = Color(0xFF38BDF8))
Text(stringResource(R.string.status_running), fontSize = 10.sp, color = Color(0xFF38BDF8))
} else if (isCompleted) {
Icon(
Icons.Default.CheckCircle,
@ -644,7 +642,7 @@ fun ToolActivityCard(tool: ToolActivity) {
modifier = Modifier.size(12.dp)
)
Spacer(modifier = Modifier.width(4.dp))
Text("Done", fontSize = 10.sp, color = Color(0xFF10B981))
Text(stringResource(R.string.status_done), fontSize = 10.sp, color = Color(0xFF10B981))
}
}
}
@ -698,7 +696,7 @@ fun ChatInputBar(
OutlinedTextField(
value = text,
onValueChange = onTextChange,
placeholder = { Text("Message Hermes…") },
placeholder = { Text(stringResource(R.string.message_hermes_placeholder)) },
maxLines = 5,
shape = RoundedCornerShape(24.dp),
modifier = Modifier
@ -716,7 +714,7 @@ fun ChatInputBar(
) {
Icon(
Icons.Default.Stop,
contentDescription = "Stop",
contentDescription = stringResource(R.string.stop),
tint = Color.White
)
}
@ -734,7 +732,7 @@ fun ChatInputBar(
) {
Icon(
Icons.AutoMirrored.Filled.Send,
contentDescription = "Send",
contentDescription = stringResource(R.string.send),
tint = if (text.isNotBlank()) MaterialTheme.colorScheme.onPrimary
else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f)
)

15
app/src/main/java/app/hermes/mobile/feature/chat/ClarifyDialog.kt
View file

@ -48,6 +48,9 @@ import androidx.compose.ui.unit.sp
import app.hermes.mobile.core.model.ClarifyType
import app.hermes.mobile.core.model.HostAttributedClarify
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
@Composable
fun ClarifyDialog(
attributedClarify: HostAttributedClarify,
@ -79,9 +82,9 @@ fun ClarifyDialog(
}
val title = when (request.promptType) {
ClarifyType.SUDO -> "Sudo Password Required"
ClarifyType.SECRET -> "Secret / API Key Required"
ClarifyType.CLARIFY -> "Clarification Requested"
ClarifyType.SUDO -> stringResource(R.string.sudo_password_required)
ClarifyType.SECRET -> stringResource(R.string.secret_key_required)
ClarifyType.CLARIFY -> stringResource(R.string.clarification_requested)
}
val icon = when (request.promptType) {
@ -135,7 +138,7 @@ fun ClarifyDialog(
onValueChange = { input = it },
label = {
Text(
if (isMasked) "Password / Secret" else "Your Answer"
if (isMasked) stringResource(R.string.password_or_secret) else stringResource(R.string.your_answer)
)
},
visualTransformation = if (isMasked) PasswordVisualTransformation() else VisualTransformation.None,
@ -160,7 +163,7 @@ fun ClarifyDialog(
},
enabled = input.isNotBlank()
) {
Text("Submit")
Text(stringResource(R.string.submit))
}
},
dismissButton = {
@ -170,7 +173,7 @@ fun ClarifyDialog(
onDismiss()
}
) {
Text("Cancel")
Text(stringResource(R.string.cancel))
}
}
)

435
app/src/main/java/app/hermes/mobile/feature/connections/ConnectionsScreen.kt
View file

@ -1,435 +0,0 @@
package app.hermes.mobile.feature.connections
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Error
import androidx.compose.material.icons.filled.Lan
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Security
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import app.hermes.mobile.core.model.HermesConnection
import app.hermes.mobile.core.network.ConnectionState
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ConnectionsScreen(
viewModel: ConnectionsViewModel,
onNavigateToSessions: (String) -> Unit
) {
val context = LocalContext.current
val connections by viewModel.connections.collectAsState()
val activeConn by viewModel.activeConnection.collectAsState()
val connState by viewModel.connectionState.collectAsState()
val uiState by viewModel.uiState.collectAsState()
var showAddDialog by remember { mutableStateOf(false) }
Scaffold(
topBar = {
TopAppBar(
title = { Text("Hermes Connections", fontWeight = FontWeight.Bold) }
)
},
floatingActionButton = {
FloatingActionButton(
onClick = { showAddDialog = true },
containerColor = MaterialTheme.colorScheme.primary
) {
Icon(Icons.Default.Add, contentDescription = "Add Connection")
}
}
) { padding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(padding)
.padding(16.dp)
) {
if (uiState.authError != null) {
Card(
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer),
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp)
) {
Row(
modifier = Modifier.padding(16.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(Icons.Default.Error, contentDescription = null, tint = MaterialTheme.colorScheme.error)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = uiState.authError ?: "",
color = MaterialTheme.colorScheme.onErrorContainer,
style = MaterialTheme.typography.bodyMedium
)
}
}
}
if (connections.isEmpty()) {
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Icon(
Icons.Default.Lan,
contentDescription = null,
modifier = Modifier.size(64.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
)
Spacer(modifier = Modifier.height(16.dp))
Text(
"No connections configured",
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(8.dp))
Text(
"Tap '+' to connect to a Hermes host instance.",
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)
}
}
} else {
LazyColumn(
verticalArrangement = Arrangement.spacedBy(12.dp),
modifier = Modifier.fillMaxSize()
) {
items(connections, key = { it.id }) { conn ->
val isConnected = activeConn?.id == conn.id && connState is ConnectionState.Connected
val isAuthenticated = viewModel.isConnectionAuthenticated(conn.id)
ConnectionCard(
connection = conn,
isConnected = isConnected,
isAuthenticated = isAuthenticated,
isAuthenticating = uiState.isAuthenticating,
onConnect = {
viewModel.connectTo(conn) {
onNavigateToSessions(conn.id)
}
},
onSignIn = {
viewModel.startSignIn(context, conn) {
viewModel.connectTo(conn) {
onNavigateToSessions(conn.id)
}
}
},
onDelete = {
viewModel.removeConnection(conn.id)
}
)
}
}
}
}
if (showAddDialog) {
AddConnectionDialog(
uiState = uiState,
onDismiss = { showAddDialog = false },
onTest = { url, cleartext ->
viewModel.testConnection(url, cleartext)
},
onSave = { name, url, cleartext ->
viewModel.saveConnection(name, url, cleartext)
showAddDialog = false
}
)
}
}
}
@Composable
fun ConnectionCard(
connection: HermesConnection,
isConnected: Boolean,
isAuthenticated: Boolean,
isAuthenticating: Boolean,
onConnect: () -> Unit,
onSignIn: () -> Unit,
onDelete: () -> Unit
) {
Card(
shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors(
containerColor = if (isConnected) MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.3f)
else MaterialTheme.colorScheme.surfaceVariant
),
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.padding(16.dp)) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.weight(1f)) {
Text(
text = connection.name,
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold
)
Text(
text = connection.baseUrl,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
Row(verticalAlignment = Alignment.CenterVertically) {
if (connection.allowCleartext) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(Color(0xFFF59E0B).copy(alpha = 0.2f))
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text("LAN / HTTP", fontSize = 10.sp, color = Color(0xFFD97706), fontWeight = FontWeight.Bold)
}
Spacer(modifier = Modifier.width(6.dp))
}
IconButton(onClick = onDelete) {
Icon(Icons.Default.Delete, contentDescription = "Delete", tint = MaterialTheme.colorScheme.error)
}
}
}
Spacer(modifier = Modifier.height(12.dp))
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
Row(verticalAlignment = Alignment.CenterVertically) {
val badgeColor = when {
isConnected -> Color(0xFF10B981)
isAuthenticated -> Color(0xFF38BDF8)
else -> Color(0xFF94A3B8)
}
val badgeText = when {
isConnected -> "Connected"
isAuthenticated -> "Ready (Auth Saved)"
else -> "Configured"
}
Box(
modifier = Modifier
.size(8.dp)
.clip(CircleShape)
.background(badgeColor)
)
Spacer(modifier = Modifier.width(6.dp))
Text(badgeText, style = MaterialTheme.typography.bodySmall, color = badgeColor, fontWeight = FontWeight.Medium)
}
Row {
OutlinedButton(
onClick = onSignIn,
enabled = !isAuthenticating,
shape = RoundedCornerShape(8.dp)
) {
if (isAuthenticating) {
CircularProgressIndicator(modifier = Modifier.size(14.dp), strokeWidth = 2.dp)
Spacer(modifier = Modifier.width(4.dp))
} else {
Icon(Icons.Default.Lock, contentDescription = null, modifier = Modifier.size(14.dp))
Spacer(modifier = Modifier.width(4.dp))
}
Text("Sign In", fontSize = 12.sp)
}
Spacer(modifier = Modifier.width(8.dp))
Button(
onClick = onConnect,
shape = RoundedCornerShape(8.dp)
) {
Text(if (isConnected) "Open" else "Connect", fontSize = 12.sp)
}
}
}
}
}
}
@Composable
fun AddConnectionDialog(
uiState: ConnectionUiState,
onDismiss: () -> Unit,
onTest: (String, Boolean) -> Unit,
onSave: (String, String, Boolean) -> Unit
) {
var name by remember { mutableStateOf("") }
var baseUrl by remember { mutableStateOf("http://10.0.2.2:9119") }
var allowCleartext by remember { mutableStateOf(true) }
AlertDialog(
onDismissRequest = onDismiss,
title = { Text("Add Host Connection", fontWeight = FontWeight.Bold) },
text = {
Column(modifier = Modifier.fillMaxWidth()) {
OutlinedTextField(
value = name,
onValueChange = { name = it },
label = { Text("Friendly Name (e.g. Workstation)") },
singleLine = true,
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(10.dp))
OutlinedTextField(
value = baseUrl,
onValueChange = { baseUrl = it },
label = { Text("Server Base URL (http://... or https://...)") },
singleLine = true,
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(12.dp))
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.weight(1f)) {
Text("Allow Cleartext HTTP (LAN)", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
Text(
"Required for local IP connections without TLS.",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
Switch(
checked = allowCleartext,
onCheckedChange = { allowCleartext = it }
)
}
if (allowCleartext) {
Spacer(modifier = Modifier.height(8.dp))
Text(
"⚠️ Security Notice: Unencrypted traffic may be intercepted on untrusted networks.",
style = MaterialTheme.typography.bodySmall,
color = Color(0xFFD97706)
)
}
Spacer(modifier = Modifier.height(12.dp))
// Test Connection Button & Status
OutlinedButton(
onClick = { onTest(baseUrl, allowCleartext) },
enabled = !uiState.isTesting && baseUrl.isNotBlank(),
modifier = Modifier.fillMaxWidth()
) {
if (uiState.isTesting) {
CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
Spacer(modifier = Modifier.width(8.dp))
Text("Testing...")
} else {
Icon(Icons.Default.Refresh, contentDescription = null, modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(8.dp))
Text("Test Connection (/api/status)")
}
}
if (uiState.testStatus != null) {
Spacer(modifier = Modifier.height(8.dp))
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.CheckCircle, contentDescription = null, tint = Color(0xFF10B981), modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(6.dp))
Text(
"Status OK (v${uiState.testStatus.version ?: "1.0"}, Auth: ${if (uiState.testStatus.authRequired) "Required" else "None"})",
style = MaterialTheme.typography.bodySmall,
color = Color(0xFF10B981)
)
}
}
if (uiState.testError != null) {
Spacer(modifier = Modifier.height(8.dp))
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.Error, contentDescription = null, tint = MaterialTheme.colorScheme.error, modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(6.dp))
Text(
uiState.testError ?: "",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.error
)
}
}
}
},
confirmButton = {
Button(
onClick = {
if (baseUrl.isNotBlank()) {
onSave(name, baseUrl, allowCleartext)
}
},
enabled = baseUrl.isNotBlank()
) {
Text("Save")
}
},
dismissButton = {
TextButton(onClick = onDismiss) {
Text("Cancel")
}
}
)
}

122
app/src/main/java/app/hermes/mobile/feature/connections/ConnectionsViewModel.kt
View file

@ -1,122 +0,0 @@
package app.hermes.mobile.feature.connections
import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import app.hermes.mobile.core.auth.PkceLoopbackAuthManager
import app.hermes.mobile.core.model.HermesConnection
import app.hermes.mobile.core.model.HermesServerStatus
import app.hermes.mobile.core.repository.ConnectionRepository
import app.hermes.mobile.core.repository.HermesGatewayRepository
import app.hermes.mobile.core.security.TokenVault
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
data class ConnectionUiState(
val isTesting: Boolean = false,
val testStatus: HermesServerStatus? = null,
val testError: String? = null,
val isAuthenticating: Boolean = false,
val authError: String? = null
)
class ConnectionsViewModel(
private val connectionRepo: ConnectionRepository,
private val gatewayRepo: HermesGatewayRepository,
private val tokenVault: TokenVault,
private val pkceAuthManager: PkceLoopbackAuthManager
) : ViewModel() {
val connections: StateFlow<List<HermesConnection>> = connectionRepo.connections
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
val activeConnection = gatewayRepo.activeConnection
val connectionState = gatewayRepo.connectionState
private val _uiState = MutableStateFlow(ConnectionUiState())
val uiState: StateFlow<ConnectionUiState> = _uiState.asStateFlow()
fun isConnectionAuthenticated(connectionId: String): Boolean {
return tokenVault.getTokens(connectionId) != null
}
fun saveConnection(name: String, baseUrl: String, allowCleartext: Boolean) {
viewModelScope.launch {
val connection = HermesConnection(
name = name.ifBlank { baseUrl },
baseUrl = baseUrl.trim(),
allowCleartext = allowCleartext
)
connectionRepo.saveConnection(connection)
}
}
fun removeConnection(connectionId: String) {
viewModelScope.launch {
tokenVault.clearTokens(connectionId)
connectionRepo.removeConnection(connectionId)
}
}
fun testConnection(baseUrl: String, allowCleartext: Boolean) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isTesting = true, testError = null, testStatus = null)
val result = gatewayRepo.restClient.getStatus(baseUrl, allowCleartext)
if (result.isSuccess) {
_uiState.value = _uiState.value.copy(
isTesting = false,
testStatus = result.getOrNull(),
testError = null
)
} else {
_uiState.value = _uiState.value.copy(
isTesting = false,
testError = result.exceptionOrNull()?.localizedMessage ?: "Connection failed"
)
}
}
}
fun startSignIn(context: Context, connection: HermesConnection, provider: String = "github", onComplete: () -> Unit) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isAuthenticating = true, authError = null)
val result = pkceAuthManager.startAuthFlow(
context = context,
connectionId = connection.id,
baseUrl = connection.baseUrl,
provider = provider,
allowCleartext = connection.allowCleartext
)
if (result.isSuccess) {
_uiState.value = _uiState.value.copy(isAuthenticating = false, authError = null)
onComplete()
} else {
_uiState.value = _uiState.value.copy(
isAuthenticating = false,
authError = result.exceptionOrNull()?.localizedMessage ?: "Authentication failed"
)
}
}
}
fun connectTo(connection: HermesConnection, onSuccess: () -> Unit) {
viewModelScope.launch {
val result = gatewayRepo.connect(connection)
if (result.isSuccess) {
onSuccess()
} else {
_uiState.value = _uiState.value.copy(
authError = result.exceptionOrNull()?.localizedMessage ?: "Failed to connect"
)
}
}
}
fun disconnect() {
gatewayRepo.disconnect()
}
}

68
app/src/main/java/app/hermes/mobile/feature/hosts/HostsScreen.kt
View file

@ -61,6 +61,9 @@ import app.hermes.mobile.core.model.HermesHost
import app.hermes.mobile.core.model.HermesHostId
import app.hermes.mobile.core.model.HostStatus
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun HostsScreen(
@ -77,15 +80,15 @@ fun HostsScreen(
Scaffold(
topBar = {
TopAppBar(
title = { Text("Hermes Hosts", fontWeight = FontWeight.Bold) },
title = { Text(stringResource(R.string.hermes_hosts), fontWeight = FontWeight.Bold) },
navigationIcon = {
IconButton(onClick = onNavigateBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
}
},
actions = {
IconButton(onClick = { viewModel.startQrScan() }) {
Icon(Icons.Default.Add, contentDescription = "Scan QR")
Icon(Icons.Default.Add, contentDescription = stringResource(R.string.scan_qr))
}
}
)
@ -95,7 +98,7 @@ fun HostsScreen(
onClick = { showAddDialog = true },
containerColor = MaterialTheme.colorScheme.primary
) {
Icon(Icons.Default.Add, contentDescription = "Add Host")
Icon(Icons.Default.Add, contentDescription = stringResource(R.string.add_host))
}
}
) { padding ->
@ -141,13 +144,13 @@ fun HostsScreen(
)
Spacer(modifier = Modifier.height(16.dp))
Text(
"No Hermes hosts registered",
stringResource(R.string.no_hosts_registered),
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(8.dp))
Text(
"Tap '+' to add a workstation, server, or cloud host.",
stringResource(R.string.no_hosts_hint),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)
@ -179,7 +182,7 @@ fun HostsScreen(
}
}
if (showAddDialog) {
if (showAddDialog) {
AddHostDialog(
uiState = uiState,
onDismiss = { showAddDialog = false },
@ -219,11 +222,11 @@ fun HostsScreen(
if (uiState.qrScanError != null) {
AlertDialog(
onDismissRequest = { viewModel.dismissQrScan() },
title = { Text("QR Scan Error") },
title = { Text(stringResource(R.string.qr_scan_error)) },
text = { Text(uiState.qrScanError ?: "") },
confirmButton = {
TextButton(onClick = { viewModel.dismissQrScan() }) {
Text("OK")
Text(stringResource(R.string.ok))
}
}
)
@ -280,15 +283,15 @@ fun HostCard(
.background(Color(0xFFF59E0B).copy(alpha = 0.2f))
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text("LAN / HTTP", fontSize = 10.sp, color = Color(0xFFD97706), fontWeight = FontWeight.Bold)
Text(stringResource(R.string.lan_http_badge), fontSize = 10.sp, color = Color(0xFFD97706), fontWeight = FontWeight.Bold)
}
Spacer(modifier = Modifier.width(6.dp))
}
IconButton(onClick = onOpenNativeSessions) {
Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = "Native Sessions")
Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = stringResource(R.string.native_sessions))
}
IconButton(onClick = onDelete) {
Icon(Icons.Default.Delete, contentDescription = "Delete", tint = MaterialTheme.colorScheme.error)
Icon(Icons.Default.Delete, contentDescription = stringResource(R.string.delete), tint = MaterialTheme.colorScheme.error)
}
}
}
@ -309,12 +312,12 @@ fun HostCard(
HostStatus.OFFLINE -> Color(0xFF94A3B8)
}
val badgeText = when (host.lastKnownStatus) {
HostStatus.ONLINE -> "Online"
HostStatus.CONNECTING -> "Connecting…"
HostStatus.AUTH_REQUIRED -> "Auth Required"
HostStatus.AUTH_EXPIRED -> "Auth Expired"
HostStatus.ERROR -> "Error"
HostStatus.OFFLINE -> if (isAuthenticated) "Ready (Auth Saved)" else "Offline"
HostStatus.ONLINE -> stringResource(R.string.status_online)
HostStatus.CONNECTING -> stringResource(R.string.status_connecting)
HostStatus.AUTH_REQUIRED -> stringResource(R.string.auth_required_label)
HostStatus.AUTH_EXPIRED -> stringResource(R.string.status_auth_expired)
HostStatus.ERROR -> stringResource(R.string.error)
HostStatus.OFFLINE -> if (isAuthenticated) stringResource(R.string.ready_auth_saved) else stringResource(R.string.status_offline)
}
Box(
@ -341,7 +344,7 @@ fun HostCard(
Icon(Icons.Default.Lock, contentDescription = null, modifier = Modifier.size(14.dp))
Spacer(modifier = Modifier.width(4.dp))
}
Text("Sign In", fontSize = 12.sp)
Text(stringResource(R.string.sign_in), fontSize = 12.sp)
}
Spacer(modifier = Modifier.width(8.dp))
}
@ -351,7 +354,7 @@ fun HostCard(
onClick = onDisconnect,
shape = RoundedCornerShape(8.dp)
) {
Text("Disconnect", fontSize = 12.sp)
Text(stringResource(R.string.disconnect), fontSize = 12.sp)
}
} else {
Button(
@ -363,7 +366,7 @@ fun HostCard(
CircularProgressIndicator(modifier = Modifier.size(14.dp), strokeWidth = 2.dp, color = Color.White)
Spacer(modifier = Modifier.width(4.dp))
}
Text("Connect", fontSize = 12.sp)
Text(stringResource(R.string.connect), fontSize = 12.sp)
}
}
}
@ -385,13 +388,13 @@ fun AddHostDialog(
AlertDialog(
onDismissRequest = onDismiss,
title = { Text("Add Hermes Host", fontWeight = FontWeight.Bold) },
title = { Text(stringResource(R.string.add_host), fontWeight = FontWeight.Bold) },
text = {
Column(modifier = Modifier.fillMaxWidth()) {
OutlinedTextField(
value = name,
onValueChange = { name = it },
label = { Text("Host Name (e.g. Linux Server, Office PC)") },
label = { Text(stringResource(R.string.host_name_label)) },
singleLine = true,
modifier = Modifier.fillMaxWidth()
)
@ -399,7 +402,7 @@ fun AddHostDialog(
OutlinedTextField(
value = baseUrl,
onValueChange = { baseUrl = it },
label = { Text("Base URL (http://... or https://...)") },
label = { Text(stringResource(R.string.base_url_label)) },
singleLine = true,
modifier = Modifier.fillMaxWidth()
)
@ -411,9 +414,9 @@ fun AddHostDialog(
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.weight(1f)) {
Text("Allow Cleartext HTTP (LAN)", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
Text(stringResource(R.string.allow_cleartext_http), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
Text(
"Permits unencrypted local network traffic.",
stringResource(R.string.allow_cleartext_desc),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -427,7 +430,7 @@ fun AddHostDialog(
if (allowCleartext) {
Spacer(modifier = Modifier.height(8.dp))
Text(
"⚠️ Security Notice: Plain HTTP is unencrypted. Use only on trusted private LANs.",
stringResource(R.string.cleartext_security_warning),
style = MaterialTheme.typography.bodySmall,
color = Color(0xFFD97706)
)
@ -443,11 +446,11 @@ fun AddHostDialog(
if (uiState.isTesting) {
CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
Spacer(modifier = Modifier.width(8.dp))
Text("Testing…")
Text(stringResource(R.string.testing))
} else {
Icon(Icons.Default.Refresh, contentDescription = null, modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(8.dp))
Text("Test Connection (/api/status)")
Text(stringResource(R.string.test_connection_btn))
}
}
@ -456,8 +459,9 @@ fun AddHostDialog(
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.CheckCircle, contentDescription = null, tint = Color(0xFF10B981), modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(6.dp))
val authStr = if (uiState.testStatus.authRequired) stringResource(R.string.auth_required_label) else stringResource(R.string.auth_none_label)
Text(
"Status OK (v${uiState.testStatus.version ?: "1.0"}, Auth: ${if (uiState.testStatus.authRequired) "Required" else "None"})",
stringResource(R.string.status_ok_format, uiState.testStatus.version ?: "1.0", authStr),
style = MaterialTheme.typography.bodySmall,
color = Color(0xFF10B981)
)
@ -487,12 +491,12 @@ fun AddHostDialog(
},
enabled = baseUrl.isNotBlank()
) {
Text("Save Host")
Text(stringResource(R.string.save_host))
}
},
dismissButton = {
TextButton(onClick = onDismiss) {
Text("Cancel")
Text(stringResource(R.string.cancel))
}
}
)

35
app/src/main/java/app/hermes/mobile/feature/hosts/PairingPreviewDialog.kt
View file

@ -4,12 +4,14 @@ import androidx.compose.foundation.layout.*
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import app.hermes.mobile.core.pairing.HermesPairingPayload
import app.hermes.mobile.core.network.HermesRestClient
import app.hermes.mobile.R
import app.hermes.mobile.core.model.HermesServerStatus
import kotlinx.coroutines.launch
import app.hermes.mobile.core.network.HermesRestClient
import app.hermes.mobile.core.pairing.HermesPairingPayload
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.net.URI
@ -66,11 +68,11 @@ fun PairingPreviewDialog(
AlertDialog(
onDismissRequest = onCancel,
title = { Text("Pairing Preview") },
title = { Text(stringResource(R.string.pairing_preview)) },
text = {
Column(modifier = Modifier.fillMaxWidth()) {
Text("Host: ${payload.name}", style = MaterialTheme.typography.bodyLarge)
Text("Address: ${payload.scheme}://${payload.host}:${payload.port}", style = MaterialTheme.typography.bodyMedium)
Text(stringResource(R.string.host_format, payload.name), style = MaterialTheme.typography.bodyLarge)
Text(stringResource(R.string.address_format, "${payload.scheme}://${payload.host}:${payload.port}"), style = MaterialTheme.typography.bodyMedium)
Spacer(modifier = Modifier.height(8.dp))
when (val state = probeState) {
@ -78,24 +80,25 @@ fun PairingPreviewDialog(
Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically) {
CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
Spacer(modifier = Modifier.width(8.dp))
Text("Probing status...", style = MaterialTheme.typography.bodySmall)
Text(stringResource(R.string.probing_status), style = MaterialTheme.typography.bodySmall)
}
}
is PairingProbeState.Failed -> {
Surface(color = MaterialTheme.colorScheme.errorContainer, shape = MaterialTheme.shapes.small) {
Column(modifier = Modifier.padding(8.dp)) {
Text("Probe failed: ${state.message}", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onErrorContainer)
Text(stringResource(R.string.probe_failed_format, state.message), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onErrorContainer)
Spacer(modifier = Modifier.height(4.dp))
Button(onClick = { doProbe() }, modifier = Modifier.height(32.dp), contentPadding = PaddingValues(horizontal = 8.dp, vertical = 0.dp)) {
Text("Retry", style = MaterialTheme.typography.labelSmall)
Text(stringResource(R.string.retry), style = MaterialTheme.typography.labelSmall)
}
}
}
}
is PairingProbeState.Success -> {
Surface(color = androidx.compose.ui.graphics.Color(0xFFD1FAE5), shape = MaterialTheme.shapes.small) {
val authStr = if (state.status.authRequired) stringResource(R.string.auth_required_label) else stringResource(R.string.auth_none_label)
Text(
"Hermes v${state.status.version} | Auth: ${if (state.status.authRequired) "Required" else "None"}",
"Hermes v${state.status.version} | Auth: $authStr",
modifier = Modifier.padding(8.dp),
style = MaterialTheme.typography.bodySmall,
color = androidx.compose.ui.graphics.Color(0xFF065F46)
@ -110,7 +113,7 @@ fun PairingPreviewDialog(
if (isEndpointChanged) {
Surface(color = MaterialTheme.colorScheme.errorContainer, shape = MaterialTheme.shapes.small) {
Text(
"Endpoint for this host has changed from $oldEndpointUrl to ${payload.scheme}://${payload.host}:${payload.port}. For security, saved login credentials will be cleared. Fresh login will be required.",
stringResource(R.string.endpoint_changed_warning, oldEndpointUrl ?: "", "${payload.scheme}://${payload.host}:${payload.port}"),
modifier = Modifier.padding(8.dp),
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onErrorContainer
@ -119,7 +122,7 @@ fun PairingPreviewDialog(
} else {
Surface(color = MaterialTheme.colorScheme.secondaryContainer, shape = MaterialTheme.shapes.small) {
Text(
"Will update endpoint for existing host '${existingHostName ?: payload.name}'",
stringResource(R.string.update_endpoint_notice, existingHostName ?: payload.name),
modifier = Modifier.padding(8.dp),
style = MaterialTheme.typography.labelMedium
)
@ -135,8 +138,8 @@ fun PairingPreviewDialog(
verticalAlignment = androidx.compose.ui.Alignment.CenterVertically
) {
Column(modifier = Modifier.weight(1f)) {
Text("Allow Cleartext", style = MaterialTheme.typography.bodyMedium)
Text("Security warning: HTTP is insecure", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error)
Text(stringResource(R.string.allow_cleartext), style = MaterialTheme.typography.bodyMedium)
Text(stringResource(R.string.http_insecure_warning), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error)
}
Switch(
checked = allowCleartext,
@ -151,12 +154,12 @@ fun PairingPreviewDialog(
onClick = { onConfirm(allowCleartext) },
enabled = probeState is PairingProbeState.Success
) {
Text(if (isExistingHost) "Update Host" else "Add Host")
Text(if (isExistingHost) stringResource(R.string.update_host) else stringResource(R.string.add_host))
}
},
dismissButton = {
TextButton(onClick = onCancel) {
Text("Cancel")
Text(stringResource(R.string.cancel))
}
}
)

8
app/src/main/java/app/hermes/mobile/feature/hosts/QrScannerSheet.kt
View file

@ -29,6 +29,8 @@ import java.util.concurrent.Executors
import android.content.pm.PackageManager
import android.content.Context
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
import kotlinx.coroutines.suspendCancellableCoroutine
import java.util.concurrent.atomic.AtomicBoolean
import kotlin.coroutines.resume
@ -66,7 +68,7 @@ fun QrScannerSheet(
modifier = Modifier.fillMaxSize().padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text("Scan QR Code", style = MaterialTheme.typography.titleLarge)
Text(stringResource(R.string.scan_qr_code), style = MaterialTheme.typography.titleLarge)
Spacer(modifier = Modifier.height(16.dp))
if (hasCameraPermission) {
@ -75,13 +77,13 @@ fun QrScannerSheet(
}
} else {
Box(modifier = Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
Text("Camera permission denied.")
Text(stringResource(R.string.camera_permission_denied))
}
}
Spacer(modifier = Modifier.height(16.dp))
Button(onClick = onDismiss) {
Text("Cancel")
Text(stringResource(R.string.cancel))
}
}
}

15
app/src/main/java/app/hermes/mobile/feature/native_sessions/NativeSessionsScreen.kt
View file

@ -45,6 +45,9 @@ import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun NativeSessionsScreen(
@ -60,7 +63,7 @@ fun NativeSessionsScreen(
title = {
Column {
Text(
text = host?.displayName ?: "Native Host Sessions",
text = host?.displayName ?: stringResource(R.string.native_host_sessions),
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold
)
@ -73,12 +76,12 @@ fun NativeSessionsScreen(
},
navigationIcon = {
IconButton(onClick = onNavigateBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.back))
}
},
actions = {
IconButton(onClick = { viewModel.loadSessions() }) {
Icon(Icons.Default.Refresh, contentDescription = "Refresh")
Icon(Icons.Default.Refresh, contentDescription = stringResource(R.string.refresh))
}
}
)
@ -105,7 +108,7 @@ fun NativeSessionsScreen(
)
Spacer(modifier = Modifier.height(16.dp))
Text(
"No native sessions found",
stringResource(R.string.no_native_sessions),
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -150,7 +153,7 @@ fun NativeSessionCard(session: SessionSummary) {
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = session.title.ifEmpty { "Session ${session.id.value.take(8)}" },
text = session.title.ifEmpty { stringResource(R.string.native_session_default_title, session.id.value.take(8)) },
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold,
maxLines = 1,
@ -192,7 +195,7 @@ fun NativeSessionCard(session: SessionSummary) {
modifier = Modifier.fillMaxWidth()
) {
Text(
text = "${session.messageCount} msgs • ${session.id.value.take(8)}",
text = stringResource(R.string.native_session_stats_format, session.messageCount, session.id.value.take(8)),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)

271
app/src/main/java/app/hermes/mobile/feature/sessions/SessionsScreen.kt
View file

@ -1,271 +0,0 @@
package app.hermes.mobile.feature.sessions
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.Chat
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Forum
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import app.hermes.mobile.core.model.DurableSessionId
import app.hermes.mobile.core.model.SessionSummary
import app.hermes.mobile.core.network.ConnectionState
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SessionsScreen(
viewModel: SessionsViewModel,
connectionId: String,
onNavigateBack: () -> Unit,
onNavigateToChat: (String) -> Unit
) {
val uiState by viewModel.uiState.collectAsState()
val activeConn by viewModel.activeConnection.collectAsState()
val connState by viewModel.connectionState.collectAsState()
Scaffold(
topBar = {
TopAppBar(
title = {
Column {
Text(
activeConn?.name ?: "Sessions",
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold
)
Row(verticalAlignment = Alignment.CenterVertically) {
val isConn = connState is ConnectionState.Connected
Box(
modifier = Modifier
.size(6.dp)
.clip(CircleShape)
.background(if (isConn) Color(0xFF10B981) else Color(0xFFEF4444))
)
Spacer(modifier = Modifier.width(4.dp))
Text(
if (isConn) "Connected" else "Disconnected",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
},
navigationIcon = {
IconButton(onClick = onNavigateBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
}
},
actions = {
IconButton(onClick = { viewModel.loadSessions() }) {
Icon(Icons.Default.Refresh, contentDescription = "Refresh")
}
}
)
},
floatingActionButton = {
FloatingActionButton(
onClick = {
viewModel.createNewSession { durableId ->
onNavigateToChat(durableId)
}
},
containerColor = MaterialTheme.colorScheme.primary
) {
Row(
modifier = Modifier.padding(horizontal = 16.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(Icons.Default.Add, contentDescription = null)
Spacer(modifier = Modifier.width(8.dp))
Text("New Chat", fontWeight = FontWeight.Bold)
}
}
}
) { padding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(padding)
.padding(horizontal = 16.dp)
) {
if (uiState.isLoading && uiState.sessions.isEmpty()) {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
CircularProgressIndicator()
}
} else if (uiState.sessions.isEmpty()) {
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Icon(
Icons.Default.Forum,
contentDescription = null,
modifier = Modifier.size(64.dp),
tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
)
Spacer(modifier = Modifier.height(16.dp))
Text(
"No active sessions",
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(8.dp))
Text(
"Tap 'New Chat' to start a Hermes agent session.",
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)
}
}
} else {
LazyColumn(
verticalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier.fillMaxSize()
) {
items(uiState.sessions, key = { it.id.value }) { session ->
SessionItemCard(
session = session,
onClick = {
viewModel.resumeSession(session.id) { durableId ->
onNavigateToChat(durableId)
}
}
)
}
}
}
}
}
}
@Composable
fun SessionItemCard(
session: SessionSummary,
onClick: () -> Unit
) {
Card(
shape = RoundedCornerShape(12.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = Modifier
.fillMaxWidth()
.clickable(onClick = onClick)
) {
Column(modifier = Modifier.padding(14.dp)) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.weight(1f)
) {
Icon(
Icons.AutoMirrored.Filled.Chat,
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.primary
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = session.title.ifEmpty { "Session ${session.id.value.take(8)}" },
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}
Box(
modifier = Modifier
.clip(RoundedCornerShape(4.dp))
.background(MaterialTheme.colorScheme.primary.copy(alpha = 0.15f))
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text(
text = session.source,
fontSize = 10.sp,
fontWeight = FontWeight.Bold,
color = MaterialTheme.colorScheme.primary
)
}
}
if (session.preview.isNotBlank()) {
Spacer(modifier = Modifier.height(6.dp))
Text(
text = session.preview,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 2,
overflow = TextOverflow.Ellipsis
)
}
Spacer(modifier = Modifier.height(8.dp))
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth()
) {
Text(
text = "${session.messageCount} messages",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)
Text(
text = formatTimestamp(session.startedAt),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)
}
}
}
}
private fun formatTimestamp(timestamp: Long): String {
if (timestamp <= 0) return ""
val sdf = SimpleDateFormat("MMM d, HH:mm", Locale.getDefault())
return sdf.format(Date(timestamp))
}

82
app/src/main/java/app/hermes/mobile/feature/sessions/SessionsViewModel.kt
View file

@ -1,82 +0,0 @@
package app.hermes.mobile.feature.sessions
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import app.hermes.mobile.core.model.*
import app.hermes.mobile.core.repository.HermesGatewayRepository
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
data class SessionsUiState(
val isLoading: Boolean = false,
val sessions: List<SessionSummary> = emptyList(),
val error: String? = null
)
class SessionsViewModel(
private val gatewayRepo: HermesGatewayRepository
) : ViewModel() {
private val _uiState = MutableStateFlow(SessionsUiState())
val uiState: StateFlow<SessionsUiState> = _uiState.asStateFlow()
val activeConnection = gatewayRepo.activeConnection
val connectionState = gatewayRepo.connectionState
init {
loadSessions()
}
fun loadSessions() {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true, error = null)
try {
val list = gatewayRepo.listSessions()
_uiState.value = _uiState.value.copy(
isLoading = false,
sessions = list.sortedByDescending { it.startedAt },
error = null
)
} catch (e: Exception) {
_uiState.value = _uiState.value.copy(
isLoading = false,
error = e.localizedMessage ?: "Failed to load sessions"
)
}
}
}
fun createNewSession(onSuccess: (String) -> Unit) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true, error = null)
try {
val res = gatewayRepo.startNewSession()
_uiState.value = _uiState.value.copy(isLoading = false)
onSuccess(res.durableId.value)
} catch (e: Exception) {
_uiState.value = _uiState.value.copy(
isLoading = false,
error = e.localizedMessage ?: "Failed to create session"
)
}
}
}
fun resumeSession(durableId: DurableSessionId, onSuccess: (String) -> Unit) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true, error = null)
try {
val res = gatewayRepo.openSession(durableId)
_uiState.value = _uiState.value.copy(isLoading = false)
onSuccess(res.durableId.value)
} catch (e: Exception) {
_uiState.value = _uiState.value.copy(
isLoading = false,
error = e.localizedMessage ?: "Failed to resume session"
)
}
}
}
}

188
app/src/main/java/app/hermes/mobile/feature/settings/SettingsScreen.kt
View file

@ -1,44 +1,86 @@
package app.hermes.mobile.feature.settings
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Dns
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.Security
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import app.hermes.mobile.R
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SettingsScreen(
viewModel: SettingsViewModel,
onNavigateBack: () -> Unit
) {
val diagnostics by viewModel.diagnostics.collectAsState()
val snackbarHostState = remember { SnackbarHostState() }
var showClearDialog by remember { mutableStateOf(false) }
val cacheClearedMsg = stringResource(R.string.cache_cleared_msg)
LaunchedEffect(Unit) {
viewModel.cacheClearedEvent.collect {
snackbarHostState.showSnackbar(
message = cacheClearedMsg,
duration = SnackbarDuration.Short
)
}
}
Scaffold(
snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
topBar = {
TopAppBar(
title = { Text("Settings & Security", fontWeight = FontWeight.Bold) },
title = { Text(stringResource(R.string.settings_and_security), fontWeight = FontWeight.Bold) },
navigationIcon = {
IconButton(onClick = onNavigateBack) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back")
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.back)
)
}
}
)
@ -51,19 +93,67 @@ fun SettingsScreen(
.padding(16.dp)
.verticalScroll(rememberScrollState())
) {
// Diagnostics Card
Card(
shape = RoundedCornerShape(12.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.padding(16.dp)) {
Text("Security & Authentication", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold)
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Default.Dns,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(20.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Text(
stringResource(R.string.app_diagnostics),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold
)
}
Spacer(modifier = Modifier.height(8.dp))
Text(
"• PKCE (RFC 7636 / RFC 8252) ephemeral loopback on 127.0.0.1.\n" +
"• Single-use WebSocket tickets with 30s TTL.\n" +
"• Encrypted credentials stored in Android Keystore / EncryptedSharedPreferences.\n" +
"• Cleartext HTTP strictly disabled by default unless explicitly enabled per connection for local LAN debugging.",
stringResource(
R.string.diagnostics_summary_format,
diagnostics.registeredHostsCount,
diagnostics.onlineHostsCount,
diagnostics.storedCredentialsCount
),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
Spacer(modifier = Modifier.height(16.dp))
// Security Card
Card(
shape = RoundedCornerShape(12.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.padding(16.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Default.Security,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(20.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Text(
stringResource(R.string.security_and_auth),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold
)
}
Spacer(modifier = Modifier.height(8.dp))
Text(
stringResource(R.string.security_desc),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -72,23 +162,99 @@ fun SettingsScreen(
Spacer(modifier = Modifier.height(16.dp))
// Cache Management Card
Card(
shape = RoundedCornerShape(12.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.padding(16.dp)) {
Text("Hermes Client Info", style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold)
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Default.Delete,
contentDescription = null,
tint = MaterialTheme.colorScheme.error,
modifier = Modifier.size(20.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Text(
stringResource(R.string.cache_management),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold
)
}
Spacer(modifier = Modifier.height(8.dp))
Text(
"App: Hermes Android Client\n" +
"Version: 1.0.0 (Protocol Contract v1)\n" +
"Architecture: Direct WebSocket JSON-RPC & PKCE Loopback Auth",
stringResource(R.string.clear_cache_desc),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(12.dp))
OutlinedButton(
onClick = { showClearDialog = true },
colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.error),
shape = RoundedCornerShape(8.dp)
) {
Text(stringResource(R.string.clear_cache_btn), fontWeight = FontWeight.Bold)
}
}
}
Spacer(modifier = Modifier.height(16.dp))
// Client Info Card
Card(
shape = RoundedCornerShape(12.dp),
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
modifier = Modifier.fillMaxWidth()
) {
Column(modifier = Modifier.padding(16.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Default.Info,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(20.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Text(
stringResource(R.string.hermes_client_info),
style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.Bold
)
}
Spacer(modifier = Modifier.height(8.dp))
Text(
stringResource(R.string.client_info_content),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
}
}
if (showClearDialog) {
AlertDialog(
onDismissRequest = { showClearDialog = false },
title = { Text(stringResource(R.string.clear_cache_dialog_title), fontWeight = FontWeight.Bold) },
text = { Text(stringResource(R.string.clear_cache_dialog_msg)) },
confirmButton = {
Button(
onClick = {
showClearDialog = false
viewModel.clearLocalCache()
},
colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error)
) {
Text(stringResource(R.string.clear))
}
},
dismissButton = {
TextButton(onClick = { showClearDialog = false }) {
Text(stringResource(R.string.cancel))
}
}
)
}
}
}

56
app/src/main/java/app/hermes/mobile/feature/settings/SettingsViewModel.kt Normal file
View file

@ -0,0 +1,56 @@
package app.hermes.mobile.feature.settings
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import app.hermes.mobile.core.model.HostStatus
import app.hermes.mobile.core.runtime.HermesConnectionManager
import app.hermes.mobile.core.security.TokenVault
import app.hermes.mobile.core.storage.UnifiedSessionDao
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.launch
data class SettingsDiagnostics(
val registeredHostsCount: Int = 0,
val onlineHostsCount: Int = 0,
val storedCredentialsCount: Int = 0
)
class SettingsViewModel(
private val connectionManager: HermesConnectionManager,
private val tokenVault: TokenVault,
private val sessionDao: UnifiedSessionDao
) : ViewModel() {
private val _diagnostics = MutableStateFlow(SettingsDiagnostics())
val diagnostics: StateFlow<SettingsDiagnostics> = _diagnostics.asStateFlow()
private val _cacheClearedEvent = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
val cacheClearedEvent: SharedFlow<Unit> = _cacheClearedEvent.asSharedFlow()
init {
viewModelScope.launch {
connectionManager.hosts.collect { hosts ->
val online = hosts.count { it.lastKnownStatus == HostStatus.ONLINE }
val stored = tokenVault.getAllHostIds().size
_diagnostics.value = SettingsDiagnostics(
registeredHostsCount = hosts.size,
onlineHostsCount = online,
storedCredentialsCount = stored
)
}
}
}
fun clearLocalCache() {
viewModelScope.launch {
sessionDao.clearAllLocalCache()
_cacheClearedEvent.tryEmit(Unit)
}
}
}

49
app/src/main/java/app/hermes/mobile/feature/unified_sessions/UnifiedSessionsScreen.kt
View file

@ -64,6 +64,10 @@ import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import androidx.compose.material.icons.filled.Settings
import androidx.compose.ui.res.stringResource
import app.hermes.mobile.R
import androidx.compose.material3.SnackbarDuration
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
@ -73,7 +77,8 @@ import androidx.compose.material3.SnackbarHostState
fun UnifiedSessionsScreen(
viewModel: UnifiedSessionsViewModel,
onNavigateToChat: (UnifiedSessionId) -> Unit,
onNavigateToHosts: () -> Unit
onNavigateToHosts: () -> Unit,
onNavigateToSettings: () -> Unit = {}
) {
val sessions by viewModel.sessions.collectAsState()
val hosts by viewModel.hosts.collectAsState()
@ -82,6 +87,7 @@ fun UnifiedSessionsScreen(
var showCreateDialog by remember { mutableStateOf(false) }
val snackbarHostState = remember { SnackbarHostState() }
val dismissLabel = stringResource(R.string.dismiss)
val errorMessage = uiState.error
LaunchedEffect(errorMessage) {
@ -89,7 +95,7 @@ fun UnifiedSessionsScreen(
val sanitized = sanitizeErrorMessage(errorMessage)
snackbarHostState.showSnackbar(
message = sanitized,
actionLabel = "Dismiss",
actionLabel = dismissLabel,
duration = SnackbarDuration.Short
)
viewModel.clearError()
@ -102,11 +108,11 @@ fun UnifiedSessionsScreen(
TopAppBar(
title = {
Column {
Text("Unified Sessions", fontWeight = FontWeight.Bold)
Text(stringResource(R.string.unified_sessions_title), fontWeight = FontWeight.Bold)
val hostsCount = hosts.size
val onlineCount = hosts.count { it.lastKnownStatus == HostStatus.ONLINE }
Text(
text = "$onlineCount/$hostsCount hosts online",
text = stringResource(R.string.hosts_online_format, onlineCount, hostsCount),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -114,7 +120,10 @@ fun UnifiedSessionsScreen(
},
actions = {
IconButton(onClick = onNavigateToHosts) {
Icon(Icons.Default.Dns, contentDescription = "Manage Hosts")
Icon(Icons.Default.Dns, contentDescription = stringResource(R.string.manage_hosts))
}
IconButton(onClick = onNavigateToSettings) {
Icon(Icons.Default.Settings, contentDescription = stringResource(R.string.settings))
}
}
)
@ -128,9 +137,9 @@ fun UnifiedSessionsScreen(
modifier = Modifier.padding(horizontal = 16.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(Icons.Default.Add, contentDescription = null)
Icon(Icons.Default.Add, contentDescription = stringResource(R.string.new_session))
Spacer(modifier = Modifier.width(8.dp))
Text("New Session", fontWeight = FontWeight.Bold)
Text(stringResource(R.string.new_session), fontWeight = FontWeight.Bold)
}
}
}
@ -152,13 +161,13 @@ fun UnifiedSessionsScreen(
)
Spacer(modifier = Modifier.height(16.dp))
Text(
"No unified sessions yet",
stringResource(R.string.no_unified_sessions),
style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(8.dp))
Text(
"Start a session that can roam seamlessly across all your Hermes hosts.",
stringResource(R.string.no_unified_sessions_hint),
style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f)
)
@ -230,7 +239,7 @@ fun UnifiedSessionCard(
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = session.title.ifEmpty { "Unified Session" },
text = session.title.ifEmpty { stringResource(R.string.unified_session_default_title) },
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
maxLines = 1,
@ -244,7 +253,7 @@ fun UnifiedSessionCard(
) {
Icon(
Icons.Default.Delete,
contentDescription = "Delete",
contentDescription = stringResource(R.string.delete),
tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
modifier = Modifier.size(18.dp)
)
@ -287,7 +296,7 @@ fun UnifiedSessionCard(
val attachedCount = session.bindings.size.coerceAtLeast(1)
val msgCount = if (session.messageCount > 0) session.messageCount else session.timeline.size
Text(
text = "$attachedCount attached • $msgCount msgs",
text = stringResource(R.string.attached_hosts_and_msgs_format, attachedCount, msgCount),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
@ -301,7 +310,7 @@ fun UnifiedSessionCard(
modifier = Modifier.fillMaxWidth()
) {
Text(
text = "ID: ${session.id.value.take(8)}",
text = stringResource(R.string.session_id_format, session.id.value.take(8)),
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f)
)
@ -329,28 +338,28 @@ fun CreateSessionDialog(
AlertDialog(
onDismissRequest = onDismiss,
title = { Text("Start Unified Session", fontWeight = FontWeight.Bold) },
title = { Text(stringResource(R.string.start_unified_session), fontWeight = FontWeight.Bold) },
text = {
Column(modifier = Modifier.fillMaxWidth()) {
OutlinedTextField(
value = title,
onValueChange = { title = it },
label = { Text("Session Title") },
placeholder = { Text("e.g. Android Development, Data Analysis") },
label = { Text(stringResource(R.string.session_title)) },
placeholder = { Text(stringResource(R.string.session_title_placeholder)) },
singleLine = true,
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(14.dp))
if (hosts.isNotEmpty()) {
Text("Initial Active Host:", style = MaterialTheme.typography.labelMedium)
Text(stringResource(R.string.initial_active_host), style = MaterialTheme.typography.labelMedium)
Spacer(modifier = Modifier.height(6.dp))
ExposedDropdownMenuBox(
expanded = expandedDropdown,
onExpandedChange = { expandedDropdown = !expandedDropdown }
) {
val currentHostName = hosts.find { it.id == selectedHostId }?.displayName ?: "Select host"
val currentHostName = hosts.find { it.id == selectedHostId }?.displayName ?: stringResource(R.string.select_host)
OutlinedTextField(
value = currentHostName,
onValueChange = {},
@ -396,12 +405,12 @@ fun CreateSessionDialog(
onConfirm(title.ifBlank { "Session" }, selectedHostId)
}
) {
Text("Create")
Text(stringResource(R.string.create))
}
},
dismissButton = {
TextButton(onClick = onDismiss) {
Text("Cancel")
Text(stringResource(R.string.cancel))
}
}
)

5
app/src/main/res/drawable/ic_launcher.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_launcher_background" />
<item android:drawable="@drawable/ic_launcher_foreground" />
</layer-list>

17
app/src/main/res/drawable/ic_launcher_background.xml Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#0F172A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#1E293B"
android:pathData="M0,0 L108,108 L0,108 Z" />
<!-- Subtle circular glowing accent in the center -->
<path
android:fillColor="#1E1B4B"
android:pathData="M54,54m-38,0a38,38 0 1,0 76,0a38,38 0 1,0 -76,0" />
</vector>

41
app/src/main/res/drawable/ic_launcher_foreground.xml Normal file
View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:translateX="0"
android:translateY="0">
<!-- Left Wing -->
<path
android:fillColor="#38BDF8"
android:pathData="M32,38 C26,44 24,54 28,62 C32,60 38,56 42,50 C44,46 42,40 32,38 Z" />
<path
android:fillColor="#0284C7"
android:pathData="M24,50 C20,56 22,64 26,68 C30,66 36,62 38,56 C34,54 28,52 24,50 Z" />
<!-- Right Wing -->
<path
android:fillColor="#38BDF8"
android:pathData="M76,38 C82,44 84,54 80,62 C76,60 70,56 66,50 C64,46 66,40 76,38 Z" />
<path
android:fillColor="#0284C7"
android:pathData="M84,50 C88,56 86,64 82,68 C78,66 72,62 70,56 C74,54 80,52 84,50 Z" />
<!-- Central Staff / Helmet Core -->
<path
android:fillColor="#F8FAFC"
android:pathData="M54,30 C46,30 40,36 40,44 C40,50 44,56 50,60 L50,74 C50,76.2 51.8,78 54,78 C56.2,78 58,76.2 58,74 L58,60 C64,56 68,50 68,44 C68,36 62,30 54,30 Z" />
<!-- Messenger Node Accent -->
<path
android:fillColor="#06B6D4"
android:pathData="M54,40 C51.8,40 50,41.8 50,44 C50,46.2 51.8,48 54,48 C56.2,48 58,46.2 58,44 C58,41.8 56.2,40 54,40 Z" />
<!-- Bottom Connection Ring -->
<path
android:fillColor="#38BDF8"
android:pathData="M54,74m-4,0a4,4 0 1,0 8,0a4,4 0 1,0 -8,0" />
</group>
</vector>

23
app/src/main/res/drawable/ic_launcher_monochrome.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:translateX="0"
android:translateY="0">
<!-- Wings -->
<path
android:fillColor="#000000"
android:pathData="M32,38 C26,44 24,54 28,62 C32,60 38,56 42,50 C44,46 42,40 32,38 Z M24,50 C20,56 22,64 26,68 C30,66 36,62 38,56 C34,54 28,52 24,50 Z" />
<path
android:fillColor="#000000"
android:pathData="M76,38 C82,44 84,54 80,62 C76,60 70,56 66,50 C64,46 66,40 76,38 Z M84,50 C88,56 86,64 82,68 C78,66 72,62 70,56 C74,54 80,52 84,50 Z" />
<!-- Core Staff / Helmet -->
<path
android:fillColor="#000000"
android:pathData="M54,30 C46,30 40,36 40,44 C40,50 44,56 50,60 L50,74 C50,76.2 51.8,78 54,78 C56.2,78 58,76.2 58,74 L58,60 C64,56 68,50 68,44 C68,36 62,30 54,30 Z" />
</group>
</vector>

5
app/src/main/res/drawable/ic_launcher_round.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_launcher_background" />
<item android:drawable="@drawable/ic_launcher_foreground" />
</layer-list>

6
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>

6
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>

9
app/src/main/res/values-night-v27/themes.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.HermesAndroid" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:windowLightNavigationBar">false</item>
</style>
</resources>

8
app/src/main/res/values-night/themes.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.HermesAndroid" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">false</item>
</style>
</resources>

9
app/src/main/res/values-v27/themes.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.HermesAndroid" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
</resources>

128
app/src/main/res/values/strings.xml
View file

@ -1,19 +1,119 @@
<resources>
<string name="app_name">Hermes</string>
<string name="connections">Connections</string>
<string name="sessions">Sessions</string>
<string name="chat">Chat</string>
<string name="back">Back</string>
<string name="cancel">Cancel</string>
<string name="ok">OK</string>
<string name="delete">Delete</string>
<string name="dismiss">Dismiss</string>
<string name="retry">Retry</string>
<string name="submit">Submit</string>
<string name="create">Create</string>
<string name="refresh">Refresh</string>
<string name="settings">Settings</string>
<string name="new_chat">New Chat</string>
<string name="add_connection">Add Connection</string>
<string name="test_connection">Test Connection</string>
<string name="sign_in">Sign In</string>
<string name="settings_and_security">Settings &amp; Security</string>
<!-- Sessions -->
<string name="unified_sessions_title">Unified Sessions</string>
<string name="hosts_online_format">%1$d/%2$d hosts online</string>
<string name="manage_hosts">Manage Hosts</string>
<string name="new_session">New Session</string>
<string name="no_unified_sessions">No unified sessions yet</string>
<string name="no_unified_sessions_hint">Start a session that can roam seamlessly across all your Hermes hosts.</string>
<string name="unified_session_default_title">Unified Session</string>
<string name="attached_hosts_and_msgs_format">%1$d attached • %2$d msgs</string>
<string name="session_id_format">ID: %1$s</string>
<string name="start_unified_session">Start Unified Session</string>
<string name="session_title">Session Title</string>
<string name="session_title_placeholder">e.g. Android Development, Data Analysis</string>
<string name="initial_active_host">Initial Active Host:</string>
<string name="select_host">Select host</string>
<!-- Chat -->
<string name="unified_chat">Unified Chat</string>
<string name="switch_host">Switch Host</string>
<string name="stop">Stop</string>
<string name="stop_host">Stop Host</string>
<string name="reasoning_and_thoughts">Reasoning &amp; Thoughts</string>
<string name="message_hermes_placeholder">Message Hermes…</string>
<string name="send">Send</string>
<string name="host_thinking_format">%1$s is thinking…</string>
<string name="status_running">Running</string>
<string name="status_active">Active</string>
<string name="status_online">Online</string>
<string name="status_connecting">Connecting…</string>
<string name="status_auth_expired">Auth Expired</string>
<string name="status_offline">Offline</string>
<string name="status_done">Done</string>
<!-- Approvals & Clarifications -->
<string name="authorization_required">Authorization Required</string>
<string name="deny">Deny</string>
<string name="allow_once">Allow Once</string>
<string name="allow_always">Allow Always</string>
<string name="sudo_password_required">Sudo Password Required</string>
<string name="secret_key_required">Secret / API Key Required</string>
<string name="clarification_requested">Clarification Requested</string>
<string name="password_or_secret">Password / Secret</string>
<string name="your_answer">Your Answer</string>
<!-- Hosts -->
<string name="hermes_hosts">Hermes Hosts</string>
<string name="scan_qr">Scan QR</string>
<string name="add_host">Add Host</string>
<string name="no_hosts_registered">No Hermes hosts registered</string>
<string name="no_hosts_hint">Tap \'+\' to add a workstation, server, or cloud host.</string>
<string name="native_sessions">Native Sessions</string>
<string name="lan_http_badge">LAN / HTTP</string>
<string name="ready_auth_saved">Ready (Auth Saved)</string>
<string name="error">Error</string>
<string name="connect">Connect</string>
<string name="disconnect">Disconnect</string>
<string name="connected">Connected</string>
<string name="connecting">Connecting…</string>
<string name="disconnected">Disconnected</string>
<string name="reconnecting">Reconnecting…</string>
<string name="failed">Failed</string>
<string name="authenticated">Authenticated</string>
<string name="auth_required">Auth Required</string>
<string name="sign_in">Sign In</string>
<string name="host_name_label">Host Name (e.g. Linux Server, Office PC)</string>
<string name="base_url_label">Base URL (http://... or https://...)</string>
<string name="allow_cleartext_http">Allow Cleartext HTTP (LAN)</string>
<string name="allow_cleartext_desc">Permits unencrypted local network traffic.</string>
<string name="cleartext_security_warning">⚠️ Security Notice: Plain HTTP is unencrypted. Use only on trusted private LANs.</string>
<string name="test_connection_btn">Test Connection (/api/status)</string>
<string name="testing">Testing…</string>
<string name="status_ok_format">Status OK (v%1$s, Auth: %2$s)</string>
<string name="save_host">Save Host</string>
<string name="qr_scan_error">QR Scan Error</string>
<string name="auth_required_label">Required</string>
<string name="auth_none_label">None</string>
<!-- Pairing & QR -->
<string name="pairing_preview">Pairing Preview</string>
<string name="host_format">Host: %1$s</string>
<string name="address_format">Address: %1$s</string>
<string name="probing_status">Probing status...</string>
<string name="probe_failed_format">Probe failed: %1$s</string>
<string name="update_host">Update Host</string>
<string name="endpoint_changed_warning">Endpoint for this host has changed from %1$s to %2$s. For security, saved login credentials will be cleared. Fresh login will be required.</string>
<string name="update_endpoint_notice">Will update endpoint for existing host \'%1$s\'</string>
<string name="allow_cleartext">Allow Cleartext</string>
<string name="http_insecure_warning">Security warning: HTTP is insecure</string>
<string name="scan_qr_code">Scan QR Code</string>
<string name="camera_permission_denied">Camera permission denied.</string>
<!-- Native Sessions -->
<string name="native_host_sessions">Native Host Sessions</string>
<string name="no_native_sessions">No native sessions found</string>
<string name="native_session_default_title">Session %1$s</string>
<string name="native_session_stats_format">%1$d msgs • %2$s</string>
<!-- Settings -->
<string name="security_and_auth">Security &amp; Authentication</string>
<string name="security_desc">• PKCE (RFC 7636 / RFC 8252) ephemeral loopback on 127.0.0.1.\n• TLS certificate pinning and fingerprint verification.\n• Encrypted credentials stored in Android Keystore / EncryptedSharedPreferences (AES-256-GCM / AES-256-SIV).\n• Cleartext HTTP strictly disabled by default unless explicitly enabled per connection for local LAN debugging.</string>
<string name="app_diagnostics">Diagnostics &amp; Status</string>
<string name="diagnostics_summary_format">Registered hosts: %1$d (%2$d online)\nStored host credentials: %3$d</string>
<string name="cache_management">Cache Management</string>
<string name="clear_cache_desc">Clear local session messages and cache from device storage.</string>
<string name="clear_cache_btn">Clear Local Cache</string>
<string name="clear_cache_dialog_title">Clear Cache?</string>
<string name="clear_cache_dialog_msg">This will remove locally stored sessions and messages from your device. Remote data on hosts will not be affected.</string>
<string name="clear">Clear</string>
<string name="cache_cleared_msg">Local cache cleared successfully</string>
<string name="hermes_client_info">Hermes Client Info</string>
<string name="client_info_content">App: Hermes Android Client\nVersion: 1.0.0 (Build 1)\nProtocol: Unified Multi-Host Contract v1</string>
</resources>

8
app/src/main/res/values/themes.xml
View file

@ -1,6 +1,8 @@
<resources>
<style name="Theme.HermesAndroid" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:statusBarColor">@color/background</item>
<item name="android:navigationBarColor">@color/background</item>
<style name="Theme.HermesAndroid" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">true</item>
</style>
</resources>

157
app/src/test/java/app/hermes/mobile/core/model/ModelSerializationTest.kt Normal file
View file

@ -0,0 +1,157 @@
package app.hermes.mobile.core.model
import app.hermes.mobile.core.pairing.CanonicalEndpoint
import app.hermes.mobile.core.pairing.HermesPairingPayload
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.put
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertTrue
import org.junit.Test
class ModelSerializationTest {
private val json = Json {
ignoreUnknownKeys = true
isLenient = true
encodeDefaults = true
}
@Test
fun testHermesHostSerialization() {
val host = HermesHost(
id = HermesHostId("host-123"),
displayName = "Mac Studio",
baseUrl = "https://192.168.1.50:9119",
allowCleartext = false,
enabled = true,
lastSeenAt = 1700000000000L,
lastKnownStatus = HostStatus.ONLINE,
certificateFingerprint = "SHA256:abcd1234"
)
val serialized = json.encodeToString(host)
val deserialized = json.decodeFromString<HermesHost>(serialized)
assertEquals(host, deserialized)
}
@Test
fun testUnifiedSessionAndMessageSerialization() {
val message = UnifiedMessage(
id = "msg-1",
role = MessageRole.ASSISTANT,
content = "Running command now",
hostId = HermesHostId("host-1"),
source = UnifiedMessageSource.HERMES,
createdAt = 1700000001000L,
nativeMessageId = "nat-1",
thinking = "Processing user prompt",
tools = listOf(
ToolActivity(
id = "tool-1",
name = "bash",
status = "completed",
progress = "100%",
result = "file.txt",
isError = false
)
),
isStreaming = false
)
val binding = HostSessionBinding(
hostId = HermesHostId("host-1"),
durableSessionId = DurableSessionId("dur-1"),
runtimeSessionId = RuntimeSessionId("run-1"),
lastAttachedAt = 1700000002000L,
state = BindingState.READY,
syncedThroughMessageId = "msg-1",
syncedAt = 1700000003000L
)
val session = UnifiedSession(
id = UnifiedSessionId("sess-1"),
title = "Project Workspace",
activeHostId = HermesHostId("host-1"),
createdAt = 1700000000000L,
updatedAt = 1700000004000L,
bindings = mapOf(HermesHostId("host-1") to binding),
timeline = listOf(message),
messageCount = 1,
lastMessagePreview = "Running command now"
)
val serialized = json.encodeToString(session)
val deserialized = json.decodeFromString<UnifiedSession>(serialized)
assertEquals(session, deserialized)
assertEquals("Project Workspace", deserialized.title)
assertEquals(1, deserialized.timeline.size)
assertEquals("bash", deserialized.timeline[0].tools[0].name)
}
@Test
fun testApprovalAndClarifySerialization() {
val approval = HostAttributedApproval(
hostId = HermesHostId("host-1"),
hostDisplayName = "Dev Server",
runtimeSessionId = RuntimeSessionId("rt-1"),
approval = HermesApproval(
requestId = "req-1",
command = "rm -rf /tmp/cache",
description = "Delete temporary build cache",
choices = listOf("once", "deny", "always")
)
)
val serializedApproval = json.encodeToString(approval)
val deserializedApproval = json.decodeFromString<HostAttributedApproval>(serializedApproval)
assertEquals(approval, deserializedApproval)
val clarify = HostAttributedClarify(
hostId = HermesHostId("host-2"),
hostDisplayName = "Cloud Server",
runtimeSessionId = RuntimeSessionId("rt-2"),
request = HermesClarifyRequest(
requestId = "req-2",
questionId = "q-1",
question = "Enter sudo password:",
promptType = ClarifyType.SUDO
)
)
val serializedClarify = json.encodeToString(clarify)
val deserializedClarify = json.decodeFromString<HostAttributedClarify>(serializedClarify)
assertEquals(clarify, deserializedClarify)
}
@Test
fun testPairingPayloadSerialization() {
val payload = HermesPairingPayload(
v = 1,
type = "hermes-pair",
hostId = "550e8400-e29b-41d4-a716-446655440000",
name = "Office Server",
host = "192.168.1.100",
port = 9119,
scheme = "https",
expiresAt = 1700000000000L,
nonce = "1234567890abcdef"
)
val serialized = json.encodeToString(payload)
val deserialized = json.decodeFromString<HermesPairingPayload>(serialized)
assertEquals(payload, deserialized)
}
@Test
fun testGatewayEventParsing() {
val rawReady = buildJsonObject {
put("type", "gateway.ready")
put("version", "1.4.0")
put("session_count", 5)
}
val event = GatewayEvent.parse(rawReady)
assertNotNull(event)
assertTrue(event is GatewayEvent.GatewayReadyEvent)
val ready = event as GatewayEvent.GatewayReadyEvent
assertEquals("1.4.0", ready.version)
assertEquals(5, ready.sessionCount)
}
}

9
app/src/test/java/app/hermes/mobile/core/repository/CacheEvictionTest.kt
View file

@ -151,13 +151,8 @@ class CacheEvictionTest {
// Unsubscribe
job.cancel()
// Release session explicitly if method exists
try {
val releaseMethod = repository.javaClass.getMethod("releaseSession", UnifiedSessionId::class.java)
releaseMethod.invoke(repository, session.id)
} catch (_: NoSuchMethodException) {
// Base SHA does not have releaseSession
}
// Release session explicitly
repository.releaseSession(session.id)
}
delay(100)

30
app/src/test/java/app/hermes/mobile/core/storage/FakeDaos.kt
View file

@ -312,4 +312,34 @@ class FakeUnifiedSessionDao : UnifiedSessionDao {
}
}
}
override suspend fun deleteAllMessages() {
synchronized(lock) {
messages.clear()
updateFlow()
}
}
override suspend fun deleteAllBindings() {
synchronized(lock) {
bindings.clear()
updateFlow()
}
}
override suspend fun deleteAllSessions() {
synchronized(lock) {
sessions.clear()
updateFlow()
}
}
override suspend fun clearAllLocalCache() {
synchronized(lock) {
messages.clear()
bindings.clear()
sessions.clear()
updateFlow()
}
}
}

2
gradle/libs.versions.toml
View file

@ -26,6 +26,7 @@ okhttp = "4.12.0"
# ML Kit & Google libraries
mlkitBarcode = "17.3.0"
guava = "33.4.0-android"
material = "1.12.0"
# Testing
junit = "4.13.2"
@ -82,6 +83,7 @@ androidx-camera-lifecycle = { group = "androidx.camera", name = "camera-lifecycl
androidx-camera-view = { group = "androidx.camera", name = "camera-view", version.ref = "camerax" }
mlkit-barcode-scanning = { group = "com.google.mlkit", name = "barcode-scanning", version.ref = "mlkitBarcode" }
guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
# Testing
junit = { group = "junit", name = "junit", version.ref = "junit" }