Some fixes from CR

owncloud · Nov 2, 2023 · fe6aaf2 · fe6aaf2
1 parent 0f06c1d
commit fe6aaf2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/...pp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt b/...pp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt
@@ -1133,7 +1133,6 @@ class MainFileListFragment : Fragment(),
         if (ocFile.isFolder) {
             mainFileListViewModel.updateFolderToDisplay(ocFile)
         } else { // Click on a file
-            fileOperationsViewModel.setLastUsageFile(ocFile)
             fileActions?.onFileClicked(ocFile)
         }
     }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt
@@ -1731,6 +1731,7 @@ class FileDisplayActivity : FileActivity(),
                 startSyncThenOpen(file)
             }
         }
+        fileOperationsViewModel.setLastUsageFile(file)
     }
 
     override fun onShareFileClicked(file: OCFile) {

diff --git a/...ata/src/test/java/com/owncloud/android/data/file/datasources/OCLocalFileDataSourceTest.kt b/...ata/src/test/java/com/owncloud/android/data/file/datasources/OCLocalFileDataSourceTest.kt
@@ -698,7 +698,7 @@ class OCLocalFileDataSourceTest {
     @Test
     fun `updateFileWithLastUsage should change last usage parameter with null for a file`() {
 
-        every { dao.updateFileWithLastUsage(any(), null) } returns Unit
+        every { dao.updateFileWithLastUsage(OC_FILE.id!!, null) } returns Unit
 
         localDataSource.updateFileWithLastUsage(OC_FILE.id!!, null)
 

diff --git a/...omain/src/main/java/com/owncloud/android/domain/files/usecases/SetLastUsageFileUseCase.kt b/...omain/src/main/java/com/owncloud/android/domain/files/usecases/SetLastUsageFileUseCase.kt
@@ -33,5 +33,10 @@ class SetLastUsageFileUseCase(
         }
     }
 
-    data class Params(val fileId: Long, val lastUsage: Long?, val isAvailableLocally: Boolean, val isFolder: Boolean)
+    data class Params(
+        val fileId: Long,
+        val lastUsage: Long?,
+        val isAvailableLocally: Boolean,
+        val isFolder: Boolean,
+    )
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1731,6 +1731,7 @@ class FileDisplayActivity : FileActivity(), @@
                     startSyncThenOpen(file)
                 }
             }
+            fileOperationsViewModel.setLastUsageFile(file)
         }
         override fun onShareFileClicked(file: OCFile) {
@@ Expand Down @@