taler-android

commit a17462a6a9dc2e53059afaf3676af86b857c2cd3
parent bf0c1860fc716efff04319d2f3a4fe79ae8a7633
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Fri,  4 Sep 2026 15:15:40 +0200

merge cleanup

Diffstat:
M
.idea/gradle.xml
 | 
1
-
M
wallet/build.gradle
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/HandleUriScreen.kt
 | 
4
+---
M
wallet/src/main/java/net/taler/wallet/main/MainScreen.kt
 | 
7
-------
M
wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt
 | 
12
++++--------
M
wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailScreen.kt
 | 
4
+---

6 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
@@ -6,7 +6,6 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -24,7 +24,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.compose" version "$kotlin_version"
 }
 
-def qtart_version = "1.6.5"
+def qtart_version = "1.6.42"
 
 static def versionCodeEpoch() {
     return (new Date().getTime() / 1000).toInteger()
diff --git a/wallet/src/main/java/net/taler/wallet/HandleUriScreen.kt b/wallet/src/main/java/net/taler/wallet/HandleUriScreen.kt
@@ -125,9 +125,6 @@ fun HandleUriScreen(
                     action.startsWith("pay-template/", ignoreCase = true) -> {
                         onNavigate(WalletDestination.PromptPayTemplate(u2), true)
                     }
-                    action.startsWith("add-contact/", ignoreCase = true) -> {
-                        onNavigate(WalletDestination.PromptAddContact(u2), true)
-                    }
                     action.startsWith("dev-experiment/", ignoreCase = true) -> {
                         model.applyDevExperiment(u2) { error ->
                             errorInfo = error
@@ -139,6 +136,7 @@ fun HandleUriScreen(
                     }
                     else -> {
                         errorInfo = TalerErrorInfo.makeCustomError("Unsupported URI: $u2")
+                    }
                 }
             } catch (_: CancellationException) {
             }
diff --git a/wallet/src/main/java/net/taler/wallet/main/MainScreen.kt b/wallet/src/main/java/net/taler/wallet/main/MainScreen.kt
@@ -128,13 +128,6 @@ fun MainScreen(
         }
     }
 
-    if (showUriInput) UriInputDialog(
-        onDismiss = { showUriInput = false },
-        handleUri = { uri ->
-            onNavigate(WalletDestination.HandleUri(uri), true)
-        },
-    )
-
     val tabTitle = when (tab) {
         MainTab.ASSETS -> when (viewMode) {
             is ViewMode.Transactions -> if (selectionMode) {
diff --git a/wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt
@@ -68,8 +68,6 @@ import java.util.UUID
 const val TAG = "taler-wallet"
 const val OBSERVABILITY_LIMIT = 100
 
-<<<<<<< HEAD
-=======
 private val transactionNotifications = listOf(
     "transaction-state-transition",
 )
@@ -84,8 +82,6 @@ data class NotifyMessage(
     val actionLabel: String? = null,
     val onAction: (() -> Unit)? = null,
 )
-
->>>>>>> 194dea06 (allow to access mailbox from notifications)
 class MainViewModel(
     app: Application,
 ) : AndroidViewModel(app), InitReceiver, NotificationReceiver {
@@ -154,15 +150,11 @@ class MainViewModel(
     private val mShowObservabilityLog = MutableStateFlow(false)
     val showObservabilityLog: StateFlow<Boolean> = mShowObservabilityLog
 
-<<<<<<< HEAD
-=======
     private val mScanCodeEvent = MutableLiveData<Event<Boolean>>()
     val scanCodeEvent: LiveData<Event<Boolean>> = mScanCodeEvent
 
     private val mShowMessageEvent = MutableLiveData<Event<NotifyMessage>>()
     val showMessageEvent: LiveData<Event<NotifyMessage>> = mShowMessageEvent
-
->>>>>>> 194dea06 (allow to access mailbox from notifications)
     private val mViewMode = MutableStateFlow<ViewMode>(ViewMode.Assets)
     val viewMode: StateFlow<ViewMode> = mViewMode
 
@@ -439,6 +431,10 @@ class MainViewModel(
             }.onError(onError)
         }
     }
+
+    fun showInfoMessage(content: String, actionLabel: String? = null, onAction: (() -> Unit)? = null) {
+        mShowMessageEvent.value = Event(NotifyMessage(content, actionLabel, onAction))
+    }
 }
 
 sealed class AmountResult {
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailScreen.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailScreen.kt
@@ -343,9 +343,7 @@ fun TransactionDetailScreen(
                             onTransition = {
                                 handleTransactionAction(tx, it, model, onNavigateBack)
                             }
-                        ) {
-                            handleTransactionAction(tx, it, model, onNavigateBack)
-                        }
+                        )
                     }
                 }