Don't put User model into ConflictsResolveActivity account extra#5857
Merged
tobiasKaminsky merged 1 commit intoApr 14, 2020
Merged
Conversation
User model has been put into Intent instead of Account, causing a crash. Convert User into Account before setting extras parameters. Fixes #5849 Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
Collaborator
Author
|
@tobiasKaminsky @AndyScherzinger This is a trivial fix and should be merged ASAP. |
Collaborator
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/13502.apk |
Collaborator
|
Unit test failed, but no output was generated. Maybe a preliminary stage failed. |
Collaborator
Codacy383Lint
SpotBugs (new)
SpotBugs (master)
|
Collaborator
|
Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/13502-Screenshot |
Member
|
/backport to stable-3.11 |
tobiasKaminsky
approved these changes
Apr 14, 2020
delete-merged-branch
Bot
deleted the
ezaquarii/fix-broken-account-extra-in-conflicts-resolve-activity
branch
April 14, 2020 07:13
|
The backport to stable-3.11 failed. Please do this backport manually. |
ezaquarii
restored the
ezaquarii/fix-broken-account-extra-in-conflicts-resolve-activity
branch
April 15, 2020 22:28
tobiasKaminsky
deleted the
ezaquarii/fix-broken-account-extra-in-conflicts-resolve-activity
branch
April 16, 2020 21:32
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
User model has been put into Intent instead of Account,
causing a crash. Convert User into Account before setting
extras parameters.
Fixes #5849
Signed-off-by: Chris Narkiewicz hello@ezaquarii.com
Testing