Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ floatingactionbutton = "1.10.1"
glide = "4.15.1"
glideToVectorYou = "v2.0.0"
junit4 = "4.13.2"
koin = "3.3.3"
koin = "4.2.2"
kotlin = "2.3.10"
kotlinxCoroutines = "1.9.0"
ksp = "2.3.10"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ class LoginActivityTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class FileDetailsFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class LogsListActivityTest {
stopKoin()

startKoin {
allowOverride(override = true)
allowOverride(true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ class SettingsFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ class SettingsAdvancedFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class SettingsLogsFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class SettingsMoreFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class PassCodeActivityTest {
stopKoin()

startKoin {
allowOverride(override = true)
allowOverride(true)
context
modules(
module {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ class PatternActivityTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ class SettingsSecurityFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ class SearchShareesFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
androidContext(ApplicationProvider.getApplicationContext())
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class EditPrivateShareFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
androidContext(ApplicationProvider.getApplicationContext())
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ class PublicShareCreationDialogFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
androidContext(ApplicationProvider.getApplicationContext())
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ class PublicShareEditionDialogFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
androidContext(ApplicationProvider.getApplicationContext())
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class ShareFileFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
androidContext(ApplicationProvider.getApplicationContext())
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ class ShareFolderFragmentTest {
stopKoin()

startKoin {
allowOverride(true)
androidContext(ApplicationProvider.getApplicationContext())
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class ReleaseNotesActivityTest {
stopKoin()

startKoin {
allowOverride(true)
context
allowOverride(override = true)
modules(
module {
viewModel {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -609,11 +609,9 @@ class LoginActivity : AppCompatActivity(), SslUntrustedCertDialog.OnSslUntrusted
""
}

override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
intent?.let {
handleGetAuthorizationCodeResponse(it)
}
handleGetAuthorizationCodeResponse(intent)
}

private fun handleGetAuthorizationCodeResponse(intent: Intent) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ import com.owncloud.android.utils.PreferenceUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import okio.Path.Companion.toPath
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import timber.log.Timber
Expand All @@ -145,7 +145,7 @@ class MainFileListFragment : Fragment(),
requireArguments().getParcelable(ARG_FILE_LIST_OPTION),
)
}
private val fileOperationsViewModel by sharedViewModel<FileOperationsViewModel>()
private val fileOperationsViewModel by activityViewModel<FileOperationsViewModel>()
private val transfersViewModel by viewModel<TransfersViewModel>()
private val spacesListViewModel: SpacesListViewModel by viewModel {
parametersOf(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import com.owncloud.android.domain.files.model.OCFile
import com.owncloud.android.presentation.files.operations.FileOperation
import com.owncloud.android.presentation.files.operations.FileOperationsViewModel
import com.owncloud.android.utils.MimetypeIconUtil
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel

/**
* Dialog requiring confirmation before removing a collection of given OCFiles.
Expand All @@ -44,7 +44,7 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
*/
class RemoveFilesDialogFragment : DialogFragment() {

private val fileOperationViewModel: FileOperationsViewModel by sharedViewModel()
private val fileOperationViewModel: FileOperationsViewModel by activityViewModel()
private var _binding: RemoveFilesDialogBinding? = null
private val binding get() = _binding!!

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import com.owncloud.android.extensions.avoidScreenshotsIfNeeded
import com.owncloud.android.presentation.files.operations.FileOperation
import com.owncloud.android.presentation.files.operations.FileOperationsViewModel
import com.owncloud.android.utils.PreferenceUtils
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel

/**
* Dialog to input a new name for a file or folder to rename.
Expand All @@ -48,7 +48,7 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
class RenameFileDialogFragment : DialogFragment(), DialogInterface.OnClickListener {

private var targetFile: OCFile? = null
private val filesViewModel: FileOperationsViewModel by sharedViewModel()
private val filesViewModel: FileOperationsViewModel by activityViewModel()
private var isButtonEnabled = true
private val maxFilenameLength = 223
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import com.owncloud.android.R
import com.owncloud.android.utils.DisplayUtils.bytesToHumanReadable
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel

class MigrationChoiceFragment : Fragment(R.layout.fragment_migration_choice) {

private val migrationViewModel: MigrationViewModel by sharedViewModel()
private val migrationViewModel: MigrationViewModel by activityViewModel()

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import android.view.View
import android.widget.Button
import androidx.fragment.app.Fragment
import com.owncloud.android.R
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel

class MigrationIntroFragment : Fragment(R.layout.fragment_migration_intro) {

private val migrationViewModel: MigrationViewModel by sharedViewModel()
private val migrationViewModel: MigrationViewModel by activityViewModel()

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import android.view.View
import android.widget.Button
import androidx.fragment.app.Fragment
import com.owncloud.android.R
import org.koin.androidx.viewmodel.ext.android.sharedViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel

class MigrationProgressFragment : Fragment(R.layout.fragment_migration_progress) {

private val migrationViewModel: MigrationViewModel by sharedViewModel()
private val migrationViewModel: MigrationViewModel by activityViewModel()

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class DrawerViewModelTest : ViewModelTest() {

Dispatchers.setMain(testCoroutineDispatcher)
startKoin {
allowOverride(override = true)
allowOverride(true)
modules(
module {
factory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class AuthenticationViewModelTest : ViewModelTest() {

Dispatchers.setMain(testCoroutineDispatcher)
startKoin {
allowOverride(override = true)
allowOverride(true)
modules(
module {
factory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class OAuthViewModelTest : ViewModelTest() {

Dispatchers.setMain(testCoroutineDispatcher)
startKoin {
allowOverride(override = true)
allowOverride(true)
modules(
module {
factory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class CapabilityViewModelTest {

Dispatchers.setMain(testCoroutineDispatcher)
startKoin {
allowOverride(override = true)
allowOverride(true)
modules(
module {
factory {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class ShareViewModelTest {

Dispatchers.setMain(testCoroutineDispatcher)
startKoin {
allowOverride(override = true)
allowOverride(true)
modules(
module {
factory {
Expand Down