Merge pull request #16575 from nextcloud/feat/recent-files

alperozturk96 · web-flow · commit 1ea761df0e92 · 2026-03-30T08:41:32.000+02:00
feat: recent files
diff --git a/app/src/main/java/com/nextcloud/utils/extensions/OCFileExtensions.kt b/app/src/main/java/com/nextcloud/utils/extensions/OCFileExtensions.kt
@@ -23,12 +23,6 @@ fun OCFile.isTempFile(): Boolean {
     return storagePath?.startsWith(appTempPath) == true
 }
 
-fun OCFile.mediaSize(defaultThumbnailSize: Float): Pair<Int, Int> {
-    val width = (imageDimension?.width?.toInt() ?: defaultThumbnailSize.toInt())
-    val height = (imageDimension?.height?.toInt() ?: defaultThumbnailSize.toInt())
-    return width to height
-}
-
 fun OCFile?.isPNG(): Boolean {
     if (this == null) {
         return false
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -592,7 +592,7 @@ private void filterDrawerMenu(final Menu menu, @NonNull final User user) {
             DrawerMenuUtil.filterAssistantMenuItem(menu, capability, getResources());
         }
 
-        DrawerMenuUtil.filterSearchMenuItems(menu, user, getResources());
+        DrawerMenuUtil.filterSearchMenuItems(menu, user);
         DrawerMenuUtil.setupHomeMenuItem(menu, getResources());
         DrawerMenuUtil.removeMenuItem(menu, R.id.nav_community, !getResources().getBoolean(R.bool.participate_enabled));
         DrawerMenuUtil.removeMenuItem(menu, R.id.nav_shared, !getResources().getBoolean(R.bool.shared_enabled));
@@ -639,7 +639,7 @@ private void onNavigationItemClicked(final MenuItem menuItem) {
             }
         } else if (itemId == R.id.nav_shared) {
             openSharedTab();
-        } else if (itemId == R.id.nav_recently_modified) {
+        } else if (itemId == R.id.nav_recent_files) {
             resetOnlyPersonalAndOnDevice();
             startRecentlyModifiedSearch(menuItem);
         } else if (itemId == R.id.nav_assistant) {
@@ -1486,14 +1486,4 @@ public boolean isToolbarStyleSearch() {
             menuItemId == R.id.nav_all_files ||
             menuItemId == R.id.nav_personal_files;
     }
-
-    public boolean isMenuItemIdBelongsToSearchType() {
-        int menuItemId = getSelectedMenuItemId();
-
-        return menuItemId == R.id.nav_favorites ||
-            menuItemId == R.id.nav_shared ||
-            menuItemId == R.id.nav_on_device ||
-            menuItemId == R.id.nav_recently_modified ||
-            menuItemId == R.id.nav_gallery;
-    }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt b/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.kt
@@ -31,7 +31,7 @@ data class SearchEvent(val searchQuery: String, val searchType: SearchRemoteOper
     fun toSearchType(): SearchType? = when (searchType) {
         SearchRemoteOperation.SearchType.FILE_SEARCH -> SearchType.FILE_SEARCH
         SearchRemoteOperation.SearchType.FAVORITE_SEARCH -> SearchType.FAVORITE_SEARCH
-        SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH -> SearchType.RECENTLY_MODIFIED_SEARCH
+        SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH -> SearchType.RECENT_FILES_SEARCH
         SearchRemoteOperation.SearchType.SHARED_FILTER -> SearchType.SHARED_FILTER
         SearchRemoteOperation.SearchType.PHOTO_SEARCH -> SearchType.GALLERY_SEARCH
         SearchRemoteOperation.SearchType.GALLERY_SEARCH -> SearchType.GALLERY_SEARCH
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt
@@ -626,11 +626,11 @@ open class ExtendedListFragment :
                 )
             }
 
-            SearchType.RECENTLY_MODIFIED_SEARCH -> {
+            SearchType.RECENT_FILES_SEARCH -> {
                 setMessageForEmptyList(
-                    R.string.file_list_empty_headline_server_search,
-                    R.string.file_list_empty_recently_modified,
-                    R.drawable.ic_list_empty_recent
+                    R.string.file_list_empty_recent_files_headline,
+                    R.string.file_list_empty_recent_files_description,
+                    R.drawable.nav_recently_outline
                 )
             }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -80,6 +80,7 @@
 import com.owncloud.android.lib.resources.e2ee.ToggleEncryptionRemoteOperation;
 import com.owncloud.android.lib.resources.files.SearchRemoteOperation;
 import com.owncloud.android.lib.resources.files.ToggleFavoriteRemoteOperation;
+import com.owncloud.android.lib.resources.files.model.RemoteFile;
 import com.owncloud.android.lib.resources.status.E2EVersion;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.lib.resources.status.Type;
@@ -153,7 +154,7 @@
 import static com.owncloud.android.ui.fragment.SearchType.FAVORITE_SEARCH;
 import static com.owncloud.android.ui.fragment.SearchType.FILE_SEARCH;
 import static com.owncloud.android.ui.fragment.SearchType.NO_SEARCH;
-import static com.owncloud.android.ui.fragment.SearchType.RECENTLY_MODIFIED_SEARCH;
+import static com.owncloud.android.ui.fragment.SearchType.RECENT_FILES_SEARCH;
 import static com.owncloud.android.ui.fragment.SearchType.SHARED_FILTER;
 import static com.owncloud.android.utils.DisplayUtils.openSortingOrderDialogFragment;
 
@@ -1834,7 +1835,7 @@ protected void setEmptyView(SearchEvent event) {
                     break;
 
                 case RECENTLY_MODIFIED_SEARCH:
-                    setEmptyListMessage(RECENTLY_MODIFIED_SEARCH);
+                    setEmptyListMessage(RECENT_FILES_SEARCH);
                     break;
 
                 case SHARED_FILTER:
@@ -1946,10 +1947,10 @@ protected void handleSearchEvent(SearchEvent event) {
 
         final var activity = getActivity();
         if (activity != null) {
-            activity.runOnUiThread(() -> {{
+            activity.runOnUiThread(() -> {
                 getAdapter().removeAllFiles();
                 setEmptyListMessage(EmptyListState.LOADING);
-            }});
+            });
         }
 
         prepareCurrentSearch(event);
@@ -1962,7 +1963,13 @@ protected void handleSearchEvent(SearchEvent event) {
         });
 
         final User currentUser = accountManager.getUser();
-        final var remoteOperation = getSearchRemoteOperation(currentUser, event);
+        RemoteOperation remoteOperation;
+        if (currentSearchType == RECENT_FILES_SEARCH) {
+            remoteOperation = getRecentFilesSearchRemoteOperation();
+        } else {
+            remoteOperation = getSearchRemoteOperation(currentUser, event);
+        }
+
         searchTask = new OCFileListSearchTask(mContainerActivity, this, remoteOperation, currentUser, event, SharedListFragment.TASK_TIMEOUT, preferences);
         searchTask.execute();
     }
@@ -1979,6 +1986,28 @@ protected RemoteOperation getSearchRemoteOperation(final User currentUser, final
                                          ocCapability);
     }
 
+    private RemoteOperation getRecentFilesSearchRemoteOperation() {
+        String accountName = accountManager.getUser().getAccountName();
+        OCCapability capability = mContainerActivity.getStorageManager().getCapability(accountName);
+        String searchQuery = "";
+
+        SearchRemoteOperation remoteOperation = new SearchRemoteOperation(
+            searchQuery,
+            SearchRemoteOperation.SearchType.RECENTLY_MODIFIED_SEARCH,
+            false,
+            capability
+        );
+
+        long nowSeconds = System.currentTimeMillis() / 1000L;
+        long last14DaysTimestamp = nowSeconds - 14L * 24 * 60 * 60;
+
+        remoteOperation.setStartDate(last14DaysTimestamp);
+        remoteOperation.setEndDate(nowSeconds);
+        remoteOperation.setLimit(100);
+
+        return remoteOperation;
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(EncryptionEvent event) {
         new Thread(() -> {{
@@ -2326,8 +2355,8 @@ public int getMenuItemId() {
             return R.id.nav_groupfolders;
         } else if (isSearchEventFavorite() || currentSearchType == FAVORITE_SEARCH) {
             return R.id.nav_favorites;
-        } else if (currentSearchType == RECENTLY_MODIFIED_SEARCH) {
-            return R.id.nav_recently_modified;
+        } else if (currentSearchType == RECENT_FILES_SEARCH) {
+            return R.id.nav_recent_files;
         } else {
             return R.id.nav_all_files;
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
@@ -84,7 +84,7 @@ class OCFileListSearchTask(
             if (result?.isSuccess == true) {
                 if (result.resultData?.isEmpty() == true) {
                     withContext(Dispatchers.Main) {
-                        fragment.setEmptyListMessage(SearchType.NO_SEARCH)
+                        fragment.setEmptyListMessage(fragment.currentSearchType)
                         return@withContext
                     }
 
@@ -171,7 +171,7 @@ class OCFileListSearchTask(
         var newList = list.toMutableList()
 
         if (searchType == SearchType.GALLERY_SEARCH ||
-            searchType == SearchType.RECENTLY_MODIFIED_SEARCH
+            searchType == SearchType.RECENT_FILES_SEARCH
         ) {
             return@withContext FileStorageUtils.sortOcFolderDescDateModifiedWithoutFavoritesFirst(newList)
         }
@@ -246,7 +246,8 @@ class OCFileListSearchTask(
                         put(ProviderMeta.ProviderTableMeta.VIRTUAL_OCFILE_ID, ocFile.fileId)
                     }
                     contentValuesList.add(cv)
-                } catch (_: Exception) {
+                } catch (e: Exception) {
+                    Log_OC.e(TAG, "parseAndSaveVirtuals():", e)
                 }
             }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/SearchType.kt b/app/src/main/java/com/owncloud/android/ui/fragment/SearchType.kt
@@ -20,7 +20,7 @@ enum class SearchType : Parcelable {
     FILE_SEARCH,
     FAVORITE_SEARCH,
     GALLERY_SEARCH,
-    RECENTLY_MODIFIED_SEARCH,
+    RECENT_FILES_SEARCH,
 
     // not a real filter, but nevertheless
     SHARED_FILTER,
@@ -30,7 +30,7 @@ enum class SearchType : Parcelable {
     fun titleId(): Int? = when (this) {
         FAVORITE_SEARCH -> R.string.drawer_item_favorites
         GALLERY_SEARCH -> R.string.drawer_item_gallery
-        RECENTLY_MODIFIED_SEARCH -> R.string.drawer_item_recently_modified
+        RECENT_FILES_SEARCH -> R.string.drawer_item_recent_files
         SHARED_FILTER -> R.string.drawer_item_shared
         ON_DEVICE -> R.string.drawer_item_on_device
         else -> null
diff --git a/app/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java b/app/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java
@@ -24,15 +24,10 @@ private DrawerMenuUtil() {
     }
 
     public static void filterSearchMenuItems(Menu menu,
-                                             User user,
-                                             Resources resources) {
+                                             User user) {
         if (user.isAnonymous()) {
             removeMenuItem(menu, R.id.nav_gallery, R.id.nav_favorites);
         }
-
-        if (!resources.getBoolean(R.bool.recently_modified_enabled)) {
-            menu.removeItem(R.id.nav_recently_modified);
-        }
     }
 
     public static void filterTrashbinMenuItem(Menu menu, @Nullable OCCapability capability) {
diff --git a/app/src/main/res/drawable/ic_list_empty_recent.xml b/app/src/main/res/drawable/ic_list_empty_recent.xml
diff --git a/app/src/main/res/menu/partial_drawer_entries.xml b/app/src/main/res/menu/partial_drawer_entries.xml
@@ -39,10 +39,10 @@
             android:icon="@drawable/selector_share"
             android:title="@string/drawer_item_shared" />
         <item
-            android:id="@+id/nav_recently_modified"
+            android:id="@+id/nav_recent_files"
             android:icon="@drawable/selector_recently"
             android:orderInCategory="0"
-            android:title="@string/drawer_item_recently_modified"
+            android:title="@string/drawer_item_recent_files"
             android:visible="true"/>
         <item
             android:id="@+id/nav_groupfolders"
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
@@ -76,7 +76,6 @@
     <bool name="multiaccount_support">true</bool>
 
     <!-- Drawer options -->
-    <bool name="recently_modified_enabled">false</bool>
     <bool name="shared_enabled">true</bool>
     <bool name="show_drawer_logout">false</bool>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -116,7 +116,8 @@
     <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_modified">Recently modified</string>
+    <string name="drawer_item_recent_files">Recent files</string>
+
     <string name="drawer_item_shared">Shared</string>
     <string name="drawer_item_uploads_list">Uploads</string>
     <string name="drawer_item_activities">Activities</string>
@@ -213,6 +214,8 @@
     <string name="file_list_seconds_ago">seconds ago</string>
     <string name="file_list_live">LIVE</string>
     <string name="file_list_empty_headline">No files here</string>
+    <string name="file_list_empty_recent_files_headline">No recently modified files</string>
+    <string name="file_list_empty_recent_files_description">Files and folders you recently modified will show up here.</string>
     <string name="folder_list_empty_headline">No folders here</string>
     <string name="file_list_empty">Upload some content or sync with your devices.</string>
     <string name="file_list_empty_on_device">Downloaded files and folders will show up here.</string>
@@ -227,7 +230,6 @@
     <string name="file_list_empty_shared_headline">Nothing shared yet</string>
     <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="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>

Original file line number	Diff line number	Diff line change
`@@ -626,11 +626,11 @@ open class ExtendedListFragment :`
`626`	`626`	`)`
`627`	`627`	`}`
`628`	`628`
`629`		`- SearchType.RECENTLY_MODIFIED_SEARCH -> {`
	`629`	`+ SearchType.RECENT_FILES_SEARCH -> {`
`630`	`630`	`setMessageForEmptyList(`
`631`		`- R.string.file_list_empty_headline_server_search,`
`632`		`- R.string.file_list_empty_recently_modified,`
`633`		`- R.drawable.ic_list_empty_recent`
	`631`	`+ R.string.file_list_empty_recent_files_headline,`
	`632`	`+ R.string.file_list_empty_recent_files_description,`
	`633`	`+ R.drawable.nav_recently_outline`
`634`	`634`	`)`
`635`	`635`	`}`
`636`	`636`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ class OCFileListSearchTask(`
`84`	`84`	`if (result?.isSuccess == true) {`
`85`	`85`	`if (result.resultData?.isEmpty() == true) {`
`86`	`86`	`withContext(Dispatchers.Main) {`
`87`		`- fragment.setEmptyListMessage(SearchType.NO_SEARCH)`
	`87`	`+ fragment.setEmptyListMessage(fragment.currentSearchType)`
`88`	`88`	`return@withContext`
`89`	`89`	`}`
`90`	`90`
`@@ -171,7 +171,7 @@ class OCFileListSearchTask(`
`171`	`171`	`var newList = list.toMutableList()`
`172`	`172`
`173`	`173`	`if (searchType == SearchType.GALLERY_SEARCH \|\|`
`174`		`- searchType == SearchType.RECENTLY_MODIFIED_SEARCH`
	`174`	`+ searchType == SearchType.RECENT_FILES_SEARCH`
`175`	`175`	`) {`
`176`	`176`	`return@withContext FileStorageUtils.sortOcFolderDescDateModifiedWithoutFavoritesFirst(newList)`
`177`	`177`	`}`
`@@ -246,7 +246,8 @@ class OCFileListSearchTask(`
`246`	`246`	`put(ProviderMeta.ProviderTableMeta.VIRTUAL_OCFILE_ID, ocFile.fileId)`
`247`	`247`	`}`
`248`	`248`	`contentValuesList.add(cv)`
`249`		`- } catch (_: Exception) {`
	`249`	`+ } catch (e: Exception) {`
	`250`	`+ Log_OC.e(TAG, "parseAndSaveVirtuals():", e)`
`250`	`251`	`}`
`251`	`252`	`}`
`252`	`253`
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,10 @@ private DrawerMenuUtil() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static void filterSearchMenuItems(Menu menu,`
`27`		`- User user,`
`28`		`- Resources resources) {`
	`27`	`+ User user) {`
`29`	`28`	`if (user.isAnonymous()) {`
`30`	`29`	`removeMenuItem(menu, R.id.nav_gallery, R.id.nav_favorites);`
`31`	`30`	`}`
`32`		`-`
`33`		`- if (!resources.getBoolean(R.bool.recently_modified_enabled)) {`
`34`		`- menu.removeItem(R.id.nav_recently_modified);`
`35`		`- }`
`36`	`31`	`}`
`37`	`32`
`38`	`33`	`public static void filterTrashbinMenuItem(Menu menu, @Nullable OCCapability capability) {`