fix(stickers): fix crash in async task + clean up + set bought status #12676
Conversation
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
jrainville
commented
Nov 9, 2023
| @@ -122,8 +122,11 @@ QtObject: | |||
| self.packs.apply(proc(it: var StickerPackView) = | |||
| if it.pack.id == packId: | |||
| it.installed = installed | |||
| if installed: | |||
| it.bought = true | |||
There was a problem hiding this comment.
This is the fix for the bought status (problem 2 in the description)
| @@ -68,9 +69,7 @@ const obtainMarketStickerPacksTask: Task = proc(argEncoded: string) {.gcsafe, ni | |||
|
|
|||
| const installStickerPackTask: Task = proc(argEncoded: string) {.gcsafe, nimcall.} = | |||
| let arg = decode[InstallStickerPackTaskArg](argEncoded) | |||
| if not arg.hasKey: | |||
| arg.finish(false) | |||
| return | |||
There was a problem hiding this comment.
This is the fix for the crash (problem 1)
| @@ -174,10 +174,6 @@ QtObject: | |||
| error "Error reverting sticker transaction", message = getCurrentExceptionMsg() | |||
|
|
|||
| proc init*(self: Service) = | |||
| # TODO redo the connect check when the network is refactored | |||
| # if self.status.network.isConnected: | |||
| self.obtainMarketStickerPacks() # TODO: rename this to obtain sticker market items | |||
There was a problem hiding this comment.
This is the fix for the double obtainMarketStickerPacks calls (problem 3)
Jenkins Builds
|
igor-sirotin
approved these changes
Nov 13, 2023
Comment on lines
406
to
+413
| if installedPack.installed: | ||
| if self.marketStickerPacks.hasKey(installedPack.packId): | ||
| self.marketStickerPacks[installedPack.packId].status = StickerPackStatus.Installed | ||
| self.events.emit(SIGNAL_STICKER_PACK_INSTALLED, StickerPackInstalledArgs( | ||
| packId: installedPack.packId | ||
| )) | ||
| else: | ||
| error "Sticker pack did not get installed", packId = installedPack.packId |
There was a problem hiding this comment.
I'd appreciate quick return with inverted condition, but this is a minor thing ofc 🙂
if not installedPack.installed:
error "Sticker pack did not get installed", packId = installedPack.packId
returnThere was a problem hiding this comment.
Good point. I agree, but also, I'm lazy and the stickers service is pretty messed up, so eff it, I'll merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #12664
The issue was that the async task was badly made. It could return
falseinstead of a tuple, so it made the app crashed.I fixed it by removing that condition, since I we don't actually care if the pack we are installing is in the cache. Worst case, status-go will return an error and we can handle it. In the better case, it was just a weird problem with the cache and since it exists in the model, it probably exists in the backend, so it would go through anyway. That issue was very random for me and I could trigger it only once.
Another issue I found was that when buying a pack, we set the
installedproperty in the model, but notbought, so if you uninstall the pack, it looks like you didn't buy it. That's fixed.Finally, I found that we called
obtainMarketStickerPackstwice on app start. I fixed it by only using the one from the front-end, since it's the one that reacts to the online status changing.In an ideal world, that should all be handled by the backend, but it works from the frontend and the whole sticker service is messy, so it's not worth it refactoring it all just for that.
The rest of the changes are just clean ups