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

Show sharees #3765

Merged
merged 1 commit into from
Apr 16, 2019
Merged

Show sharees #3765

merged 1 commit into from
Apr 16, 2019

Conversation

tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Mar 18, 2019

Needs: nextcloud/server#14429

TODO

  • backward compability NC<17: no sharees available, thus show old "share" icon
  • test
  • federated share
    • show avatar for incoming share
    • show avatar for sharing a file to a remote user

Federated sharing is out of scope. This needs to be done first on server: nextcloud/server#14564

What it does

  • show avatars
    • of person who shared it with me on first position (left) [if any]
    • shows list of persons I shared with (if any)
    • limit is 3: if more than 3 it shows "multiple user icon"
    • click on it still opens share view

Special thanks to @stefan-niedermann @desperateCoder for helping with the overlapping avatars!

2019-03-18-093635

@desperateCoder
Copy link

@tobiasKaminsky you're welcome buddy! 😃

@codecov
Copy link

codecov bot commented Mar 21, 2019

Codecov Report

Merging #3765 into master will increase coverage by <.01%.
The diff coverage is 4.7%.

@@             Coverage Diff             @@
##             master   #3765      +/-   ##
===========================================
+ Coverage      6.31%   6.31%   +<.01%     
  Complexity        1       1              
===========================================
  Files           318     318              
  Lines         31212   31236      +24     
  Branches       4469    4472       +3     
===========================================
+ Hits           1971    1973       +2     
- Misses        28946   28968      +22     
  Partials        295     295
Impacted Files Coverage Δ Complexity Δ
...ain/java/com/owncloud/android/db/ProviderMeta.java 88% <ø> (ø) 0 <0> (ø) ⬇️
...loud/android/datamodel/ThumbnailsCacheManager.java 15.08% <ø> (ø) 0 <0> (ø) ⬇️
...ncloud/android/ui/fragment/FileDetailFragment.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...a/com/owncloud/android/utils/FileStorageUtils.java 8% <0%> (ø) 0 <0> (ø) ⬇️
...cloud/android/ui/adapter/FileDetailTabAdapter.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...owncloud/android/ui/adapter/OCFileListAdapter.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...wncloud/android/providers/FileContentProvider.java 18.9% <0%> (ø) 0 <0> (ø) ⬇️
...android/ui/fragment/FileDetailSharingFragment.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...in/java/com/owncloud/android/datamodel/OCFile.java 59.36% <100%> (ø) 0 <0> (ø) ⬇️
...loud/android/datamodel/FileDataStorageManager.java 11.84% <42.85%> (+0.05%) 0 <0> (ø) ⬇️
... and 10 more

@codecov
Copy link

codecov bot commented Mar 21, 2019

Codecov Report

Merging #3765 into master will decrease coverage by 0.17%.
The diff coverage is 4.54%.

@@             Coverage Diff             @@
##             master   #3765      +/-   ##
===========================================
- Coverage      6.57%    6.4%   -0.18%     
  Complexity        1       1              
===========================================
  Files           320     323       +3     
  Lines         30814   31295     +481     
  Branches       4403    4481      +78     
===========================================
- Hits           2027    2005      -22     
- Misses        28492   28992     +500     
- Partials        295     298       +3
Impacted Files Coverage Δ Complexity Δ
...ncloud/android/ui/fragment/FileDetailFragment.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...ain/java/com/owncloud/android/db/ProviderMeta.java 84.61% <ø> (ø) 0 <0> (ø) ⬇️
...loud/android/datamodel/ThumbnailsCacheManager.java 15.08% <ø> (ø) 0 <0> (ø) ⬇️
...a/com/owncloud/android/utils/FileStorageUtils.java 7.96% <0%> (-0.04%) 0 <0> (ø)
...owncloud/android/ui/adapter/OCFileListAdapter.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...wncloud/android/providers/FileContentProvider.java 18.68% <0%> (-0.22%) 0 <0> (ø)
...android/ui/fragment/FileDetailSharingFragment.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...m/owncloud/android/ui/adapter/UserListAdapter.java 0% <0%> (ø) 0 <0> (ø) ⬇️
...in/java/com/owncloud/android/datamodel/OCFile.java 59.54% <100%> (+0.18%) 0 <0> (ø) ⬇️
...loud/android/datamodel/FileDataStorageManager.java 11.96% <37.5%> (+0.17%) 0 <0> (ø) ⬇️
... and 85 more

@tobiasKaminsky
Copy link
Member Author

@AndyScherzinger AndyScherzinger force-pushed the showSharees branch from 3df3a0c to 88bc211 a day ago

Please do not do a force-push on branches we are developing on, as this breaks the locally checked out branch. It makes it especially hard, when the other person has uncommitted changes.
A merge master should be the way to go while developing.

Once it is ready we can and should do a rebase on master to get rid of those merge commits.

@tobiasKaminsky
Copy link
Member Author

