nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

re-add CONTENT_TYPE_SEARCH 

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2018-01-24 15:59:51 +01:00
parent c801a2c7bb
commit b111182c53
No known key found for this signature in database
GPG Key ID: 0E00D4D47D0C5AF7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nextcloud/client/di/ComponentsModule.java
View File

@ -105,9 +105,7 @@ abstract class ComponentsModule {
@ContributesAndroidInjector abstract ManageAccountsActivity manageAccountsActivity();
@ContributesAndroidInjector abstract ManageSpaceActivity manageSpaceActivity();
@ContributesAndroidInjector abstract NotificationsActivity notificationsActivity();
@ContributesAndroidInjector
abstract CommunityActivity participateActivity();
@ContributesAndroidInjector abstract CommunityActivity participateActivity();
@ContributesAndroidInjector abstract PassCodeActivity passCodeActivity();
@ContributesAndroidInjector abstract PreviewImageActivity previewImageActivity();
@ContributesAndroidInjector abstract PreviewVideoActivity previewVideoActivity();

4
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View File

@ -471,6 +471,10 @@ public abstract class DrawerActivity extends ToolbarActivity
SearchEvent.UnsetType.UNSET_BOTTOM_NAV_BAR),
menuItem.getItemId());
break;
case R.id.nav_recently_added:
handleSearchEvents(new SearchEvent("%", SearchRemoteOperation.SearchType.CONTENT_TYPE_SEARCH,
SearchEvent.UnsetType.UNSET_BOTTOM_NAV_BAR), menuItem.getItemId());
break;
case R.id.nav_recently_modified:
handleSearchEvents(new SearchEvent("",
SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH,

7
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View File

@ -377,6 +377,13 @@ public class OCFileListFragment extends ExtendedListFragment implements
currentSearchType = SearchType.FILE_SEARCH;
break;
case CONTENT_TYPE_SEARCH:
if ("video/%".equals(event.getSearchQuery())) {
currentSearchType = SearchType.VIDEO_SEARCH;
}
break;
case FAVORITE_SEARCH:
currentSearchType = SearchType.FAVORITE_SEARCH;
break;