Skip to content

Conversation

@AndyScherzinger
Copy link
Member

Backport of #2727 for #2721

@codecov
Copy link

codecov bot commented Jun 21, 2018

Codecov Report

Merging #2743 into stable-3.2.x will increase coverage by 0.02%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##           stable-3.2.x   #2743      +/-   ##
===============================================
+ Coverage           6.5%   6.53%   +0.02%     
===============================================
  Files               285     283       -2     
  Lines             28946   28864      -82     
  Branches           4216    4201      -15     
===============================================
+ Hits               1884    1887       +3     
+ Misses            26776   26693      -83     
+ Partials            286     284       -2
Impacted Files Coverage Δ
...cloud/android/ui/activity/ExternalSiteWebView.java 0% <0%> (ø) ⬆️
...ndroid/providers/UsersAndGroupsSearchProvider.java 16.66% <0%> (-0.36%) ⬇️
...id/operations/UpdateSharePermissionsOperation.java 0% <0%> (ø) ⬆️
...cloud/android/ui/helpers/FileOperationsHelper.java 0% <0%> (ø) ⬆️
...cloud/android/ui/activity/FileDisplayActivity.java 0% <0%> (ø) ⬆️
...fragment/util/FileDetailSharingFragmentHelper.java 0% <0%> (ø) ⬆️
...in/java/com/owncloud/android/utils/ThemeUtils.java 0% <0%> (ø) ⬆️
...m/owncloud/android/ui/adapter/UserListAdapter.java 0% <0%> (ø) ⬆️
...android/ui/fragment/FileDetailSharingFragment.java 0% <0%> (ø) ⬆️
...d/android/ui/activity/CopyToClipboardActivity.java 0% <0%> (ø) ⬆️
... and 9 more

@tobiasKaminsky
Copy link
Member

tobiasKaminsky commented Jun 22, 2018

👍

Approved with PullApprove

tobiasKaminsky and others added 2 commits June 23, 2018 09:59
- do not start preferences on "back"

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

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java
@AndyScherzinger AndyScherzinger force-pushed the backportFixPrivacyExternalView branch from 5c92f76 to 22b0171 Compare June 23, 2018 07:59
@AndyScherzinger AndyScherzinger merged commit 92c6efc into stable-3.2.x Jun 23, 2018
@AndyScherzinger AndyScherzinger deleted the backportFixPrivacyExternalView branch June 23, 2018 08:05
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