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.

Sign up for GitHub

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

Jump to bottom

Backport: Revert local search #2745

Merged
merged 6 commits into from
Jun 23, 2018
Merged

Backport: Revert local search #2745

merged 6 commits into from
Jun 23, 2018

Conversation

AndyScherzinger
Copy link
Member

@AndyScherzinger AndyScherzinger commented Jun 21, 2018 •
edited
Loading

Backport of #2735

@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.2.1 milestone Jun 21, 2018
@tobiasKaminsky tobiasKaminsky mentioned this pull request Jun 21, 2018
Closed
24 tasks
@codecov
Copy link

codecov bot commented Jun 21, 2018 •
edited
Loading

Codecov Report

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

@@               Coverage Diff               @@
##           stable-3.2.x   #2745      +/-   ##
===============================================
- Coverage          6.52%   6.51%   -0.01%     
===============================================
  Files               285     285              
  Lines             28949   28970      +21     
  Branches           4218    4221       +3     
===============================================
- Hits               1888    1887       -1     
- Misses            26777   26799      +22     
  Partials            284     284
Impacted Files Coverage Δ
...cloud/android/ui/adapter/LocalFileListAdapter.java 0% <ø> (ø) ⬆️
...ncloud/android/ui/fragment/OCFileListFragment.java 0% <ø> (ø) ⬆️
...oud/android/ui/fragment/LocalFileListFragment.java 0% <ø> (ø) ⬆️
...cloud/android/ui/activity/UploadFilesActivity.java 0% <0%> (ø) ⬆️
...loud/android/ui/fragment/ExtendedListFragment.java 0% <0%> (ø) ⬆️
.../third_parties/daveKoeller/AlphanumComparator.java 81.6% <0%> (-1.15%) ⬇️

@tobiasKaminsky
Copy link
Member

tobiasKaminsky commented Jun 22, 2018 •
edited by AndyScherzinger
Loading

👍

Approved with PullApprove

tobiasKaminsky and others added 6 commits June 23, 2018 10:14
@tobiasKaminsky @AndyScherzinger
on filter close: restore all files
0c883f9 
Signed-off-by: tobiasKaminsky <[email protected]>
@tobiasKaminsky @AndyScherzinger
correct annotations
1f7ec65 
Signed-off-by: tobiasKaminsky <[email protected]>
@AndyScherzinger
enhance javaDoc, add annotation
8406ab4
@tobiasKaminsky @AndyScherzinger
On UploadFilesActivity FAB is always hidden
f59fc6f 
Signed-off-by: tobiasKaminsky <[email protected]>
@tobiasKaminsky @AndyScherzinger
fix bug found by CR
35476c2 
Signed-off-by: tobiasKaminsky <[email protected]>

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
@AndyScherzinger
imports after cherry pick
60eea10
@AndyScherzinger AndyScherzinger merged commit 07adbd1 into stable-3.2.x Jun 23, 2018
@AndyScherzinger AndyScherzinger deleted the fixRevertLocalSearch branch June 23, 2018 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Nextcloud App 3.2.1
Development

Successfully merging this pull request may close these issues.
2 participants
@AndyScherzinger @tobiasKaminsky