Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change sharees format #325

Merged
merged 1 commit into from
Aug 21, 2019
Merged

Change sharees format #325

merged 1 commit into from
Aug 21, 2019

Conversation

tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Jul 31, 2019

Needs: nextcloud/server#14429
Only merge if this is in NC17, otherwise change it.

Needs new server image, as it needs
user1, displayName: "User One"
user2, displayName: "User Two"
users group: with user1, user2

Signed-off-by: tobiasKaminsky tobias@kaminsky.me

@codecov
Copy link

codecov bot commented Jul 31, 2019

Codecov Report

Merging #325 into master will increase coverage by 3.79%.
The diff coverage is 50%.

@@            Coverage Diff             @@
##           master     #325      +/-   ##
==========================================
+ Coverage   21.58%   25.38%   +3.79%     
==========================================
  Files         117      118       +1     
  Lines        5166     5220      +54     
  Branches      701      711      +10     
==========================================
+ Hits         1115     1325     +210     
+ Misses       3921     3735     -186     
- Partials      130      160      +30
Impacted Files Coverage Δ
...owncloud/android/lib/resources/shares/OCShare.java 26.6% <0%> (+26.6%) ⬆️
...android/lib/common/operations/RemoteOperation.java 9.52% <0%> (ø) ⬆️
...cloud/android/lib/resources/shares/ShareeUser.java 18.18% <18.18%> (ø)
...ncloud/android/lib/resources/shares/ShareType.java 69.56% <30%> (+69.56%) ⬆️
.../android/lib/resources/files/model/RemoteFile.java 41.5% <33.33%> (+0.94%) ⬆️
...ncloud/android/lib/common/network/WebdavEntry.java 72.36% <82.35%> (+2.9%) ⬆️
...ces/shares/ShareToRemoteOperationResultParser.java 41.93% <0%> (+41.93%) ⬆️
...d/android/lib/resources/shares/ShareXMLParser.java 47.82% <0%> (+47.82%) ⬆️
... and 2 more

AndyScherzinger
AndyScherzinger previously approved these changes Aug 1, 2019
AndyScherzinger
AndyScherzinger previously approved these changes Aug 6, 2019
@tobiasKaminsky
Copy link
Member Author

IT test failed: kaminsky.me/nc-dev/library-integrationTests/1155

This currently cannot work as server PR needs first to be merged.

}
} else {
Log_OC.e("WebdavEntry", "General fuckup, no status for webdav response");
}
}

private @Nullable
ShareeUser createShareeUser(Element element) {
Copy link
Member

Choose a reason for hiding this comment

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

should be a single line

private @Nullable ShareeUser createShareeUser(Element element) {

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.

just a minor formatting comment

@nextcloud-android-bot
Copy link
Collaborator

@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings00
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings15
Correctness Warnings43
Internationalization Warnings6
Malicious code vulnerability Warnings7
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total188

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings14
Correctness Warnings40
Internationalization Warnings6
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total181

SpotBugs increased!

@nextcloud-android-bot
Copy link
Collaborator

@nextcloud-android-bot
Copy link
Collaborator

@tobiasKaminsky tobiasKaminsky force-pushed the adaptSharees branch 3 times, most recently from 69b1246 to 828e6a9 Compare August 20, 2019 14:48
@nextcloud nextcloud deleted a comment Aug 20, 2019
@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings00
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings15
Correctness Warnings43
Internationalization Warnings6
Malicious code vulnerability Warnings7
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total188

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings14
Correctness Warnings40
Internationalization Warnings6
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total181

SpotBugs increased!

@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings00
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings15
Correctness Warnings43
Internationalization Warnings6
Malicious code vulnerability Warnings7
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total188

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings14
Correctness Warnings40
Internationalization Warnings6
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total181

SpotBugs increased!

@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings00
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings15
Correctness Warnings39
Internationalization Warnings6
Malicious code vulnerability Warnings7
Multithreaded correctness Warnings3
Performance Warnings17
Security Warnings17
Dodgy code Warnings81
Total185

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings14
Correctness Warnings40
Internationalization Warnings6
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total181

SpotBugs increased!

@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings01
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings15
Correctness Warnings39
Internationalization Warnings6
Malicious code vulnerability Warnings7
Multithreaded correctness Warnings3
Performance Warnings17
Security Warnings17
Dodgy code Warnings81
Total185

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings14
Correctness Warnings40
Internationalization Warnings6
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total181

Lint increased!

- add ShareeUser, with userId and displayName
- add tests
- add group support
- no need of own hashCode

create user/group in drone

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings00
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings15
Correctness Warnings39
Internationalization Warnings6
Malicious code vulnerability Warnings7
Multithreaded correctness Warnings3
Performance Warnings17
Security Warnings17
Dodgy code Warnings81
Total185

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings14
Correctness Warnings40
Internationalization Warnings6
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings3
Performance Warnings16
Security Warnings17
Dodgy code Warnings81
Total181

@tobiasKaminsky tobiasKaminsky merged commit 4a1ab72 into master Aug 21, 2019
@tobiasKaminsky tobiasKaminsky deleted the adaptSharees branch August 21, 2019 11:04
@AndyScherzinger AndyScherzinger added this to the NC Android lib 1.6.0 milestone Aug 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants