Merge pull request #9718 from nextcloud/fix/recent-files

Fix minor issues with recently modified view

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -153,7 +153,6 @@ public class ExtendedListFragment extends Fragment implements
         FAVORITE_SEARCH,
         GALLERY_SEARCH,
         RECENTLY_MODIFIED_SEARCH,
-        RECENTLY_ADDED_SEARCH,
         // not a real filter, but nevertheless
         SHARED_FILTER
     }
@@ -673,10 +672,6 @@ public class ExtendedListFragment extends Fragment implements
                     setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
                                            R.string.file_list_empty_recently_modified,
                                            R.drawable.ic_list_empty_recent);
-                } else if (searchType == SearchType.RECENTLY_ADDED_SEARCH) {
-                    setMessageForEmptyList(R.string.file_list_empty_headline_server_search,
-                                           R.string.file_list_empty_recently_added,
-                                           R.drawable.ic_list_empty_recent);
                 } else if (searchType == SearchType.REGULAR_FILTER) {
                     setMessageForEmptyList(R.string.file_list_empty_headline_search,
                                            R.string.file_list_empty_search,

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -54,6 +54,7 @@ import com.nextcloud.client.device.DeviceInfo;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.nextcloud.client.utils.Throttler;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
@@ -101,7 +102,6 @@ import com.owncloud.android.utils.EncryptionUtils;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimeTypeUtil;
-import com.nextcloud.client.utils.Throttler;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
 import com.owncloud.android.utils.theme.ThemeFabUtils;
 import com.owncloud.android.utils.theme.ThemeToolbarUtils;
@@ -240,6 +240,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
         if (intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT) != null) {
             searchEvent = Parcels.unwrap(intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT));
+        }
+
+        if (isSearchEventSet(searchEvent)) {
             handleSearchEvent(searchEvent);
         }
 
@@ -1376,9 +1379,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
                 case GALLERY_SEARCH:
                     setTitle(R.string.drawer_item_gallery);
                     break;
-                case RECENTLY_ADDED_SEARCH:
-                    setTitle(R.string.drawer_item_recently_added);
-                    break;
                 case RECENTLY_MODIFIED_SEARCH:
                     setTitle(R.string.drawer_item_recently_modified);
                     break;
@@ -1397,9 +1397,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
         if (event != null) {
             switch (event.getSearchType()) {
                 case FAVORITE_SEARCH:
-                    menuItemAddRemoveValue = MenuItemAddRemove.REMOVE_SORT;
-                    break;
-
                 case RECENTLY_MODIFIED_SEARCH:
                     menuItemAddRemoveValue = MenuItemAddRemove.REMOVE_SORT;
                     break;
@@ -1479,6 +1476,15 @@ public class OCFileListFragment extends ExtendedListFragment implements
         }
     }
 
+    @Override
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            searchEvent = Parcels.unwrap(savedInstanceState.getParcelable(SEARCH_EVENT));
+        }
+    }
+
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onMessageEvent(final SearchEvent event) {
         handleSearchEvent(event);
@@ -1717,7 +1723,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
             (!TextUtils.isEmpty(event.getSearchQuery()) ||
                 event.searchType == SearchRemoteOperation.SearchType.SHARED_SEARCH ||
                 event.searchType == SearchRemoteOperation.SearchType.SHARED_FILTER ||
-                event.searchType == SearchRemoteOperation.SearchType.FAVORITE_SEARCH);
+                event.searchType == SearchRemoteOperation.SearchType.FAVORITE_SEARCH ||
+                event.searchType == SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH);
     }
 
     private void syncAndCheckFiles(Collection<OCFile> files) {

src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java

@@ -46,10 +46,6 @@ public final class DrawerMenuUtil {
             filterMenuItems(menu, R.id.nav_gallery, R.id.nav_favorites);
         }
 
-        if (!resources.getBoolean(R.bool.recently_added_enabled)) {
-            menu.removeItem(R.id.nav_recently_added);
-        }
-
         if (!resources.getBoolean(R.bool.recently_modified_enabled)) {
             menu.removeItem(R.id.nav_recently_modified);
         }

src/main/res/menu/partial_drawer_entries.xml

@@ -53,18 +53,12 @@
             android:icon="@drawable/nav_on_device"
             android:orderInCategory="0"
             android:title="@string/drawer_item_on_device"/>
-        <item
-            android:id="@+id/nav_recently_added"
-            android:icon="@drawable/nav_recently"
-            android:orderInCategory="0"
-            android:title="@string/drawer_item_recently_added"
-            android:visible="false"/>
         <item
             android:id="@+id/nav_recently_modified"
             android:icon="@drawable/nav_recently"
             android:orderInCategory="0"
             android:title="@string/drawer_item_recently_modified"
-            android:visible="false"/>
+            android:visible="true"/>
         <item
             android:orderInCategory="0"
             android:id="@+id/nav_notifications"

src/main/res/values/setup.xml

@@ -53,7 +53,6 @@
     <bool name="multiaccount_support">true</bool>
 
     <!-- Drawer options -->
-    <bool name="recently_added_enabled">false</bool>
     <bool name="recently_modified_enabled">false</bool>
     <bool name="shared_enabled">true</bool>
     <bool name="show_drawer_logout">false</bool>

src/main/res/values/strings.xml

@@ -22,7 +22,6 @@
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Favorites</string>
     <string name="drawer_item_on_device">On device</string>
-    <string name="drawer_item_recently_added">Recently added</string>
     <string name="drawer_item_recently_modified">Recently modified</string>
     <string name="drawer_item_shared">Shared</string>
     <string name="drawer_item_uploads_list">Uploads</string>
@@ -100,7 +99,6 @@
     <string name="file_list_empty_shared">Files and folders you share will show up here.</string>
     <string name="file_list_empty_search">Maybe it is in a different folder?</string>
     <string name="file_list_empty_recently_modified">Found no files modified within the last 7 days</string>
-    <string name="file_list_empty_recently_added">Found no recently added files</string>
     <string name="trashbin_empty_headline">No deleted files</string>
     <string name="trashbin_empty_message">You will be able to recover deleted files from here.</string>
     <string name="upload_list_empty_headline">No uploads available</string>