Skip to content

Show note - #3121

Merged
AndyScherzinger merged 1 commit into
masterfrom
showNote
Mar 20, 2019
Merged

Show note#3121
AndyScherzinger merged 1 commit into
masterfrom
showNote

Conversation

@tobiasKaminsky

@tobiasKaminskytobiasKaminsky commented Oct 9, 2018

Copy link
Copy Markdown
Member

This shows a note, if available, in file detail sharing fragment.
As it is only shown if a note is available, it is out of the box backward compatible.

Requires PR for server: nextcloud/server#12978

@tobiasKaminsky
tobiasKaminskyforce-pushed the sendNote branch 2 times, most recently from 6f699a2 to 2630ab7CompareOctober 24, 2018 08:41
@nextcloudnextcloud deleted a comment Oct 26, 2018
@nextcloudnextcloud deleted a comment Oct 26, 2018
@tobiasKaminsky
tobiasKaminsky changed the base branch from sendNote to masterOctober 26, 2018 06:43
@tobiasKaminsky
tobiasKaminskyforce-pushed the showNote branch 3 times, most recently from 584978c to bfada77CompareDecember 6, 2018 07:46
@tobiasKaminsky
tobiasKaminsky changed the base branch from master to showSharedUserDecember 6, 2018 07:46
@AndyScherzinger

AndyScherzinger commented Dec 6, 2018

Copy link
Copy Markdown
Member

@tobiasKaminsky corresponding lib change has been merged to master branch and jitpack build has been triggered and turned green, so jitpack lib master will ship the lib change now 👍

@nextcloudnextcloud deleted a comment Dec 6, 2018
@AndyScherzingerAndyScherzinger added the needs info Waiting for info from user(s). Issues with this label will auto-stale. label Jan 23, 2019
@AndyScherzinger

Copy link
Copy Markdown
Member

pinging @schiessle for feedback/input ❤️

@nextcloudnextcloud deleted a comment Feb 13, 2019
@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

2019-02-15-093135image

Is the note "ShareAble" good enough to recognize? (both on Android / web UI)

@AndyScherzinger

Copy link
Copy Markdown
Member

Is the note "ShareAble" good enough to recognize? (both on Android / web UI)

I don't think so to be honest. It could maybe have the text file icon or something. Maybe @nextcloud/designers have a nice idea?

@codecov

codecovBot commented Feb 15, 2019

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (showSharedUser@191e12a). Click here to learn what that means.
The diff coverage is 18.18%.

@@ Coverage Diff @@## showSharedUser #3121 +/- ##
================================================
Coverage ? 6.18% Complexity ? 1 ================================================
Files ? 317 Lines ? 30602 Branches ? 4397 ================================================
Hits ? 1894 Misses ? 28422 Partials ? 286
Impacted FilesCoverage ΔComplexity Δ
...ain/java/com/owncloud/android/db/ProviderMeta.java88% <ø> (ø)0 <0> (?)
...ncloud/android/ui/fragment/OCFileListFragment.java0% <ø> (ø)0 <0> (?)
...a/com/owncloud/android/utils/FileStorageUtils.java12.3% <0%> (ø)0 <0> (?)
...wncloud/android/providers/FileContentProvider.java15.25% <0%> (ø)0 <0> (?)
...android/ui/fragment/FileDetailSharingFragment.java0% <0%> (ø)0 <0> (?)
...in/java/com/owncloud/android/datamodel/OCFile.java59.55% <100%> (ø)0 <0> (?)
...loud/android/datamodel/FileDataStorageManager.java10.74% <50%> (ø)0 <0> (?)

@codecov

codecovBot commented Feb 15, 2019

Copy link
Copy Markdown

Codecov Report

Merging #3121 into master will increase coverage by 0.05%.
The diff coverage is 4.34%.

