Add Reverse Swap notification #953
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,10 +3,11 @@ package breez_sdk_notification.job | |
| import android.content.Context | ||
| import breez_sdk.BlockingBreezServices | ||
| import breez_sdk.BreezEvent | ||
| import breez_sdk.ReverseSwapStatus | ||
| import breez_sdk_notification.Constants.DEFAULT_SWAP_TX_CONFIRMED_NOTIFICATION_FAILURE_TEXT | ||
| import breez_sdk_notification.Constants.DEFAULT_SWAP_TX_CONFIRMED_NOTIFICATION_FAILURE_TITLE | ||
| import breez_sdk_notification.Constants.DEFAULT_SWAP_TX_CONFIRMED_NOTIFICATION_TITLE | ||
| import breez_sdk_notification.Constants.NOTIFICATION_CHANNEL_ADDRESS_TXS_CONFIRMED | ||
| import breez_sdk_notification.Constants.SWAP_TX_CONFIRMED_NOTIFICATION_FAILURE_TEXT | ||
| import breez_sdk_notification.Constants.SWAP_TX_CONFIRMED_NOTIFICATION_FAILURE_TITLE | ||
| import breez_sdk_notification.Constants.SWAP_TX_CONFIRMED_NOTIFICATION_TITLE | ||
|
|
@@ -22,38 +23,63 @@ data class AddressTxsConfirmedRequest( | |
| val address: String, | ||
| ) | ||
|
|
||
| class ConfirmTransactionJob( | ||
| private val context: Context, | ||
| private val fgService: SdkForegroundService, | ||
| private val payload: String, | ||
| private val logger: ServiceLogger, | ||
| private var bitcoinAddress: String? = null, | ||
| ) : Job { | ||
| companion object { | ||
| private const val TAG = "ConfirmTransactionJob" | ||
| } | ||
|
|
||
| override fun start(breezSDK: BlockingBreezServices) { | ||
| try { | ||
| val request = Json.decodeFromString(AddressTxsConfirmedRequest.serializer(), payload) | ||
| this.bitcoinAddress = request.address | ||
| } catch (e: Exception) { | ||
| logger.log(TAG, "Failed to decode payload: ${e.message}", "WARN") | ||
| } | ||
|
|
||
| this.bitcoinAddress?.let {address -> | ||
|
There was a problem hiding this comment. I think it would be nice to be able to recognize whether it is a swap or reverse swap without trying both. There was a problem hiding this comment. Yeah, I thought that too, but the What if the application or NDS is already using the There was a problem hiding this comment. That's a good argument. I am ok then to leave this inexpensive check. |
||
| try { | ||
| breezSDK.redeemSwap(address) | ||
| logger.log(TAG, "Found swap for $address", "INFO") | ||
| return | ||
| } catch (e: Exception) { | ||
| logger.log(TAG, "Failed to redeem swap: ${e.message}", "WARN") | ||
| } | ||
|
|
||
| try { | ||
| breezSDK.processReverseSwap(address) | ||
| logger.log(TAG, "Found reverse swap for $address", "INFO") | ||
| return | ||
| } catch (e: Exception) { | ||
| logger.log(TAG, "Failed to process reverse swap: ${e.message}", "WARN") | ||
| } | ||
| } | ||
|
|
||
| fgService.onFinished(this) | ||
| } | ||
|
|
||
| override fun onEvent(e: BreezEvent) { | ||
| this.bitcoinAddress?.let {address -> | ||
| when (e) { | ||
| is BreezEvent.ReverseSwapUpdated -> { | ||
| val revSwapInfo = e.details | ||
| logger.log(TAG, "Received reverse swap updated event: ${revSwapInfo.id} current address: $address status: ${revSwapInfo.status}", "TRACE") | ||
| if (revSwapInfo.status == ReverseSwapStatus.COMPLETED_SEEN || revSwapInfo.status == ReverseSwapStatus.COMPLETED_CONFIRMED) { | ||
| notifySuccess(address) | ||
| } | ||
| } | ||
|
|
||
| is BreezEvent.SwapUpdated -> { | ||
| val swapInfo = e.details | ||
| logger.log(TAG, "Received swap updated event: ${swapInfo.bitcoinAddress} current address: $address status: ${swapInfo.status}", "TRACE") | ||
| if (swapInfo.bitcoinAddress == address) { | ||
| if (swapInfo.paidMsat.toLong() > 0) { | ||
| notifySuccess(address) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -67,11 +93,11 @@ class RedeemSwapJob( | |
| notifyFailure() | ||
| } | ||
|
|
||
| private fun notifySuccess(address: String) { | ||
| logger.log(TAG, "Address $address processed successfully", "INFO") | ||
| notifyChannel( | ||
| context, | ||
| NOTIFICATION_CHANNEL_ADDRESS_TXS_CONFIRMED, | ||
| getString( | ||
| context, | ||
| SWAP_TX_CONFIRMED_NOTIFICATION_TITLE, | ||
|
|
@@ -83,10 +109,10 @@ class RedeemSwapJob( | |
|
|
||
| private fun notifyFailure() { | ||
| this.bitcoinAddress?.let{address -> | ||
| logger.log(TAG, "Address $address processing failed", "INFO") | ||
| notifyChannel( | ||
| context, | ||
| NOTIFICATION_CHANNEL_ADDRESS_TXS_CONFIRMED, | ||
| getString( | ||
| context, | ||
| SWAP_TX_CONFIRMED_NOTIFICATION_FAILURE_TITLE, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we rename the notification channel & notification channel group variable as well?