style: modified some comments and replaced flow{} by flowOf()

owncloud · Jan 23, 2025 · 95ffa42 · 95ffa42
1 parent 9dc49a2
commit 95ffa42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt b/owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt
@@ -80,7 +80,7 @@ class FileDataStorageManager(
         result
     }
 
-    // To do: New_arch: Remove this and call usecase inside FilesViewModel
+    // To do: New_arch. Remove this and call usecase inside FilesViewModel
     fun getFileById(id: Long): OCFile? = runBlocking(CoroutinesDispatcherProvider().io) {
         val getFileByIdUseCase: GetFileByIdUseCase by inject()
 
@@ -100,7 +100,7 @@ class FileDataStorageManager(
             listOf()
         }
 
-    // New_arch: Remove this and call usecase inside FilesViewModel
+    // To do: New_arch. Remove this and call usecase inside FilesViewModel
     fun getFolderImages(folder: OCFile?): List<OCFile> = runBlocking(CoroutinesDispatcherProvider().io) {
         val getFolderImagesUseCase: GetFolderImagesUseCase by inject()
 
@@ -111,7 +111,7 @@ class FileDataStorageManager(
         result ?: listOf()
     }
 
-    // New_arch: Remove this and call usecase inside FilesViewModel
+    // To do: New_arch. Remove this and call usecase inside FilesViewModel
     private fun getFolderContent(parentId: Long): List<OCFile> = runBlocking(CoroutinesDispatcherProvider().io) {
         val getFolderContentUseCase: GetFolderContentUseCase by inject()
 

diff --git a/...p/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListViewModel.kt b/...p/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListViewModel.kt
@@ -67,7 +67,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
@@ -369,7 +369,7 @@ class MainFileListViewModel(
             FileListOption.ALL_FILES -> retrieveFlowForAllFiles(currentFolderDisplayed, currentFolderDisplayed.owner)
             FileListOption.SHARED_BY_LINK -> retrieveFlowForShareByLink(currentFolderDisplayed, currentFolderDisplayed.owner)
             FileListOption.AV_OFFLINE -> retrieveFlowForAvailableOffline(currentFolderDisplayed, currentFolderDisplayed.owner)
-            FileListOption.SPACES_LIST -> flow {}
+            FileListOption.SPACES_LIST -> flowOf()
         }.toFileListUiState(
             currentFolderDisplayed,
             fileListOption,

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
@@ -1351,8 +1351,7 @@ class FileDisplayActivity : FileActivity(),
                     }
 
                     is SynchronizeFileUseCase.SyncType.UploadEnqueued -> showSnackMessage(getString(R.string.upload_enqueued_msg))
-                    null -> { // Nothing to do
-                    }
+                    null -> { /* Nothing to do */ }
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1351,8 +1351,7 @@ class FileDisplayActivity : FileActivity(), @@
                         }
                         is SynchronizeFileUseCase.SyncType.UploadEnqueued -> showSnackMessage(getString(R.string.upload_enqueued_msg))
-                        null -> { // Nothing to do
-                        }
+                        null -> { /* Nothing to do */ }
                     }
                 }
@@ Expand Down @@