@@ Coverage Diff @@## master #3121 +/- ##
===========================================
+ Coverage 6.26% 6.31% +0.05% 
Complexity 1 1 ===========================================
Files 318 318 Lines 31189 31214 +25 Branches 4467 4469 +2 ===========================================
+ Hits 1954 1972 +18 - Misses 28942 28948 +6 - Partials 293 294 +1
Impacted FilesCoverage ΔComplexity Δ
...ain/java/com/owncloud/android/db/ProviderMeta.java88% <ø> (ø)0 <0> (ø)⬇️
...loud/android/datamodel/ThumbnailsCacheManager.java15.08% <ø> (ø)0 <0> (ø)⬇️
...ncloud/android/ui/fragment/FileDetailFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...a/com/owncloud/android/utils/FileStorageUtils.java8% <0%> (-0.05%)0 <0> (ø)
...cloud/android/ui/adapter/FileDetailTabAdapter.java0% <0%> (ø)0 <0> (ø)⬇️
...owncloud/android/ui/adapter/OCFileListAdapter.java0% <0%> (ø)0 <0> (ø)⬇️
...wncloud/android/providers/FileContentProvider.java18.9% <0%> (-0.23%)0 <0> (ø)
...android/ui/fragment/FileDetailSharingFragment.java0% <0%> (ø)0 <0> (ø)⬇️
...in/java/com/owncloud/android/datamodel/OCFile.java59.36% <100%> (+0.18%)0 <0> (ø)⬇️
...loud/android/datamodel/FileDataStorageManager.java11.78% <50%> (+0.12%)0 <0> (ø)⬇️
... and 4 more

@nextcloudnextcloud deleted a comment Feb 16, 2019
@jancborchardt

Copy link
Copy Markdown
Member

Is the note "ShareAble" good enough to recognize? (both on Android / web UI)

I don't think so to be honest. It could maybe have the text file icon or something. Maybe @nextcloud/designers have a nice idea?

I’d say it’s good for the first pass – normally the note has some more explanatory content than just a word, and it’s inherently understandable as a note.

If we see it’s a problem in actual use, we can always add .icon-edit, the text document icon we also use for the "Add note" menu entry.

@tobiasKaminsky
tobiasKaminsky changed the base branch from showSharedUser to masterFebruary 25, 2019 08:10
@nextcloudnextcloud deleted a comment Feb 25, 2019
@AndyScherzinger

Copy link
Copy Markdown
Member

@tobiasKaminsky needs a rebase and one question: is this ready to merge or does it need the server PR to be merged?

@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

@tobiasKaminsky needs a rebase and one question: is this ready to merge or does it need the server PR to be merged?

This originally depended on #3320, but I rebased it onto master, which now results in duplicated classes/additions, so I would like to merge #3320 before this.
After merge of #3320 I'll do a rebase.

This still requires nextcloud/server#12978 to be merged.
Backward compability should be working out of the box as older server just do not respond to "nc:note".
But I'll test it then.

(sorry for the confusion)

@tobiasKaminskytobiasKaminsky added 3. to review and removed 2. developing needs info Waiting for info from user(s). Issues with this label will auto-stale. labels Feb 28, 2019
@nextcloudnextcloud deleted a comment Feb 28, 2019
@nextcloudnextcloud deleted a comment Feb 28, 2019

boolean notOnSameServer = false;

if (notOnSameServer) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@tobiasKaminsky this is always false...

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good question, why I did this.
Maybe to test…
I'll fix it.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

We ignore this for now. If there is a federated share, only the text generated avatar will be shown.
Ref: nextcloud/server#14564

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

linebreak before the comment :)

@AndyScherzinger

Copy link
Copy Markdown
Member

@tobiasKaminsky just two minor comments plus needs-rebase :)

@AndyScherzinger

Copy link
Copy Markdown
Member

@tobiasKaminsky see review comments :)

@AndyScherzinger

Copy link
Copy Markdown
Member

@tobiasKaminsky rebase 'n' merge? ❤️

@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

Not quite…the part with federated icons is still open.
I hope I find time tomorrow :/

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

Copy link
Copy Markdown
MemberAuthor

Finally done :-)

@nextcloud-android-bot

Copy link
Copy Markdown
Collaborator

Lint

TypemasterPR
Warnings6868
Errors00

FindBugs (new)

Warning TypeNumber
Bad practice Warnings33
Correctness Warnings118
Internationalization Warnings15
Malicious code vulnerability Warnings5
Multithreaded correctness Warnings9
Performance Warnings119
Security Warnings56
Dodgy code Warnings120
Total475

FindBugs (master)

Warning TypeNumber
Bad practice Warnings33
Correctness Warnings118
Internationalization Warnings15
Malicious code vulnerability Warnings5
Multithreaded correctness Warnings9
Performance Warnings119
Security Warnings56
Dodgy code Warnings120
Total475

@nextcloudnextcloud deleted a comment Mar 20, 2019
@AndyScherzinger
AndyScherzinger merged commit 01acf65 into masterMar 20, 2019
@AndyScherzinger
AndyScherzinger deleted the showNote branch March 20, 2019 09:01
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.

4 participants

@tobiasKaminsky@AndyScherzinger@jancborchardt@nextcloud-android-bot