From 974686e6980480b3f1c30121506f2fe87b281da3 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 4 Nov 2023 18:56:36 +0100 Subject: [PATCH] fix: small changes --- .../keepass/viewmodels/DatabaseFileViewModel.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFileViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFileViewModel.kt index 9bab5cb0a..d9e43e60c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFileViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseFileViewModel.kt @@ -3,6 +3,7 @@ package com.kunzisoft.keepass.viewmodels import android.app.Application import android.net.Uri import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.kunzisoft.keepass.app.App import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction @@ -19,9 +20,8 @@ class DatabaseFileViewModel(application: Application) : AndroidViewModel(applica mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(application.applicationContext) } - val isDefaultDatabase: MutableLiveData by lazy { - MutableLiveData() - } + private val mIsDefaultDatabase = MutableLiveData() + val isDefaultDatabase: LiveData = mIsDefaultDatabase fun checkIfIsDefaultDatabase(databaseUri: Uri) { IOActionTask( @@ -30,7 +30,7 @@ class DatabaseFileViewModel(application: Application) : AndroidViewModel(applica ?.parseUri() == databaseUri) }, { - isDefaultDatabase.value = it + mIsDefaultDatabase.value = it } ).execute() } @@ -46,13 +46,12 @@ class DatabaseFileViewModel(application: Application) : AndroidViewModel(applica ).execute() } - val databaseFileLoaded: MutableLiveData by lazy { - MutableLiveData() - } + private val mDatabaseFileLoaded = MutableLiveData() + val databaseFileLoaded: LiveData = mDatabaseFileLoaded fun loadDatabaseFile(databaseUri: Uri) { mFileDatabaseHistoryAction?.getDatabaseFile(databaseUri) { databaseFileRetrieved -> - databaseFileLoaded.value = databaseFileRetrieved + mDatabaseFileLoaded.value = databaseFileRetrieved } } } \ No newline at end of file