feat: hack to retrieve only personal spaces in multi-personal accounts

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt

@@ -91,6 +91,7 @@ import com.owncloud.android.domain.sharing.shares.usecases.RefreshSharesFromServ
 import com.owncloud.android.domain.spaces.usecases.GetPersonalAndProjectSpacesForAccountUseCase
 import com.owncloud.android.domain.spaces.usecases.GetPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.GetPersonalSpaceForAccountUseCase
+import com.owncloud.android.domain.spaces.usecases.GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.GetProjectSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.GetSpaceByIdForAccountUseCase
 import com.owncloud.android.domain.spaces.usecases.GetSpaceWithSpecialsByIdForAccountUseCase
@@ -218,6 +219,7 @@ val useCaseModule = module {
     factoryOf(::GetPersonalAndProjectSpacesForAccountUseCase)
     factoryOf(::GetPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase)
     factoryOf(::GetPersonalSpaceForAccountUseCase)
+    factoryOf(::GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase)
     factoryOf(::GetProjectSpacesWithSpecialsForAccountAsStreamUseCase)
     factoryOf(::GetSpaceWithSpecialsByIdForAccountUseCase)
     factoryOf(::GetSpacesFromEveryAccountUseCaseAsStream)

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt

@@ -98,7 +98,7 @@ val viewModelModule = module {
     viewModel { MigrationViewModel(MainApp.dataFolder, get(), get(), get(), get(), get(), get(), get()) }
     viewModel { TransfersViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { ReceiveExternalFilesViewModel(get(), get(), get()) }
-    viewModel { (accountName: String, showPersonalSpace: Boolean) ->
-        SpacesListViewModel(get(), get(), get(), get(), get(), accountName, showPersonalSpace)
+    viewModel { (accountName: String, showPersonalSpace: Boolean, isMultiPersonal: Boolean) ->
+        SpacesListViewModel(get(), get(), get(), get(), get(), get(), accountName, showPersonalSpace, isMultiPersonal)
     }
 }

owncloudApp/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListFragment.kt

@@ -150,6 +150,7 @@ class MainFileListFragment : Fragment(),
         parametersOf(
             requireArguments().getString(ARG_ACCOUNT_NAME),
             false,
+            false,
         )
     }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListAdapter.kt

@@ -39,6 +39,7 @@ import com.owncloud.android.utils.PreferenceUtils
 
 class SpacesListAdapter(
     private val listener: SpacesListAdapterListener,
+    private val isMultiPersonal: Boolean,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
     private val spacesList = mutableListOf<OCSpace>()
@@ -59,7 +60,7 @@ class SpacesListAdapter(
             }
             spacesListItemCard.setAccessibilityRole(className = Button::class.java)
 
-            if (space.isPersonal) {
+            if (space.isPersonal && !isMultiPersonal) {
                 spacesListItemName.text = holder.itemView.context.getString(R.string.bottom_nav_personal)
                 spacesListItemImage.apply {
                     dispose()

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListFragment.kt

@@ -54,6 +54,7 @@ class SpacesListFragment : SpacesListAdapter.SpacesListAdapterListener, Fragment
         parametersOf(
             requireArguments().getString(BUNDLE_ACCOUNT_NAME),
             requireArguments().getBoolean(BUNDLE_SHOW_PERSONAL_SPACE),
+            true,
         )
     }
 
@@ -78,7 +79,7 @@ class SpacesListFragment : SpacesListAdapter.SpacesListAdapterListener, Fragment
 
         val spacesListLayoutManager = GridLayoutManager(requireContext(), 2)
         binding.recyclerSpacesList.layoutManager = spacesListLayoutManager
-        spacesListAdapter = SpacesListAdapter(this)
+        spacesListAdapter = SpacesListAdapter(this, true)
         binding.recyclerSpacesList.adapter = spacesListAdapter
 
         binding.swipeRefreshSpacesList.setOnRefreshListener {

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListViewModel.kt

@@ -21,7 +21,6 @@
 
 package com.owncloud.android.presentation.spaces
 
-
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.owncloud.android.domain.UseCaseResult
@@ -30,6 +29,7 @@ import com.owncloud.android.domain.files.model.OCFile.Companion.ROOT_PATH
 import com.owncloud.android.domain.files.usecases.GetFileByRemotePathUseCase
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.domain.spaces.usecases.GetPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase
+import com.owncloud.android.domain.spaces.usecases.GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.GetProjectSpacesWithSpecialsForAccountAsStreamUseCase
 import com.owncloud.android.domain.spaces.usecases.RefreshSpacesFromServerAsyncUseCase
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
@@ -40,12 +40,14 @@ import kotlinx.coroutines.launch
 
 class SpacesListViewModel(
     private val refreshSpacesFromServerAsyncUseCase: RefreshSpacesFromServerAsyncUseCase,
+    private val getPersonalSpacesWithSpecialsForAccountAsStreamUseCase: GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase,
     private val getPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase: GetPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase,
     private val getProjectSpacesWithSpecialsForAccountAsStreamUseCase: GetProjectSpacesWithSpecialsForAccountAsStreamUseCase,
     private val getFileByRemotePathUseCase: GetFileByRemotePathUseCase,
     private val coroutinesDispatcherProvider: CoroutinesDispatcherProvider,
     private val accountName: String,
     private val showPersonalSpace: Boolean,
+    private val isMultiPersonal: Boolean,
 ) : ViewModel() {
 
     private val _spacesList: MutableStateFlow<SpacesListUiState> =
@@ -55,7 +57,9 @@ class SpacesListViewModel(
     init {
         viewModelScope.launch(coroutinesDispatcherProvider.io) {
             refreshSpacesFromServer()
-            val spacesListFlow = if (showPersonalSpace) getPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase(
+            val spacesListFlow = if (isMultiPersonal) getPersonalSpacesWithSpecialsForAccountAsStreamUseCase(
+                GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase.Params(accountName = accountName)
+            ) else if (showPersonalSpace) getPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase(
                 GetPersonalAndProjectSpacesWithSpecialsForAccountAsStreamUseCase.Params(accountName = accountName)
             ) else getProjectSpacesWithSpecialsForAccountAsStreamUseCase(
                 GetProjectSpacesWithSpecialsForAccountAsStreamUseCase.Params(accountName = accountName)

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -381,7 +381,7 @@ class FileDisplayActivity : FileActivity(),
             }
         }
 
-        spacesListViewModel = getViewModel { parametersOf(account.name, false) }
+        spacesListViewModel = getViewModel { parametersOf(account.name, false, false) }
         spacesListViewModel.refreshSpacesFromServer()
     }
 

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt

@@ -150,7 +150,7 @@ class PreviewImageActivity : FileActivity(),
                 is UIResult.Success -> {
 
                     // Refresh the spaces and update the quota
-                    val spacesListViewModel: SpacesListViewModel by viewModel { parametersOf(account.name, false) }
+                    val spacesListViewModel: SpacesListViewModel by viewModel { parametersOf(account.name, false, false) }
                     spacesListViewModel.refreshSpacesFromServer()
 
                     dismissLoadingDialog()

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.kt

@@ -194,7 +194,7 @@ class PreviewVideoActivity : FileActivity(), Player.Listener, OnPrepareVideoPlay
                 is UIResult.Success -> {
 
                     // Refresh the spaces and update the quota
-                    val spacesListViewModel: SpacesListViewModel by viewModel { parametersOf(account?.name, false) }
+                    val spacesListViewModel: SpacesListViewModel by viewModel { parametersOf(account?.name, false, false) }
                     spacesListViewModel.refreshSpacesFromServer()
 
                     dismissLoadingDialog()

owncloudApp/src/main/res/layout/spaces_list_item.xml

@@ -45,7 +45,7 @@
                 android:id="@+id/spaces_list_item_image"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/spaces_thumbnail_height"
-                android:scaleType="centerCrop"
+                android:scaleType="fitCenter"
                 android:src="@drawable/ic_spaces" />
 
             <View

owncloudDomain/src/main/java/com/owncloud/android/domain/spaces/usecases/GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase.kt

@@ -0,0 +1,40 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Juan Carlos Garrote Gascón
+ *
+ * Copyright (C) 2024 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.spaces.usecases
+
+import com.owncloud.android.domain.BaseUseCase
+import com.owncloud.android.domain.spaces.SpacesRepository
+import com.owncloud.android.domain.spaces.model.OCSpace
+import kotlinx.coroutines.flow.Flow
+
+class GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase(
+    private val spacesRepository: SpacesRepository
+) : BaseUseCase<Flow<List<OCSpace>>, GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase.Params>() {
+
+    override fun run(params: Params) = spacesRepository.getSpacesByDriveTypeWithSpecialsForAccountAsFlow(
+        accountName = params.accountName,
+        filterDriveTypes = setOf(OCSpace.DRIVE_TYPE_PERSONAL),
+    )
+
+    data class Params(
+        val accountName: String
+    )
+}