refactor: removed run method, changed spacesListViewModel initializat…

…ion and added license from GetUserQuotasAsStreamUseCae
owncloud · Nov 14, 2024 · 812812e · 812812e
1 parent 571c132
commit 812812e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/.../src/main/java/com/owncloud/android/presentation/accounts/ManageAccountsDialogFragment.kt b/.../src/main/java/com/owncloud/android/presentation/accounts/ManageAccountsDialogFragment.kt
@@ -23,7 +23,6 @@ package com.owncloud.android.presentation.accounts
 
 import android.accounts.Account
 import android.accounts.AccountManager
-import android.accounts.AccountManagerCallback
 import android.accounts.AccountManagerFuture
 import android.accounts.OperationCanceledException
 import android.app.AlertDialog
@@ -54,7 +53,7 @@ import com.owncloud.android.utils.PreferenceUtils
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 
-class ManageAccountsDialogFragment : DialogFragment(), ManageAccountsAdapter.AccountAdapterListener, AccountManagerCallback<Boolean> {
+class ManageAccountsDialogFragment : DialogFragment(), ManageAccountsAdapter.AccountAdapterListener {
 
     private lateinit var accountListAdapter: ManageAccountsAdapter
     private var currentAccount: Account? = null
@@ -109,7 +108,7 @@ class ManageAccountsDialogFragment : DialogFragment(), ManageAccountsAdapter.Acc
             )
             .setPositiveButton(getString(R.string.common_yes)) { _, _ ->
                 val accountManager = AccountManager.get(MainApp.appContext)
-                accountManager.removeAccount(account, this, null)
+                accountManager.removeAccount(account, null, null)
                 if (manageAccountsViewModel.getLoggedAccounts().size > 1) {
                     dialogView.isVisible = true
                 }
@@ -190,13 +189,6 @@ class ManageAccountsDialogFragment : DialogFragment(), ManageAccountsAdapter.Acc
         }
     }
 
-    /**
-     * What happens when an account is removed
-     */
-    override fun run(future: AccountManagerFuture<Boolean>) {
-        // Nothing to do
-    }
-
     private fun changeToAccountContext(account: Account) {
         AccountUtils.setCurrentOwnCloudAccount(
             parentActivity.applicationContext,
@@ -252,7 +244,6 @@ class ManageAccountsDialogFragment : DialogFragment(), ManageAccountsAdapter.Acc
 
                 accountListAdapter.submitAccountList(accountList = getAccountListItems(listUserQuotas))
 
-                recyclerView = dialogView.findViewById(R.id.account_list_recycler_view)
                 recyclerView.adapter = accountListAdapter
             } else {
                 createAccount()

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
@@ -128,6 +128,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
+import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import timber.log.Timber
@@ -183,9 +184,7 @@ class FileDisplayActivity : FileActivity(),
 
     private val fileOperationsViewModel: FileOperationsViewModel by viewModel()
     private val transfersViewModel: TransfersViewModel by viewModel()
-
-    private val spacesListViewModelLazy: Lazy<SpacesListViewModel> = inject { parametersOf(account.name, false) }
-    private val spacesListViewModel: SpacesListViewModel get() = spacesListViewModelLazy.value
+    private lateinit var  spacesListViewModel: SpacesListViewModel
 
     private val sharedPreferences: SharedPreferencesProvider by inject()
 
@@ -382,6 +381,7 @@ class FileDisplayActivity : FileActivity(),
             }
         }
 
+        spacesListViewModel = getViewModel { parametersOf(account.name, false) }
         spacesListViewModel.refreshSpacesFromServer()
     }
 

diff --git a/...n/src/main/java/com/owncloud/android/domain/user/usecases/GetUserQuotasAsStreamUseCase.kt b/...n/src/main/java/com/owncloud/android/domain/user/usecases/GetUserQuotasAsStreamUseCase.kt
@@ -1,3 +1,24 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * 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.user.usecases
 
 import com.owncloud.android.domain.BaseUseCase