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

E2E sharing #1187

Merged
merged 1 commit into from
Jan 16, 2024
Merged

E2E sharing #1187

merged 1 commit into from
Jan 16, 2024

Conversation

tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Aug 28, 2023

TODO

  • reset drone e2e branch to master

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

fix detekt, spotless

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

re-add Project.xml

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

Licenses

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

Added test

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

migrate CsrHelper to Kotlin

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

fix lint

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

fix some spotbugs

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

temporarily disable test

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@tobiasKaminsky
Copy link
Member Author

/backport to stable-2.17

Copy link

codecov bot commented Jan 16, 2024

Codecov Report

Merging #1187 (7062d41) into master (fa98b24) will decrease coverage by 1.65%.
The diff coverage is 21.86%.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #1187      +/-   ##
============================================
- Coverage     52.56%   50.91%   -1.65%     
+ Complexity      978      975       -3     
============================================
  Files           192      198       +6     
  Lines          7098     7269     +171     
  Branches        934      944      +10     
============================================
- Hits           3731     3701      -30     
- Misses         2851     3057     +206     
+ Partials        516      511       -5     
Files Coverage Δ
...c/main/java/com/nextcloud/operations/PostMethod.kt 100.00% <ø> (ø)
...m/owncloud/android/lib/resources/e2ee/CsrHelper.kt 100.00% <100.00%> (ø)
...lib/resources/shares/GetSharesRemoteOperation.java 75.00% <ø> (ø)
...sources/status/GetCapabilitiesRemoteOperation.java 50.62% <100.00%> (+0.46%) ⬆️
...cloud/android/lib/resources/status/OCCapability.kt 93.75% <100.00%> (+0.09%) ⬆️
...main/java/com/nextcloud/common/OkHttpMethodBase.kt 64.28% <0.00%> (-1.17%) ⬇️
...oud/android/lib/resources/e2ee/MetadataResponse.kt 0.00% <0.00%> (ø)
...b/resources/e2ee/StoreMetadataRemoteOperation.java 0.00% <0.00%> (-72.42%) ⬇️
...wncloud/android/lib/resources/status/E2EVersion.kt 85.71% <85.71%> (ø)
.../lib/resources/e2ee/UnlockFileRemoteOperation.java 0.00% <0.00%> (-70.00%) ⬇️
... and 14 more

@tobiasKaminsky tobiasKaminsky merged commit 5790108 into master Jan 16, 2024
17 of 20 checks passed
@delete-merged-branch delete-merged-branch bot deleted the E2Esharing branch January 16, 2024 06:22
@backportbot-nextcloud
Copy link

The backport to stable-2.17 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-2.17
git pull origin stable-2.17

# Create the new backport branch
git checkout -b fix/foo-stable-2.17

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-2.17

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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.

2 participants