NC master:
Android
2019-04-11-143158

Server:
image

@AndyScherzinger
Copy link
Member

@tobiasKaminsky is the difference between Android and webUI on purpose?

@tobiasKaminsky
Copy link
Member Author

@tobiasKaminsky is the difference between Android and webUI on purpose?

Yes, we are the future :-)

  • show avatars for federated sharing
  • show multiple avatars

@tobiasKaminsky
Copy link
Member Author

tobiasKaminsky commented Apr 11, 2019

NC 15:

Android:
2019-04-11-151322

Server:
image

@tobiasKaminsky
Copy link
Member Author

So this is ready from my side, but we will have to wait for server.

@AndyScherzinger
Copy link
Member

👍 looks good code-wise, just a question, and an unused import it seems

@nextcloud nextcloud deleted a comment Apr 11, 2019
@nextcloud nextcloud deleted a comment Apr 11, 2019
@nextcloud nextcloud deleted a comment Apr 11, 2019
@nextcloud nextcloud deleted a comment Apr 11, 2019
@tobiasKaminsky
Copy link
Member Author

I am unsure, if we wait for linked server PR, or just merge this and once server PR is ready, this will work out of the box…

@AndyScherzinger
Copy link
Member

@tobiasKaminsky if it won't lead to issues/crashes without the server merge and then works automagially as soon as the server supports it then I'd say let's merge it.

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

Codacy

298

Lint

TypemasterPR
Warnings5757
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings80
Internationalization Warnings15
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings124
Security Warnings47
Dodgy code Warnings132
Total436

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings25
Correctness Warnings80
Internationalization Warnings15
Malicious code vulnerability Warnings4
Multithreaded correctness Warnings9
Performance Warnings124
Security Warnings47
Dodgy code Warnings132
Total436

@nextcloud-android-bot
Copy link
Collaborator

@tobiasKaminsky tobiasKaminsky merged commit 02cbafe into master Apr 16, 2019
@tobiasKaminsky tobiasKaminsky deleted the showSharees branch April 16, 2019 08:31
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.7.0 milestone Apr 16, 2019
nextcloud-android-bot pushed a commit that referenced this pull request May 2, 2019
71f3370 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
0f50088 Merge pull request #3916 from jmue/cleanup/string_compare
7bb07a0 Update wording for store text (#3903)
4c72f3f Merge pull request #3923 from nextcloud/editOnShareLink
81ed32f allow edit on link share on a file
7d01ff7 - fix IT tests - re-organized build.gradle a bit
a9afff7 Merge pull request #3929 from nextcloud/dependabot/gradle/org.powermock-powermock-core-2.0.2
71c6d99 bump all other powermock parts to 2.0.2
0421d26 Bump powermock-core from 2.0.0 to 2.0.2
1d28d1b Update with new wording from frontpage
de3d3de Merge pull request #3924 from nextcloud/warnOnStable
69dd243 warn for wrong library branch on stable
2379b49 Merge pull request #3921 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.4.0
c2730e8 Bump gradle from 3.3.2 to 3.4.0
b69169f unify empty string compare
8bb654b fix test & review comments
d8b9d10 unify empty string compare
2f23a30 remove unused variable (#3920)
92df32e Merge pull request #3918 from nextcloud/codacyCleanup
091c003 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
15ec487 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
da3c497 Merge commit '334155e707975e740a0a13b33d9b7bbedf40e9bc'
b22f517 Merge pull request #3915 from jmue/cleanup/ocfile
c7c6a98 use constant
e6604c8 use constant
caa2a91 Merge pull request #3912 from nextcloud/libraryUsage
334155e some cleanups
28f80cd Merge pull request #3907 from nextcloud/ezaquarii/initialize-main-app-context-before-content-providers-start
2afb934 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
8be1157 Merge pull request #3899 from jmue/cleanup/uriutils
52020a9 direct usage of library project
4062d40 Merge pull request #3908 from nextcloud/missingInjectable
2a08cb4 Initialize global context before MainApp.onCreate()
f02f482 Missing Injectable lead to half-stored account
02cbafe Merge pull request #3765 from nextcloud/showSharees
dc7a2c0 show sharees
03e04e5 Merge pull request #3889 from nextcloud/checkUserId
d65e94b Update wording for store text
585a3d0 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
533debf - removed useNextcloudUserAgent -> we now use this everytime - removed any oAuth and saml stuff, as we rely on weblogin flow
d544fa5 Merge pull request #3897 from nextcloud/ezaquarii/move-current-account-getter-to-user-account-manager
5b4ffba Merge pull request #3900 from nextcloud/codacyOnMaster
2757244 remove unused code
428a8bb show codacy count only on master
6b44074 Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
c62e89b Merge commit '442394f949ff2de86bcccae172d2e9d997ab2ef8'
442394f Migrate current account getter from AccountUtils to UserAccountManager
182b65e daily dev 20190414
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants