GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2019-09-03 15:29:28 +03:00
parent dc24e9e376
commit fdb820b7f6
4 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/tangem/ui/fragment/BaseFragment.kt
View file

@ -62,7 +62,7 @@ abstract class BaseFragment : Fragment() {
return if (destination == DESTINATION_NOT_SET) {
findNavController(this).popBackStack()
} else {
findNavController(this).popBackStack(destination, true)
findNavController(this).popBackStack(destination, false)
}
}

6
app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt
View file

@ -10,7 +10,6 @@ import com.tangem.App
import com.tangem.Constant
import com.tangem.tangem_card.util.Util
import com.tangem.ui.activity.MainActivity
import com.tangem.ui.event.TransactionFinishWithError
import com.tangem.ui.event.TransactionFinishWithSuccess
import com.tangem.util.UtilHelper
import com.tangem.wallet.CoinEngine
@ -74,7 +73,6 @@ class SendTransactionFragment : BaseFragment(), NfcAdapter.ReaderCallback {
private fun finishWithSuccess() {
val transactionFinishWithSuccess = TransactionFinishWithSuccess()
transactionFinishWithSuccess.message = getString(R.string.transaction_has_been_successfully_signed)
EventBus.getDefault().post(transactionFinishWithSuccess)
val data = Bundle()
@ -83,10 +81,6 @@ class SendTransactionFragment : BaseFragment(), NfcAdapter.ReaderCallback {
}
private fun finishWithError(message: String) {
val transactionFinishWithError = TransactionFinishWithError()
transactionFinishWithError.message = String.format(getString(R.string.try_again_failed_to_send_transaction), message)
EventBus.getDefault().post(transactionFinishWithError)
val data = Bundle()
data.putString(Constant.EXTRA_MESSAGE, String.format(getString(R.string.try_again_failed_to_send_transaction), message))
navigateBackWithResult(Activity.RESULT_CANCELED, data, R.id.loadedWalletFragment)

15
app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
View file

@ -41,7 +41,6 @@ import com.tangem.ui.dialog.PINSwapWarningDialog
import com.tangem.ui.dialog.ShowQRCodeDialog
import com.tangem.ui.dialog.WaitSecurityDelayDialog
import com.tangem.ui.event.DeletingWalletFinish
import com.tangem.ui.event.TransactionFinishWithError
import com.tangem.ui.event.TransactionFinishWithSuccess
import com.tangem.ui.fragment.BaseFragment
import com.tangem.ui.fragment.pin.PinRequestFragment
@ -329,20 +328,10 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
@Subscribe
fun onTransactionFinishWithSuccess(transactionFinishWithSuccess: TransactionFinishWithSuccess) {
ctx.message = transactionFinishWithSuccess.message
//ctx.coinData.clearInfo()
updateViews()
//srl?.isRefreshing = true
refreshAction = Runnable { refresh() }
srl?.postDelayed(refreshAction, 10000)
}
@Subscribe
fun onTransactionFinishWithError(transactionFinishWithError: TransactionFinishWithError) {
ctx.error = transactionFinishWithError.message
updateViews()
}
@Subscribe
fun onDeleteWalletFinish(deletingWalletFinish: DeletingWalletFinish) {
navigateUp()
@ -495,6 +484,10 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
}
}
}
else -> if (data != null && data.containsKey(Constant.EXTRA_MESSAGE)) {
ctx.error = data.getString(Constant.EXTRA_MESSAGE)
updateViews()
}
}
}