diff options
author | Torsten Grote <t@grobox.de> | 2020-09-08 13:43:04 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-09-08 13:43:04 -0300 |
commit | 7260531f37b5832b3a0f8059bf931919a6e0b059 (patch) | |
tree | 84da13afb29ed40c61b05da6ba9d117fb706c32a /wallet | |
parent | c09cc9cf95244abe6b825495c2029201223be741 (diff) | |
download | taler-android-7260531f37b5832b3a0f8059bf931919a6e0b059.tar.gz taler-android-7260531f37b5832b3a0f8059bf931919a6e0b059.tar.bz2 taler-android-7260531f37b5832b3a0f8059bf931919a6e0b059.zip |
[wallet] change how we check if launching intents is safe
Resolving activities won't work anymore in Android 11.
See: https://cketti.de/2020/09/03/avoid-intent-resolveactivity/
Diffstat (limited to 'wallet')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt | 6 | ||||
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt | 6 |
2 files changed, 4 insertions, 8 deletions
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 302e684..866b363 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt @@ -25,7 +25,7 @@ import android.view.MenuItem import android.widget.TextView import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import net.taler.common.isSafe +import net.taler.common.startActivitySafe import net.taler.lib.common.Amount import net.taler.wallet.MainViewModel import net.taler.wallet.R @@ -80,9 +80,7 @@ abstract class TransactionDetailFragment : Fragment() { val i = Intent().apply { data = Uri.parse(info.fulfillmentUrl) } - if (i.isSafe(requireContext())) { - orderSummaryView.setOnClickListener { startActivity(i) } - } + orderSummaryView.setOnClickListener { startActivitySafe(i) } } orderIdView.text = getString(R.string.transaction_order_id, info.orderId) } 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 26965ef..96782fd 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionWithdrawalFragment.kt @@ -22,7 +22,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import net.taler.common.isSafe +import net.taler.common.startActivitySafe import net.taler.common.toAbsoluteTime import net.taler.wallet.R import net.taler.wallet.cleanExchange @@ -53,9 +53,7 @@ class TransactionWithdrawalFragment : TransactionDetailFragment() { val i = Intent().apply { data = Uri.parse(t.withdrawalDetails.bankConfirmationUrl) } - if (i.isSafe(requireContext())) { - ui.confirmWithdrawalButton.setOnClickListener { startActivity(i) } - } + ui.confirmWithdrawalButton.setOnClickListener { startActivitySafe(i) } } else ui.confirmWithdrawalButton.visibility = View.GONE ui.chosenAmountLabel.text = getString(R.string.amount_chosen) ui.chosenAmountView.text = |