Skip to content

Conversation

@tobiasKaminsky
Copy link
Member

Backport of #2775

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

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

# Conflicts:
#	src/main/java/com/owncloud/android/utils/DisplayUtils.java
@tobiasKaminsky
Copy link
Member Author

DisplayUtils had a conflict when applying cherry-pick, and now it shows the entire file as diff.
--> I will have look.

@AndyScherzinger
Copy link
Member

AndyScherzinger commented Jul 3, 2018

👍 looks good to me, my guess is that something happened with line-breaks (win/unix?)

Approved with PullApprove

@codecov
Copy link

codecov bot commented Jul 3, 2018

Codecov Report

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

@@               Coverage Diff               @@
##           stable-3.2.x   #2787      +/-   ##
===============================================
- Coverage          6.51%   6.51%   -0.01%     
===============================================
  Files               285     285              
  Lines             28972   28964       -8     
  Branches           4222    4221       -1     
===============================================
- Hits               1888    1886       -2     
+ Misses            26800   26793       -7     
- Partials            284     285       +1
Impacted Files Coverage Δ
...owncloud/android/ui/activity/UserInfoActivity.java 0% <ø> (ø) ⬆️
...m/owncloud/android/ui/activity/DrawerActivity.java 0% <ø> (ø) ⬆️
...wncloud/android/ui/adapter/AccountListAdapter.java 0% <0%> (ø) ⬆️
...loud/android/datamodel/ThumbnailsCacheManager.java 13.55% <0%> (+0.05%) ⬆️
...m/owncloud/android/ui/adapter/UserListAdapter.java 0% <0%> (ø) ⬆️
.../java/com/owncloud/android/utils/DisplayUtils.java 5.97% <5.97%> (ø) ⬆️
.../third_parties/daveKoeller/AlphanumComparator.java 80.45% <0%> (-2.3%) ⬇️

@tobiasKaminsky
Copy link
Member Author

Indeed, on branch it is crlf (win), and it is changing to (lf) linux, so everything fine.

@mario
Copy link
Contributor

mario commented Jul 4, 2018

👍

Approved with PullApprove

@AndyScherzinger AndyScherzinger merged commit 7bcc93d into stable-3.2.x Jul 4, 2018
@AndyScherzinger AndyScherzinger deleted the backport-2775 branch July 4, 2018 11:04
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.

4 participants