Skip to content

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Oct 16, 2020

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

  • Tests written, or not not needed

Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, screenshots for tests need to be updated though

@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.14.0 milestone Oct 28, 2020
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Copy link
Collaborator

Codacy Here is an overview of what got changed by this pull request:

Issues
======
- Added 1
           

See the complete overview on Codacy

"_id ASC");

if (cursor != null) {
if (cursor.moveToFirst()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nextcloud-android-bot
Copy link
Collaborator

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/16338.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@nextcloud-android-bot
Copy link
Collaborator

@nextcloud-android-bot
Copy link
Collaborator

@nextcloud-android-bot
Copy link
Collaborator

@nextcloud-android-bot
Copy link
Collaborator

Codacy

Lint

TypemasterPR
Warnings337337
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings53
Internationalization Warnings9
Multithreaded correctness Warnings9
Performance Warnings72
Security Warnings44
Dodgy code Warnings102
Total316

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings27
Correctness Warnings53
Internationalization Warnings9
Multithreaded correctness Warnings9
Performance Warnings72
Security Warnings44
Dodgy code Warnings102
Total316

@nextcloud-android-bot
Copy link
Collaborator

@tobiasKaminsky tobiasKaminsky merged commit 109487f into master Oct 29, 2020
@delete-merged-branch delete-merged-branch bot deleted the conflictAutoUpload branch October 29, 2020 08:45
thelittlefireman pushed a commit to thelittlefireman/android that referenced this pull request Mar 19, 2021
Upload are deleted after decision was made in conflict activity
Signed-off-by: thelittlefireman <thelittlefireman@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

4 participants