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

Backport share link handling #2739

Merged
merged 8 commits into from
Jun 23, 2018
Merged

Conversation

AndyScherzinger
Copy link
Member

Backport of #2730 Display copy icon and adding send action to the link menu

@codecov
Copy link

codecov bot commented Jun 20, 2018

Codecov Report

Merging #2739 into stable-3.2.x will decrease coverage by <.01%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##           stable-3.2.x   #2739      +/-   ##
===============================================
- Coverage          6.52%   6.51%   -0.01%     
===============================================
  Files               284     285       +1     
  Lines             28934   28946      +12     
  Branches           4215    4216       +1     
===============================================
- Hits               1887    1885       -2     
- Misses            26763   26775      +12     
- Partials            284     286       +2
Impacted Files Coverage Δ
...java/com/owncloud/android/utils/ClipboardUtil.java 0% <0%> (ø)
...d/android/ui/activity/CopyToClipboardActivity.java 0% <0%> (ø) ⬆️
...cloud/android/ui/activity/FileDisplayActivity.java 0% <0%> (ø) ⬆️
...android/ui/fragment/FileDetailSharingFragment.java 0% <0%> (ø) ⬆️
.../third_parties/daveKoeller/AlphanumComparator.java 79.31% <0%> (-2.3%) ⬇️

@mario
Copy link
Contributor

mario commented Jun 21, 2018

👍

Approved with PullApprove

@tobiasKaminsky
Copy link
Member

tobiasKaminsky commented Jun 22, 2018

👍

Approved with PullApprove

# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.java
# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.java
@AndyScherzinger AndyScherzinger merged commit 2ba808e into stable-3.2.x Jun 23, 2018
@AndyScherzinger AndyScherzinger deleted the backport_shareLinkHandling branch June 23, 2018 07:57
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.

3 participants