Skip to content

Use localID from webdav#8643

Merged
AlvaroBrey merged 6 commits into
masterfrom
localID_2
Jan 19, 2023
Merged

Use localID from webdav#8643
AlvaroBrey merged 6 commits into
masterfrom
localID_2

Conversation

@tobiasKaminsky

@tobiasKaminsky tobiasKaminsky commented Jun 30, 2021

Copy link
Copy Markdown
Member

Needs nextcloud/android-library#651
After:

@juliushaertl
~~we need to

  • do not use localID (which might make sense in terms of federation)
  • or expose unique server id via capabilities
  • or have server return localID via webdav

EDIT: using localId via webdav is the solution!

E.g. my instance has 14 chars for unique id @juliushaertl
To handle this properly we need uniqe id exposed via registered capability, if this is ok for you.

Fixes #9826
Fixes #10261

Comment thread src/main/java/com/owncloud/android/datamodel/OCFile.java Outdated
@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@tobiasKaminsky tobiasKaminsky changed the title Compute localId from remote id with unique server id Use localID from webdav Jun 30, 2021
@juliusknorr

Copy link
Copy Markdown
Member

EDIT: using localId via webdav is the solution!

yep sounds like the better approach 👍

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

master-Unit test failed, but no output was generated. Maybe a preliminary stage failed.

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

Codacy

Lint

TypemasterPR
Warnings227227
Errors00

SpotBugs (new)

Warning Type Number
Bad practice Warnings 27
Correctness Warnings 51
Internationalization Warnings 9
Multithreaded correctness Warnings 9
Performance Warnings 72
Security Warnings 40
Dodgy code Warnings 97
Total 305

SpotBugs (master)

Warning Type Number
Bad practice Warnings 27
Correctness Warnings 51
Internationalization Warnings 9
Multithreaded correctness Warnings 9
Performance Warnings 72
Security Warnings 40
Dodgy code Warnings 97
Total 305

Android-library is not set to master branch in build.gradle

Comment thread app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt Outdated
Comment thread app/schemas/com.nextcloud.client.database.NextcloudDatabase/66.json
Comment thread app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt Outdated
Comment thread app/src/main/java/com/owncloud/android/datamodel/OCFile.java Outdated
@tobiasKaminsky

Copy link
Copy Markdown
Member Author

/rebase

@tigermick

Copy link
Copy Markdown

hi,
I have a problem here : #10261
and your Nextcloud QA release here : https://www.kaminsky.me/nc-dev/android-artifacts/8643.apk fix my problem

@AlvaroBrey

Copy link
Copy Markdown
Member

/rebase

Comment thread app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@AlvaroBrey

Copy link
Copy Markdown
Member

/rebase

@AlvaroBrey

Copy link
Copy Markdown
Member
/drone/src/app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java:656: error: cannot find symbol
--
712 | assertTrue(new DeletePrivateKeyOperation().execute(client).isSuccess());

tobiasKaminsky and others added 5 commits January 18, 2023 12:23
Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
…entIT

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
@codecov

codecov Bot commented Jan 18, 2023

Copy link
Copy Markdown

Codecov Report

Merging #8643 (daafa24) into master (0b3707c) will decrease coverage by 0.18%.
The diff coverage is 51.72%.

❗ Current head daafa24 differs from pull request most recent head 0d2dc8e. Consider uploading reports for the commit 0d2dc8e to get more accurate results

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #8643      +/-   ##
============================================
- Coverage     31.58%   31.40%   -0.18%     
+ Complexity     3400     3383      -17     
============================================
  Files           566      566              
  Lines         41601    41613      +12     
  Branches       5628     5629       +1     
============================================
- Hits          13138    13070      -68     
- Misses        26508    26593      +85     
+ Partials       1955     1950       -5     
Impacted Files Coverage Δ
...com/nextcloud/client/database/NextcloudDatabase.kt 100.00% <ø> (ø)
...ain/java/com/nextcloud/client/media/LoadUrlTask.kt 0.00% <0.00%> (ø)
...src/main/java/com/nextcloud/client/media/Player.kt 0.00% <0.00%> (ø)
...loud/android/datamodel/ThumbnailsCacheManager.java 35.14% <0.00%> (-5.76%) ⬇️
...ain/java/com/owncloud/android/db/ProviderMeta.java 100.00% <ø> (ø)
...ncloud/android/files/StreamMediaFileOperation.java 0.00% <0.00%> (ø)
...cloud/android/operations/CommentFileOperation.java 0.00% <0.00%> (ø)
...operations/RemoveRemoteEncryptedFileOperation.java 66.00% <ø> (ø)
.../android/operations/RichDocumentsUrlOperation.java 0.00% <0.00%> (ø)
...m/owncloud/android/services/OperationsService.java 37.36% <0.00%> (ø)
... and 30 more

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

Copy link
Copy Markdown
Member Author

Library merged, so let us merge this asap.

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

Codacy

Lint

TypemasterPR
Warnings7676
Errors00

SpotBugs

CategoryBaseNew
Bad practice2727
Correctness4444
Dodgy code335335
Internationalization99
Multithreaded correctness99
Performance5858
Security1818
Total500500

@github-actions

Copy link
Copy Markdown

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/8643.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.

@AlvaroBrey AlvaroBrey merged commit 37b85cf into master Jan 19, 2023
@delete-merged-branch delete-merged-branch Bot deleted the localID_2 branch January 19, 2023 10:19
@szaimen

szaimen commented Jan 19, 2023

Copy link
Copy Markdown
Contributor

🎉🎉🎉

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.

impossible to watch video on stream Android app fails to play media files (music) from bind-mounted folder

6 participants