fix: Remove AndroidX dependency and format code

2025-12-04 15:49:33 +01:00 · 2023-05-14 17:52:40 +02:00
parent e1ecebb4a0
commit 81930bf3a1
12 changed files with 88 additions and 69 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupDialogFragment.kt
@@ -35,6 +35,7 @@ import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.icon.IconImage
 import com.kunzisoft.keepass.model.GroupInfo
 import com.kunzisoft.keepass.settings.PreferencesUtil
+import com.kunzisoft.keepass.utils.TimeUtil.getDateTimeString
 import com.kunzisoft.keepass.utils.UuidUtil
 import com.kunzisoft.keepass.view.DateTimeFieldView

--- a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
@@ -23,6 +23,7 @@ import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.StreamDirection
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
+import com.kunzisoft.keepass.utils.TimeUtil.getDateTimeString
 import com.kunzisoft.keepass.utils.UuidUtil
 import com.kunzisoft.keepass.view.TemplateView
 import com.kunzisoft.keepass.view.hideByFading
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/EntryHistoryAdapter.kt
@@ -27,6 +27,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.utils.TimeUtil.getDateTimeString

 class EntryHistoryAdapter(val context: Context) : RecyclerView.Adapter<EntryHistoryAdapter.EntryHistoryViewHolder>() {

--- a/app/src/main/java/com/kunzisoft/keepass/database/action/DatabaseTaskProvider.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/DatabaseTaskProvider.kt
@@ -50,7 +50,6 @@ import com.kunzisoft.keepass.database.element.node.Node
 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.ProgressMessage
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_CHALLENGE_RESPONDED
@@ -135,26 +134,34 @@ class DatabaseTaskProvider(private var context: Context,
    }

    private val actionTaskListener = object: DatabaseTaskNotificationService.ActionTaskListener {
-        override fun onActionStarted(database: ContextualDatabase,
-                                     progressMessage: ProgressMessage) {
+        override fun onActionStarted(
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        ) {
            if (showDialog)
                startDialog(progressMessage)
        }

-        override fun onActionUpdated(database: ContextualDatabase,
-                                     progressMessage: ProgressMessage) {
+        override fun onActionUpdated(
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        ) {
            if (showDialog)
                updateDialog(progressMessage)
        }

-        override fun onActionStopped(database: ContextualDatabase) {
+        override fun onActionStopped(
+            database: ContextualDatabase
+        ) {
            // Remove the progress task
            stopDialog()
        }

-        override fun onActionFinished(database: ContextualDatabase,
-                                      actionTask: String,
-                                      result: ActionRunnable.Result) {
+        override fun onActionFinished(
+            database: ContextualDatabase,
+            actionTask: String,
+            result: ActionRunnable.Result
+        ) {
            onActionFinish?.invoke(database, actionTask, result)
            onActionStopped(database)
        }
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressMessage.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/ProgressMessage.kt
@@ -0,0 +1,13 @@
+package com.kunzisoft.keepass.database.action
+
+import androidx.annotation.StringRes
+
+data class ProgressMessage(
+    @StringRes
+    var titleId: Int,
+    @StringRes
+    var messageId: Int? = null,
+    @StringRes
+    var warningId: Int? = null,
+    var cancelable: (() -> Unit)? = null
+)
--- a/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
@@ -47,7 +47,6 @@ import com.kunzisoft.keepass.database.element.node.Type
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.hardware.HardwareKeyActivity
 import com.kunzisoft.keepass.model.CipherEncryptDatabase
-import com.kunzisoft.keepass.model.ProgressMessage
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater
@@ -138,14 +137,22 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
    }

    interface ActionTaskListener {
-        fun onActionStarted(database: ContextualDatabase,
-                            progressMessage: ProgressMessage)
-        fun onActionUpdated(database: ContextualDatabase,
-                            progressMessage: ProgressMessage)
-        fun onActionStopped(database: ContextualDatabase)
-        fun onActionFinished(database: ContextualDatabase,
-                             actionTask: String,
-                             result: ActionRunnable.Result)
+        fun onActionStarted(
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        )
+        fun onActionUpdated(
+            database: ContextualDatabase,
+            progressMessage: ProgressMessage
+        )
+        fun onActionStopped(
+            database: ContextualDatabase
+        )
+        fun onActionFinished(
+            database: ContextualDatabase,
+            actionTask: String,
+            result: ActionRunnable.Result
+        )
    }

    fun checkDatabase() {
@@ -306,31 +313,18 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
            ACTION_DATABASE_LOAD_TASK -> buildDatabaseLoadActionTask(intent, database)
            ACTION_DATABASE_MERGE_TASK -> buildDatabaseMergeActionTask(intent, database)
            ACTION_DATABASE_RELOAD_TASK -> buildDatabaseReloadActionTask(database)
-            ACTION_DATABASE_ASSIGN_PASSWORD_TASK -> buildDatabaseAssignPasswordActionTask(intent,
-                database)
-            ACTION_DATABASE_CREATE_GROUP_TASK -> buildDatabaseCreateGroupActionTask(intent,
-                database)
-            ACTION_DATABASE_UPDATE_GROUP_TASK -> buildDatabaseUpdateGroupActionTask(intent,
-                database)
-            ACTION_DATABASE_CREATE_ENTRY_TASK -> buildDatabaseCreateEntryActionTask(intent,
-                database)
-            ACTION_DATABASE_UPDATE_ENTRY_TASK -> buildDatabaseUpdateEntryActionTask(intent,
-                database)
+            ACTION_DATABASE_ASSIGN_PASSWORD_TASK -> buildDatabaseAssignPasswordActionTask(intent, database)
+            ACTION_DATABASE_CREATE_GROUP_TASK -> buildDatabaseCreateGroupActionTask(intent, database)
+            ACTION_DATABASE_UPDATE_GROUP_TASK -> buildDatabaseUpdateGroupActionTask(intent, database)
+            ACTION_DATABASE_CREATE_ENTRY_TASK -> buildDatabaseCreateEntryActionTask(intent, database)
+            ACTION_DATABASE_UPDATE_ENTRY_TASK -> buildDatabaseUpdateEntryActionTask(intent, database)
            ACTION_DATABASE_COPY_NODES_TASK -> buildDatabaseCopyNodesActionTask(intent, database)
            ACTION_DATABASE_MOVE_NODES_TASK -> buildDatabaseMoveNodesActionTask(intent, database)
-            ACTION_DATABASE_DELETE_NODES_TASK -> buildDatabaseDeleteNodesActionTask(intent,
-                database)
-            ACTION_DATABASE_RESTORE_ENTRY_HISTORY -> buildDatabaseRestoreEntryHistoryActionTask(
-                intent,
-                database)
-            ACTION_DATABASE_DELETE_ENTRY_HISTORY -> buildDatabaseDeleteEntryHistoryActionTask(intent,
-                database)
-            ACTION_DATABASE_UPDATE_COMPRESSION_TASK -> buildDatabaseUpdateCompressionActionTask(
-                intent,
-                database)
-            ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK -> buildDatabaseRemoveUnlinkedDataActionTask(
-                intent,
-                database)
+            ACTION_DATABASE_DELETE_NODES_TASK -> buildDatabaseDeleteNodesActionTask(intent, database)
+            ACTION_DATABASE_RESTORE_ENTRY_HISTORY -> buildDatabaseRestoreEntryHistoryActionTask(intent, database)
+            ACTION_DATABASE_DELETE_ENTRY_HISTORY -> buildDatabaseDeleteEntryHistoryActionTask(intent, database)
+            ACTION_DATABASE_UPDATE_COMPRESSION_TASK -> buildDatabaseUpdateCompressionActionTask(intent, database)
+            ACTION_DATABASE_REMOVE_UNLINKED_DATA_TASK -> buildDatabaseRemoveUnlinkedDataActionTask(intent, database)
            ACTION_DATABASE_UPDATE_NAME_TASK,
            ACTION_DATABASE_UPDATE_DESCRIPTION_TASK,
            ACTION_DATABASE_UPDATE_DEFAULT_USERNAME_TASK,
--- a/app/src/main/java/com/kunzisoft/keepass/utils/TimeUtil.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/TimeUtil.kt
@@ -0,0 +1,29 @@
+package com.kunzisoft.keepass.utils
+
+import android.content.res.Resources
+import androidx.core.os.ConfigurationCompat
+import com.kunzisoft.keepass.database.element.DateInstant
+import java.text.DateFormat
+import java.util.Locale
+
+object TimeUtil {
+
+    fun DateInstant.getDateTimeString(resources: Resources): String {
+        val locale = ConfigurationCompat.getLocales(resources.configuration)[0] ?: Locale.ROOT
+        return when (type) {
+            DateInstant.Type.DATE -> DateFormat.getDateInstance(
+                DateFormat.MEDIUM,
+                locale)
+                .format(date)
+            DateInstant.Type.TIME -> DateFormat.getTimeInstance(
+                DateFormat.SHORT,
+                locale)
+                .format(date)
+            else -> DateFormat.getDateTimeInstance(
+                DateFormat.MEDIUM,
+                DateFormat.SHORT,
+                locale)
+                .format(date)
+        }
+    }
+}
--- a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditFieldView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditFieldView.kt
@@ -29,6 +29,7 @@ import androidx.core.view.isVisible
 import com.google.android.material.textfield.TextInputLayout
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.utils.TimeUtil.getDateTimeString

 class DateTimeEditFieldView @JvmOverloads constructor(context: Context,
                                                      attrs: AttributeSet? = null,
--- a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeFieldView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeFieldView.kt
@@ -31,6 +31,7 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.element.DateInstant
+import com.kunzisoft.keepass.utils.TimeUtil.getDateTimeString

 class DateTimeFieldView @JvmOverloads constructor(context: Context,
                                                  attrs: AttributeSet? = null,