fix: small changes

This commit is contained in:
J-Jamet
2023-11-04 18:56:36 +01:00
parent 7b7063b9be
commit 974686e698

View File

@@ -3,6 +3,7 @@ package com.kunzisoft.keepass.viewmodels
import android.app.Application import android.app.Application
import android.net.Uri import android.net.Uri
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.kunzisoft.keepass.app.App import com.kunzisoft.keepass.app.App
import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
@@ -19,9 +20,8 @@ class DatabaseFileViewModel(application: Application) : AndroidViewModel(applica
mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(application.applicationContext) mFileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(application.applicationContext)
} }
val isDefaultDatabase: MutableLiveData<Boolean> by lazy { private val mIsDefaultDatabase = MutableLiveData<Boolean>()
MutableLiveData<Boolean>() val isDefaultDatabase: LiveData<Boolean> = mIsDefaultDatabase
}
fun checkIfIsDefaultDatabase(databaseUri: Uri) { fun checkIfIsDefaultDatabase(databaseUri: Uri) {
IOActionTask( IOActionTask(
@@ -30,7 +30,7 @@ class DatabaseFileViewModel(application: Application) : AndroidViewModel(applica
?.parseUri() == databaseUri) ?.parseUri() == databaseUri)
}, },
{ {
isDefaultDatabase.value = it mIsDefaultDatabase.value = it
} }
).execute() ).execute()
} }
@@ -46,13 +46,12 @@ class DatabaseFileViewModel(application: Application) : AndroidViewModel(applica
).execute() ).execute()
} }
val databaseFileLoaded: MutableLiveData<DatabaseFile> by lazy { private val mDatabaseFileLoaded = MutableLiveData<DatabaseFile>()
MutableLiveData<DatabaseFile>() val databaseFileLoaded: LiveData<DatabaseFile> = mDatabaseFileLoaded
}
fun loadDatabaseFile(databaseUri: Uri) { fun loadDatabaseFile(databaseUri: Uri) {
mFileDatabaseHistoryAction?.getDatabaseFile(databaseUri) { databaseFileRetrieved -> mFileDatabaseHistoryAction?.getDatabaseFile(databaseUri) { databaseFileRetrieved ->
databaseFileLoaded.value = databaseFileRetrieved mDatabaseFileLoaded.value = databaseFileRetrieved
} }
} }
} }