DCA Sell Extension + kritické opravy z revize

accbot-android/app/build.gradle.kts

@@ -73,6 +73,13 @@ android {
         buildConfig = true
     }
 
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+            isReturnDefaultValues = true
+        }
+    }
+
     experimentalProperties["android.experimental.enableScreenshotTest"] = true
 
     packaging {
@@ -83,12 +90,19 @@ android {
 
 }
 
+// Export Room schemas so future migrations can be tested against real prior versions
+// with MigrationTestHelper. (Schemas land in app/schemas/.)
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
+}
+
 dependencies {
     // Core Android
     implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.core:core-ktx:1.17.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
     implementation("androidx.lifecycle:lifecycle-runtime-compose:2.10.0")
+    implementation("androidx.lifecycle:lifecycle-process:2.10.0")
     implementation("androidx.activity:activity-compose:1.12.3")
 
     // Jetpack Compose
@@ -148,6 +162,15 @@ dependencies {
 
     // Testing
     testImplementation("junit:junit:4.13.2")
+    // JVM unit tests: Robolectric + in-memory Room + coroutines/WorkManager test helpers
+    testImplementation("org.robolectric:robolectric:4.14.1")
+    testImplementation("androidx.test:core-ktx:1.6.1")
+    testImplementation("androidx.test.ext:junit-ktx:1.2.1")
+    testImplementation("androidx.room:room-testing:2.8.4")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
+    testImplementation("androidx.work:work-testing:2.11.0")
+    testImplementation("androidx.arch.core:core-testing:2.2.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver:5.3.0")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")

accbot-android/app/src/main/java/com/accbot/dca/AccBotApplication.kt

@@ -5,12 +5,19 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import androidx.hilt.work.HiltWorkerFactory
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import com.accbot.dca.data.local.CredentialsStore
 import com.accbot.dca.data.local.DcaDatabase
 import com.accbot.dca.data.local.UserPreferences
+import com.accbot.dca.domain.usecase.ResolvePendingTransactionsUseCase
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
@@ -31,6 +38,16 @@ class AccBotApplication : Application(), Configuration.Provider {
     @Inject
     lateinit var credentialsStore: CredentialsStore
 
+    @Inject
+    lateinit var resolvePendingTransactionsUseCase: ResolvePendingTransactionsUseCase
+
+    /**
+     * App-scope coroutine scope for work that outlives any single ViewModel or
+     * Activity (lifecycle-observer callbacks, one-off startup tasks). SupervisorJob
+     * so a single failure doesn't cancel the whole scope.
+     */
+    private val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder()
             .setWorkerFactory(workerFactory)
@@ -69,6 +86,22 @@ class AccBotApplication : Application(), Configuration.Provider {
                 Log.e(TAG, "Failed to run CredentialsStore migration", e)
             }
         }
+
+        // Poll for PENDING sell-order resolutions every time the app comes to the
+        // foreground. This gives users near-instant updates when they open the app
+        // after a sell has filled, without waiting for the next SellPollingWorker
+        // tick. Fire-and-forget; the use case is a no-op when there are no open sells.
+        ProcessLifecycleOwner.get().lifecycle.addObserver(object : DefaultLifecycleObserver {
+            override fun onStart(owner: LifecycleOwner) {
+                appScope.launch {
+                    try {
+                        resolvePendingTransactionsUseCase()
+                    } catch (e: Exception) {
+                        Log.w(TAG, "Polling on app start failed", e)
+                    }
+                }
+            }
+        })
     }
 
     companion object {

accbot-android/app/src/main/java/com/accbot/dca/MainActivity.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.PowerManager
+import android.os.SystemClock
 import android.provider.Settings
 import androidx.appcompat.app.AppCompatActivity
 import androidx.activity.compose.setContent
@@ -71,9 +72,14 @@ import com.accbot.dca.service.NotificationService
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.lifecycleScope
 import javax.inject.Inject
 
+/** How long the app may stay in background before the biometric lock re-engages. */
+private const val BIOMETRIC_RELOCK_GRACE_MS = 30_000L
+
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
@@ -112,8 +118,35 @@ class MainActivity : AppCompatActivity() {
 
         setContent {
             val isSandboxMode = userPreferences.isSandboxMode()
-            var isUnlocked by rememberSaveable { mutableStateOf(false) }
+            // Plain remember, NOT rememberSaveable: saved instance state survives process
+            // death (system kills the app in background, task stays in recents), so a
+            // saveable flag would restore isUnlocked=true and silently skip the lock.
+            var isUnlocked by remember { mutableStateOf(false) }
             val biometricEnabled = userPreferences.isBiometricLockEnabled()
+
+            // Re-lock when the app spends longer than a short grace period in background,
+            // so a quick app switch doesn't re-prompt but a real walk-away does.
+            if (biometricEnabled) {
+                DisposableEffect(Unit) {
+                    var backgroundedAt = 0L
+                    val observer = LifecycleEventObserver { _, event ->
+                        when (event) {
+                            Lifecycle.Event.ON_STOP ->
+                                backgroundedAt = SystemClock.elapsedRealtime()
+                            Lifecycle.Event.ON_START -> {
+                                if (backgroundedAt != 0L &&
+                                    SystemClock.elapsedRealtime() - backgroundedAt > BIOMETRIC_RELOCK_GRACE_MS
+                                ) {
+                                    isUnlocked = false
+                                }
+                            }
+                            else -> {}
+                        }
+                    }
+                    lifecycle.addObserver(observer)
+                    onDispose { lifecycle.removeObserver(observer) }
+                }
+            }
             // Theme: collect reactive flow so changes apply immediately
             val appTheme by userPreferences.appThemeFlow.collectAsState()
             val darkTheme = when (appTheme) {
@@ -433,7 +466,7 @@ fun AccBotApp(
                     navController.navigate(Screen.EditPlan.createRoute(planId))
                 },
                 onNavigateToHistory = { crypto, fiat ->
-                    navController.navigate(Screen.History.createRoute(crypto, fiat))
+                    navController.navigate(Screen.History.createRoute(crypto, fiat, planId))
                 },
                 onNavigateToTransactionDetails = { transactionId ->
                     navController.navigate(Screen.TransactionDetails.createRoute(transactionId))
@@ -503,7 +536,8 @@ fun AccBotApp(
             route = Screen.History.route,
             arguments = listOf(
                 navArgument("crypto") { type = NavType.StringType; nullable = true; defaultValue = null },
-                navArgument("fiat") { type = NavType.StringType; nullable = true; defaultValue = null }
+                navArgument("fiat") { type = NavType.StringType; nullable = true; defaultValue = null },
+                navArgument("planId") { type = NavType.StringType; nullable = true; defaultValue = null }
             )
         ) {
             HistoryScreen(

accbot-android/app/src/main/java/com/accbot/dca/data/local/BackupDataCollector.kt

@@ -130,7 +130,9 @@ class BackupDataCollector @Inject constructor(
         lastExecutedAt = lastExecutedAt?.toEpochMilli(),
         nextExecutionAt = nextExecutionAt?.toEpochMilli(),
         targetAmount = targetAmount?.toPlainString(),
-        connectionId = connectionId
+        connectionId = connectionId,
+        allowSells = allowSells,
+        targetProfitAmount = targetProfitAmount?.toPlainString()
     )
 
     private fun TransactionEntity.toBackup() = BackupTransaction(
@@ -149,7 +151,10 @@ class BackupDataCollector @Inject constructor(
         errorMessage = errorMessage,
         warningMessage = warningMessage,
         executedAt = executedAt.toEpochMilli(),
-        connectionId = connectionId
+        connectionId = connectionId,
+        side = side.name,
+        limitPrice = limitPrice?.toPlainString(),
+        requestedCryptoAmount = requestedCryptoAmount?.toPlainString()
     )
 
     private fun NotificationEntity.toBackup() = BackupNotification(

accbot-android/app/src/main/java/com/accbot/dca/data/local/BackupDataRestorer.kt

@@ -343,7 +343,9 @@ class BackupDataRestorer @Inject constructor(
             createdAt = Instant.ofEpochMilli(createdAt),
             lastExecutedAt = lastExecutedAt?.let { Instant.ofEpochMilli(it) },
             nextExecutionAt = effectiveNext,
-            targetAmount = targetAmount?.let { BigDecimal(it) }
+            targetAmount = targetAmount?.let { BigDecimal(it) },
+            allowSells = allowSells,
+            targetProfitAmount = targetProfitAmount?.let { BigDecimal(it) }
         )
     }
 
@@ -363,7 +365,10 @@ class BackupDataRestorer @Inject constructor(
         exchangeOrderId = exchangeOrderId,
         errorMessage = errorMessage,
         warningMessage = warningMessage,
-        executedAt = Instant.ofEpochMilli(executedAt)
+        executedAt = Instant.ofEpochMilli(executedAt),
+        side = try { com.accbot.dca.domain.model.TransactionSide.valueOf(side) } catch (e: Exception) { com.accbot.dca.domain.model.TransactionSide.BUY },
+        limitPrice = limitPrice?.let { BigDecimal(it) },
+        requestedCryptoAmount = requestedCryptoAmount?.let { BigDecimal(it) }
     )
 
     private fun BackupWithdrawal.toEntity(remappedPlanId: Long, connectionId: Long?) = WithdrawalEntity(