fix: Small changes

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt

@@ -6,7 +6,7 @@ import androidx.activity.viewModels
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.MainCredential
-import com.kunzisoft.keepass.services.DatabaseTaskProvider
+import com.kunzisoft.keepass.database.DatabaseTaskProvider
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.UriHelper.getBinaryDir

app/src/main/java/com/kunzisoft/keepass/autofill/KeeAutofillService.kt

@@ -36,7 +36,7 @@ import androidx.autofill.inline.v1.InlineSuggestionUi
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.AutofillLauncherActivity
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.services.DatabaseTaskProvider
+import com.kunzisoft.keepass.database.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.model.CreditCard
 import com.kunzisoft.keepass.model.RegisterInfo

app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt

@@ -17,7 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.services
+package com.kunzisoft.keepass.database
 
 import android.app.AlertDialog
 import android.content.BroadcastReceiver
@@ -39,9 +39,6 @@ import androidx.lifecycle.lifecycleScope
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
-import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.MainCredential
-import com.kunzisoft.keepass.database.action.ProgressMessage
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.crypto.kdf.KdfEngine
 import com.kunzisoft.keepass.database.element.Entry
@@ -52,6 +49,7 @@ import com.kunzisoft.keepass.database.element.node.NodeId
 import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
+import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_CHALLENGE_RESPONDED
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_ASSIGN_PASSWORD_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_COPY_NODES_TASK
@@ -96,8 +94,10 @@ import java.util.UUID
  * Utility class to connect an activity or a service to the DatabaseTaskNotificationService,
  * Useful to retrieve a database instance and sending tasks commands
  */
-class DatabaseTaskProvider(private var context: Context,
-                           private var showDialog: Boolean = true) {
+class DatabaseTaskProvider(
+    private var context: Context,
+    private var showDialog: Boolean = true
+) {
 
     // To show dialog only if context is an activity
     private var activity: FragmentActivity? = try { context as? FragmentActivity? }
@@ -173,7 +173,8 @@ class DatabaseTaskProvider(private var context: Context,
         }
     }
 
-    private var databaseInfoListener = object: DatabaseTaskNotificationService.DatabaseInfoListener {
+    private var databaseInfoListener = object:
+        DatabaseTaskNotificationService.DatabaseInfoListener {
         override fun onDatabaseInfoChanged(previousDatabaseInfo: SnapFileDatabaseInfo,
                                            newDatabaseInfo: SnapFileDatabaseInfo) {
             activity?.let { activity ->

app/src/main/java/com/kunzisoft/keepass/database/ProgressMessage.kt

@@ -1,4 +1,4 @@
-package com.kunzisoft.keepass.database.action
+package com.kunzisoft.keepass.database
 
 import androidx.annotation.StringRes
 

app/src/main/java/com/kunzisoft/keepass/database/action/MergeDatabaseRunnable.kt

@@ -40,7 +40,13 @@ class MergeDatabaseRunnable(
     challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray,
     private val progressTaskUpdater: ProgressTaskUpdater?,
     private val mergeDatabaseResult: ((Result) -> Unit)?
-) : SaveDatabaseRunnable(context, database, saveDatabase, null, challengeResponseRetriever) {
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {
 
     override fun onStartRun() {
         database.wasReloaded = true

app/src/main/java/com/kunzisoft/keepass/database/action/RemoveUnlinkedDataDatabaseRunnable.kt

@@ -28,7 +28,13 @@ class RemoveUnlinkedDataDatabaseRunnable (
     database: ContextualDatabase,
     saveDatabase: Boolean,
     challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
-) : SaveDatabaseRunnable(context, database, saveDatabase, null, challengeResponseRetriever) {
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {
 
     override fun onActionRun() {
         try {

app/src/main/java/com/kunzisoft/keepass/database/action/UpdateCompressionBinariesDatabaseRunnable.kt

@@ -31,7 +31,13 @@ class UpdateCompressionBinariesDatabaseRunnable (
     private val newCompressionAlgorithm: CompressionAlgorithm,
     saveDatabase: Boolean,
     challengeResponseRetriever: (HardwareKey, ByteArray?) -> ByteArray
-) : SaveDatabaseRunnable(context, database, saveDatabase, null, challengeResponseRetriever) {
+) : SaveDatabaseRunnable(
+    context,
+    database,
+    saveDatabase,
+    null,
+    challengeResponseRetriever
+) {
 
     override fun onStartRun() {
         // Set new compression

app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikeyboardService.kt

@@ -44,7 +44,7 @@ import com.kunzisoft.keepass.activities.EntrySelectionLauncherActivity
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.adapters.FieldsAdapter
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.services.DatabaseTaskProvider
+import com.kunzisoft.keepass.database.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.database.helper.SearchHelper

app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt

@@ -30,6 +30,7 @@ import android.util.Log
 import androidx.core.app.ServiceCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.DatabaseTaskProvider
 import com.kunzisoft.keepass.database.element.Attachment
 import com.kunzisoft.keepass.model.AttachmentState
 import com.kunzisoft.keepass.model.EntryAttachmentState

app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt

@@ -35,6 +35,7 @@ import com.kunzisoft.keepass.app.database.CipherDatabaseAction
 import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.MainCredential
+import com.kunzisoft.keepass.database.ProgressMessage
 import com.kunzisoft.keepass.database.action.*
 import com.kunzisoft.keepass.database.action.history.DeleteEntryHistoryDatabaseRunnable
 import com.kunzisoft.keepass.database.action.history.RestoreEntryHistoryDatabaseRunnable