From dc8cdc0fa2a04dea3bf5168fe84860000d0bfe28 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Tue, 17 Jan 2023 12:50:25 -0600 Subject: [wallet] Fix NullPointerException when kycUrl is null --- .../taler/wallet/transactions/TransactionWithdrawalFragment.kt | 8 ++++---- .../java/net/taler/wallet/transactions/TransactionsFragment.kt | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'wallet/src') 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 31c70b5..531d0db 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt @@ -113,12 +113,12 @@ class TransactionWithdrawalFragment : TransactionDetailFragment() { } private fun setupActionButton(t: TransactionWithdrawal) { - ui.actionButton.visibility = t.handleKyc({ GONE }) { + ui.actionButton.visibility = t.handleKyc({ GONE }) { error -> ui.actionButton.setText(R.string.transaction_action_kyc) - val i = Intent(ACTION_VIEW).apply { - data = Uri.parse(it.kycUrl) + error.kycUrl?.let { + val i = Intent(ACTION_VIEW, Uri.parse(it)) + ui.actionButton.setOnClickListener { startActivitySafe(i) } } - ui.actionButton.setOnClickListener { startActivitySafe(i) } VISIBLE } } diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt index 20da36b..961c314 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsFragment.kt @@ -183,9 +183,11 @@ class TransactionsFragment : Fragment(), OnTransactionClickListener, ActionMode. } override fun onActionButtonClicked(transaction: Transaction) { - transaction.handleKyc({ error("Unhandled Action Button Event") }) { - val i = Intent(Intent.ACTION_VIEW, Uri.parse(it.kycUrl)) - startActivitySafe(i) + transaction.handleKyc({ error("Unhandled Action Button Event") }) { error -> + error.kycUrl?.let { + val i = Intent(Intent.ACTION_VIEW, Uri.parse(it)) + startActivitySafe(i) + } } } -- cgit v1.2.3