[wallet] Make DD37 dialog data non-nullable and rename callback

8 files changed, 17 insertions, 17 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
index 2077f3e..59bcb9b 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDepositFragment.kt
@@ -36,7 +36,7 @@ class TransactionDepositFragment : TransactionDetailFragment() {
             TalerSurface {
                 val t = transactionManager.selectedTransaction.observeAsState().value
                 if (t is TransactionDeposit) TransactionDepositComposable(t, devMode.value) {
-                    onTransitionButton(t, it)
+                    onTransitionButtonClicked(t, it)
                 }
             }
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index 8f618ed..103d8e6 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -65,37 +65,37 @@ abstract class TransactionDetailFragment : Fragment() {
         }
     }
 
-    private fun dialogTitle(t: TransactionAction): Int? = when (t) {
+    private fun dialogTitle(t: TransactionAction): Int = when (t) {
         Delete -> R.string.transactions_delete_dialog_title
         Abort -> R.string.transactions_abort_dialog_title
         Fail -> R.string.transactions_fail_dialog_title
-        else -> null
+        else -> error("unsupported")
     }
 
-    private fun dialogMessage(t: TransactionAction): Int? = when (t) {
+    private fun dialogMessage(t: TransactionAction): Int = when (t) {
         Delete -> R.string.transactions_delete_dialog_message
         Abort -> R.string.transactions_abort_dialog_message
         Fail -> R.string.transactions_fail_dialog_message
-        else -> null
+        else -> error("unsupported")
     }
 
-    private fun dialogButton(t: TransactionAction): Int? = when (t) {
+    private fun dialogButton(t: TransactionAction): Int = when (t) {
         Delete -> R.string.transactions_delete
         Abort -> R.string.transactions_abort
         Fail -> R.string.transactions_fail
-        else -> null
+        else -> error("unsupported")
     }
 
-    protected fun onTransitionButton(t: Transaction, tt: TransactionAction) {
+    protected fun onTransitionButtonClicked(t: Transaction, tt: TransactionAction) {
         when (tt) {
             Delete, Abort, Fail -> {
                 MaterialAlertDialogBuilder(requireContext(), R.style.MaterialAlertDialog_Material3)
-                    .setTitle(dialogTitle(tt)!!)
-                    .setMessage(dialogMessage(tt)!!)
+                    .setTitle(dialogTitle(tt))
+                    .setMessage(dialogMessage(tt))
                     .setNeutralButton(R.string.cancel) { dialog, _ ->
                         dialog.cancel()
                     }
-                    .setNegativeButton(dialogButton(tt)!!) { dialog, _ ->
+                    .setNegativeButton(dialogButton(tt)) { dialog, _ ->
                         when (tt) {
                             Delete -> deleteTransaction(t)
                             Abort -> abortTransaction(t)
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
index 19a38fe..65cc0f4 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPaymentFragment.kt
@@ -42,7 +42,7 @@ class TransactionPaymentFragment : TransactionDetailFragment() {
                         launchInAppBrowser(requireContext(), url)
                     },
                     onTransition = {
-                        onTransitionButton(t, it)
+                        onTransitionButtonClicked(t, it)
                     }
                 )
             }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
index 8e8bcaf..d3fe7fd 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionPeerFragment.kt
@@ -57,7 +57,7 @@ class TransactionPeerFragment : TransactionDetailFragment() {
             TalerSurface {
                 val t = transactionManager.selectedTransaction.observeAsState(null).value
                 if (t != null) TransactionPeerComposable(t, devMode.value) {
-                    onTransitionButton(t, it)
+                    onTransitionButtonClicked(t, it)
                 }
             }
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
index 79aca76..fce10e3 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefreshFragment.kt
@@ -61,7 +61,7 @@ class TransactionRefreshFragment : TransactionDetailFragment() {
                 val t = transactionManager.selectedTransaction.observeAsState().value
                 val devMode = devMode.observeAsState().value ?: false
                 if (t is TransactionRefresh) TransactionRefreshComposable(t, devMode) {
-                    onTransitionButton(t, it)
+                    onTransitionButtonClicked(t, it)
                 }
             }
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
index bf026b2..a2fe223 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionRefundFragment.kt
@@ -42,7 +42,7 @@ class TransactionRefundFragment : TransactionDetailFragment() {
                         launchInAppBrowser(requireContext(), url)
                     },
                     onTransition = {
-                        onTransitionButton(t, it)
+                        onTransitionButtonClicked(t, it)
                     }
                 )
             }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
index f7e3e9e..8e3e0ad 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionTipFragment.kt
@@ -60,7 +60,7 @@ class TransactionTipFragment : TransactionDetailFragment() {
             TalerSurface {
                 val t = transactionManager.selectedTransaction.observeAsState(null).value
                 if (t is TransactionTip) TransactionTipComposable(t, devMode.value) {
-                    onTransitionButton(t, it)
+                    onTransitionButtonClicked(t, it)
                 }
             }
         }
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
index f23bc13..35207fa 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt
@@ -52,7 +52,7 @@ class TransactionWithdrawalFragment : TransactionDetailFragment(), ActionListene
                     devMode = devMode,
                     actionListener = this@TransactionWithdrawalFragment,
                 ) {
-                    onTransitionButton(t, it)
+                    onTransitionButtonClicked(t, it)
                 }
             }
         }