Skip to content

Public share: if ask for password is set, show an optional password dialog - #3989

Merged
AndyScherzinger merged 6 commits into
masterfrom
askForPassword
May 14, 2019
Merged

Public share: if ask for password is set, show an optional password dialog#3989
AndyScherzinger merged 6 commits into
masterfrom
askForPassword

Conversation

@tobiasKaminsky

@tobiasKaminskytobiasKaminsky commented May 9, 2019

Copy link
Copy Markdown
Member

Ref:

This is a new capability, starting with NC17.
As the current behaviour is to not show any dialog, it is ok to add it right now.
If the flag is set (see below), then it will be used.

image

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

@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

Will wait for final decision on capability name.

@codecov

codecovBot commented May 10, 2019

Copy link
Copy Markdown

Codecov Report

Merging #3989 into master will decrease coverage by 0.03%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #3989 +/- ##
===========================================
- Coverage 6.61% 6.57% -0.04% 
Complexity 1 1 ===========================================
Files 326 322 -4 Lines 30930 30946 +16 Branches 4409 4412 +3 ===========================================
- Hits 2045 2036 -9 - Misses 28588 28615 +27 + Partials 297 295 -2
Impacted FilesCoverage ΔComplexity Δ
...ain/java/com/owncloud/android/db/ProviderMeta.java84.61% <ø> (ø)0 <0> (ø)⬇️
...android/ui/dialog/SharePasswordDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...loud/android/datamodel/FileDataStorageManager.java11.92% <0%> (-0.04%)0 <0> (ø)
...om/owncloud/android/ui/activity/ShareActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...om/owncloud/android/ui/dialog/SendShareDialog.java0% <0%> (ø)0 <0> (ø)⬇️
...wncloud/android/providers/FileContentProvider.java19.13% <0%> (-0.23%)0 <0> (ø)
...android/ui/fragment/FileDetailSharingFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/activity/FileDisplayActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...wncloud/android/ui/fragment/ShareFileFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/helpers/FileOperationsHelper.java0% <0%> (ø)0 <0> (ø)⬇️
... and 17 more

@codecov

codecovBot commented May 10, 2019

Copy link
Copy Markdown

Codecov Report

Merging #3989 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #3989 +/- ##
===========================================
- Coverage 6.7% 6.68% -0.02% 
Complexity 1 1 ===========================================
Files 326 326 Lines 30884 30915 +31 Branches 4406 4409 +3 ===========================================
- Hits 2070 2068 -2 - Misses 28516 28547 +31 - Partials 298 300 +2
Impacted FilesCoverage ΔComplexity Δ
...ain/java/com/owncloud/android/db/ProviderMeta.java84.61% <ø> (ø)0 <0> (ø)⬇️
...android/ui/dialog/SharePasswordDialogFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...loud/android/datamodel/FileDataStorageManager.java11.85% <0%> (-0.05%)0 <0> (ø)
...om/owncloud/android/ui/activity/ShareActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...om/owncloud/android/ui/dialog/SendShareDialog.java0% <0%> (ø)0 <0> (ø)⬇️
...wncloud/android/providers/FileContentProvider.java18.91% <0%> (-0.22%)0 <0> (ø)
...android/ui/fragment/FileDetailSharingFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/activity/FileDisplayActivity.java0% <0%> (ø)0 <0> (ø)⬇️
...wncloud/android/ui/fragment/ShareFileFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...cloud/android/ui/helpers/FileOperationsHelper.java0% <0%> (ø)0 <0> (ø)⬇️
... and 1 more

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

Codacy

279

Lint

TypemasterPR
Warnings5858
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings174
Security Warnings47
Dodgy code Warnings140
Total490

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings174
Security Warnings47
Dodgy code Warnings141
Total491

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

@AndyScherzinger

Copy link
Copy Markdown
Member

@tobiasKaminsky needs another rebase to resolve latest conflicts

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

Codacy

284

Lint

TypemasterPR
Warnings5858
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings122
Security Warnings47
Dodgy code Warnings140
Total438

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings122
Security Warnings47
Dodgy code Warnings140
Total438

tobiasKaminskyand others added 6 commits May 14, 2019 13:23
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
… [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

Codacy

284

Lint

TypemasterPR
Warnings5858
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings122
Security Warnings47
Dodgy code Warnings140
Total438

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings79
Internationalization Warnings12
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings122
Security Warnings47
Dodgy code Warnings140
Total438

@AndyScherzinger
AndyScherzinger merged commit b4f36f4 into masterMay 14, 2019
@AndyScherzinger
AndyScherzinger deleted the askForPassword branch May 14, 2019 12:34
tobiasKaminsky added a commit that referenced this pull request May 15, 2019
b4f36f4 Merge pull request #3989 from nextcloud/askForPassword
1edf2cd changes due to rebase
a0a841f revert to master branch
d372a21 combine if statement
9650a14 change capability name
788cea1 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
8f78e61 if ask for password is set, show an optional password dialog
3b24d09 daily dev 20190514
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tobiasKaminsky@nextcloud-android-bot@AndyScherzinger