Merge pull request #3471 from owncloud/new_arch/shared_files

New arch/shared files
owncloud · Dec 13, 2021 · 391ffe1 · 391ffe1
2 parents e3ca7ad + 2ab1513
commit 391ffe1
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 4 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt
@@ -40,6 +40,7 @@ import com.owncloud.android.domain.files.usecases.CopyFileUseCase
 import com.owncloud.android.domain.files.usecases.CreateFolderAsyncUseCase
 import com.owncloud.android.domain.files.usecases.GetFileByIdUseCase
 import com.owncloud.android.domain.files.usecases.GetFileByRemotePathUseCase
+import com.owncloud.android.domain.files.usecases.GetFilesAvailableOfflineUseCase
 import com.owncloud.android.domain.files.usecases.GetFilesSharedByLinkUseCase
 import com.owncloud.android.domain.files.usecases.GetFolderContentAsLiveDataUseCase
 import com.owncloud.android.domain.files.usecases.GetFolderContentUseCase
@@ -101,6 +102,7 @@ val useCaseModule = module {
     factory { RenameFileUseCase(get()) }
     factory { SaveFileOrFolderUseCase(get()) }
     factory { GetFilesSharedByLinkUseCase(get()) }
+    factory { GetFilesAvailableOfflineUseCase(get()) }
 
     // Sharing
     factory { CreatePrivateShareAsyncUseCase(get()) }

diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt
@@ -75,5 +75,5 @@ val viewModelModule = module {
     viewModel { PreviewImageViewModel(get(), get(), get()) }
     viewModel { FileDetailsViewModel(get(), get(), get(), get(), get()) }
     viewModel { FileOperationViewModel(get(), get(), get(), get(), get(), get()) }
-    viewModel { MainFileListViewModel(get(), get(), get()) }
+    viewModel { MainFileListViewModel(get(), get(), get(), get(), get()) }
 }
diff --git a/...rc/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListViewModel.kt b/...rc/main/java/com/owncloud/android/presentation/ui/files/filelist/MainFileListViewModel.kt
@@ -22,21 +22,26 @@ package com.owncloud.android.presentation.ui.files.filelist
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.owncloud.android.domain.UseCaseResult
 import androidx.lifecycle.viewModelScope
 import com.owncloud.android.domain.files.model.OCFile
+import com.owncloud.android.domain.files.usecases.GetFilesAvailableOfflineUseCase
+import com.owncloud.android.domain.files.usecases.GetFilesSharedByLinkUseCase
 import com.owncloud.android.domain.files.usecases.GetFolderContentAsLiveDataUseCase
 import com.owncloud.android.domain.files.usecases.RefreshFolderFromServerAsyncUseCase
 import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.presentation.UIResult
-import com.owncloud.android.providers.ContextProvider
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import kotlinx.coroutines.launch
 
 class MainFileListViewModel(
     private val getFolderContentAsLiveDataUseCase: GetFolderContentAsLiveDataUseCase,
+    private val getFilesSharedByLinkUseCase: GetFilesSharedByLinkUseCase,
+    private val getFilesAvailableOfflineUseCase: GetFilesAvailableOfflineUseCase,
     private val refreshFolderFromServerAsyncUseCase: RefreshFolderFromServerAsyncUseCase,
-    private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider,
+    private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider
 ) : ViewModel() {
 
     private lateinit var file: OCFile
@@ -45,6 +50,15 @@ class MainFileListViewModel(
     val getFilesListStatusLiveData: LiveData<Event<UIResult<List<OCFile>>>>
         get() = _getFilesListStatusLiveData
 
+    private val _getFilesSharedByLinkData = MutableLiveData<Event<UIResult<List<OCFile>>>>()
+    val getFilesSharedByLinkData: LiveData<Event<UIResult<List<OCFile>>>>
+        get() = _getFilesSharedByLinkData
+
+    private val _getFilesAvailableOfflineData = MutableLiveData<Event<UIResult<List<OCFile>>>>()
+    val getFilesAvailableOfflineData: LiveData<Event<UIResult<List<OCFile>>>>
+        get() = _getFilesAvailableOfflineData
+
+
     private fun getFilesList(folderId: Long) {
         val filesListLiveData: LiveData<List<OCFile>> =
             getFolderContentAsLiveDataUseCase.execute(GetFolderContentAsLiveDataUseCase.Params(folderId = folderId))
@@ -54,6 +68,24 @@ class MainFileListViewModel(
         }
     }
 
+    fun getSharedByLinkFilesList(owner: String) {
+        getFilesSharedByLinkUseCase.execute(GetFilesSharedByLinkUseCase.Params(owner = owner)).let {
+            when (it) {
+                is UseCaseResult.Error -> _getFilesSharedByLinkData.postValue(Event(UIResult.Error(it.getThrowableOrNull())))
+                is UseCaseResult.Success -> _getFilesSharedByLinkData.postValue(Event(UIResult.Success(it.getDataOrNull())))
+            }
+        }
+    }
+
+    fun getAvailableOfflineFilesList(owner: String) {
+        getFilesAvailableOfflineUseCase.execute(GetFilesAvailableOfflineUseCase.Params(owner = owner)).let {
+            when (it) {
+                is UseCaseResult.Error -> _getFilesAvailableOfflineData.postValue(Event(UIResult.Error(it.getThrowableOrNull())))
+                is UseCaseResult.Success -> _getFilesAvailableOfflineData.postValue(Event(UIResult.Success(it.getDataOrNull())))
+            }
+        }
+    }
+
     private fun refreshFilesList(remotePath: String) {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             _getFilesListStatusLiveData.postValue(Event(UIResult.Loading()))
@@ -71,4 +103,3 @@ class MainFileListViewModel(
     }
 }
 
-
diff --git a/...loudData/src/main/java/com/owncloud/android/data/files/datasources/LocalFileDataSource.kt b/...loudData/src/main/java/com/owncloud/android/data/files/datasources/LocalFileDataSource.kt
@@ -31,6 +31,7 @@ interface LocalFileDataSource {
     fun getFolderContentAsLiveData(folderId: Long): LiveData<List<OCFile>>
     fun getFolderImages(folderId: Long): List<OCFile>
     fun getFilesSharedByLink(owner: String): List<OCFile>
+    fun getFilesAvailableOffline(owner: String): List<OCFile>
     fun moveFile(sourceFile: OCFile, targetFile: OCFile, finalRemotePath: String, finalStoragePath: String)
     fun saveFilesInFolder(listOfFiles: List<OCFile>, folder: OCFile)
     fun saveFile(file: OCFile)

diff --git a/.../java/com/owncloud/android/data/files/datasources/implementation/OCLocalFileDataSource.kt b/.../java/com/owncloud/android/data/files/datasources/implementation/OCLocalFileDataSource.kt
@@ -85,6 +85,10 @@ class OCLocalFileDataSource(
         it.toModel()
     }
 
+    override fun getFilesAvailableOffline(owner: String): List<OCFile> = fileDao.getFilesAvailableOffline(accountOwner = owner).map {
+        it.toModel()
+    }
+
     override fun moveFile(sourceFile: OCFile, targetFile: OCFile, finalRemotePath: String, finalStoragePath: String) =
         fileDao.moveFile(
             sourceFile = sourceFile.toEntity(),

diff --git a/owncloudData/src/main/java/com/owncloud/android/data/files/db/FileDao.kt b/owncloudData/src/main/java/com/owncloud/android/data/files/db/FileDao.kt
@@ -62,6 +62,11 @@ abstract class FileDao {
         accountOwner: String
     ): List<OCFileEntity>
 
+    @Query(SELECT_FILES_AVAILABLE_OFFLINE)
+    abstract fun getFilesAvailableOffline(
+        accountOwner: String
+    ): List<OCFileEntity>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insert(ocFileEntity: OCFileEntity): Long
 
@@ -247,5 +252,11 @@ abstract class FileDao {
                     "WHERE owner = :accountOwner " +
                     "AND sharedByLink NOT LIKE '%0%' " +
                     "OR sharedWithSharee NOT LIKE '%0%'"
+
+        private const val SELECT_FILES_AVAILABLE_OFFLINE =
+            "SELECT * " +
+                    "FROM ${ProviderMeta.ProviderTableMeta.FILES_TABLE_NAME} " +
+                    "WHERE owner = :accountOwner " +
+                    "AND keepInSync = '1'"
     }
 }
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt b/owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt
@@ -123,6 +123,9 @@ class OCFileRepository(
     override fun getFilesSharedByLink(owner: String): List<OCFile> =
         localFileDataSource.getFilesSharedByLink(owner)
 
+    override fun getFilesAvailableOffline(owner: String): List<OCFile> =
+        localFileDataSource.getFilesAvailableOffline(owner)
+
     override fun moveFile(listOfFilesToMove: List<OCFile>, targetFile: OCFile) {
         listOfFilesToMove.forEach { ocFile ->
 

diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/files/FileRepository.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/files/FileRepository.kt
@@ -32,6 +32,7 @@ interface FileRepository {
     fun getFolderContentAsLiveData(folderId: Long): LiveData<List<OCFile>>
     fun getFolderImages(folderId: Long): List<OCFile>
     fun getFilesSharedByLink(owner: String): List<OCFile>
+    fun getFilesAvailableOffline(owner: String): List<OCFile>
     fun moveFile(listOfFilesToMove: List<OCFile>, targetFile: OCFile)
     fun refreshFolder(remotePath: String)
     fun removeFile(listOfFilesToRemove: List<OCFile>, removeOnlyLocalCopy: Boolean)

diff --git a/...c/main/java/com/owncloud/android/domain/files/usecases/GetFilesAvailableOfflineUseCase.kt b/...c/main/java/com/owncloud/android/domain/files/usecases/GetFilesAvailableOfflineUseCase.kt
@@ -0,0 +1,33 @@
+/*
+ * ownCloud Android client application
+ *
+ * Copyright (C) 2021 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.owncloud.android.domain.files.usecases
+
+import com.owncloud.android.domain.BaseUseCaseWithResult
+import com.owncloud.android.domain.files.FileRepository
+import com.owncloud.android.domain.files.model.OCFile
+
+class GetFilesAvailableOfflineUseCase(
+    private val fileRepository: FileRepository
+) : BaseUseCaseWithResult<List<OCFile>, GetFilesAvailableOfflineUseCase.Params>() {
+
+    override fun run(params: Params): List<OCFile> = fileRepository.getFilesAvailableOffline(params.owner)
+
+    data class Params(
+        val owner: String
+    )
+}