Upload are deleted after decision was made in conflict activity#7102
Upload are deleted after decision was made in conflict activity#7102tobiasKaminsky merged 1 commit intomasterfrom
Conversation
tobiasKaminsky
force-pushed
the
conflictAutoUpload
branch
from
62ee833 to
a8eee05
Compare
AndyScherzinger
left a comment
AndyScherzinger
left a comment
There was a problem hiding this comment.
LGTM, screenshots for tests need to be updated though
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky
force-pushed
the
conflictAutoUpload
branch
from
a8eee05 to
d34b1e8
Compare
|
Issues
======
- Added 1
See the complete overview on Codacy |
| "_id ASC"); | ||
|
|
||
| if (cursor != null) { | ||
| if (cursor.moveToFirst()) { |
There was a problem hiding this comment.
Codacy found an issue: These nested if statements could be combined
|
APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16338.apk |
|
master-light-blue-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-Screenshot-master-light-blue |
|
stable-light-blue-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-Screenshot-stable-light-blue |
|
stable-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-IT-stable |
CodacyLint
SpotBugs (new)
SpotBugs (master)
|
|
master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/16338-IT-master |
Upload are deleted after decision was made in conflict activity Signed-off-by: thelittlefireman <thelittlefireman@users.noreply.github.com>
3 participants
Fix #7082
Fix #6963
Fix #6692
Fix #5755
Signed-off-by: tobiasKaminsky tobias@kaminsky.me
Testing
Writing tests is very important. Please try to write some tests for your PR.
If you need help, please do not hesitate to ask in this PR for help.
unit tests
instrumented tests
UI tests