Merge branch 'release/3.4.5'

Kunzisoft · Jun 2, 2022 · 0ef574d · 0ef574d
2 parents 1c0f1a0 + 6d15a24
commit 0ef574d
Show file tree

Hide file tree

Showing 32 changed files with 438 additions and 203 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+KeePassDX(3.4.5)
+ * Fix custom data in group (fix KeeShare) #1335
+ * Fix device credential unlocking #1344
+ * New clipboard manager #1343
+ * Keep screen on by default when viewing an entry
+ * Change the order of the search filters
+ * Fix searchable selection
+
 KeePassDX(3.4.4)
  * Fix crash in New Android 13 #1321
  * Better backstack management for selection mode

diff --git a/app/build.gradle b/app/build.gradle
@@ -4,16 +4,16 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.0"
+    compileSdkVersion 32
+    buildToolsVersion "32.0.0"
     ndkVersion "21.4.7075529"
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
-        targetSdkVersion 31
-        versionCode = 113
-        versionName = "3.4.4"
+        targetSdkVersion 32
+        versionCode = 114
+        versionName = "3.4.5"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -479,6 +479,11 @@ class EntryEditActivity : DatabaseLockActivity(),
                 }
             }
         }
+
+        // Keep the screen on
+        if (PreferencesUtil.isKeepScreenOnEnabled(this)) {
+            window.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
     }
 
     override fun onPause() {

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/EntryFragment.kt
@@ -27,7 +27,6 @@ import com.kunzisoft.keepass.view.TemplateView
 import com.kunzisoft.keepass.view.hideByFading
 import com.kunzisoft.keepass.view.showByFading
 import com.kunzisoft.keepass.viewmodels.EntryViewModel
-import java.util.*
 
 class EntryFragment: DatabaseFragment() {
 
@@ -158,11 +157,9 @@ class EntryFragment: DatabaseFragment() {
 
             setOnCopyActionClickListener { field ->
                 mClipboardHelper?.timeoutCopyToClipboard(
+                    TemplateField.getLocalizedName(context, field.name),
                     field.protectedValue.stringValue,
-                    getString(
-                        R.string.copy_field,
-                        TemplateField.getLocalizedName(context, field.name)
-                    )
+                    field.protectedValue.isProtected
                 )
             }
         }
@@ -251,8 +248,7 @@ class EntryFragment: DatabaseFragment() {
 
     fun launchEntryCopyEducationAction() {
         val appNameString = getString(R.string.app_name)
-        mClipboardHelper?.timeoutCopyToClipboard(appNameString,
-            getString(R.string.copy_field, appNameString))
+        mClipboardHelper?.timeoutCopyToClipboard(appNameString, appNameString)
     }
 
     companion object {

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PassphraseGeneratorFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PassphraseGeneratorFragment.kt
@@ -78,9 +78,11 @@ class PassphraseGeneratorFragment : DatabaseFragment() {
                 View.VISIBLE else View.GONE
             val clipboardHelper = ClipboardHelper(context)
             passphraseCopyView?.setOnClickListener {
-                clipboardHelper.timeoutCopyToClipboard(passKeyView.passwordString,
-                    getString(R.string.copy_field,
-                        getString(R.string.entry_password)))
+                clipboardHelper.timeoutCopyToClipboard(
+                    getString(R.string.passphrase),
+                    passKeyView.passwordString,
+                    true
+                )
             }
 
             wordCaseAdapter = ArrayAdapter(context,

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PasswordGeneratorFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/fragments/PasswordGeneratorFragment.kt
@@ -99,9 +99,11 @@ class PasswordGeneratorFragment : DatabaseFragment() {
                 View.VISIBLE else View.GONE
             val clipboardHelper = ClipboardHelper(context)
             passwordCopyView?.setOnClickListener {
-                clipboardHelper.timeoutCopyToClipboard(passKeyView.passwordString,
-                    getString(R.string.copy_field,
-                        getString(R.string.entry_password)))
+                clipboardHelper.timeoutCopyToClipboard(
+                    getString(R.string.password),
+                    passKeyView.passwordString,
+                    true
+                )
             }
         }
 

diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodesAdapter.kt
@@ -21,13 +21,13 @@ package com.kunzisoft.keepass.adapters
 
 import android.content.Context
 import android.graphics.Color
+import android.util.Log
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SortedList
@@ -521,13 +521,14 @@ class NodesAdapter (private val context: Context,
         }
         holder?.otpContainer?.setOnClickListener {
             otpElement?.token?.let { token ->
-                Toast.makeText(
-                        context,
-                        context.getString(R.string.copy_field,
-                                TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN)),
-                        Toast.LENGTH_LONG
-                ).show()
-                mClipboardHelper.copyToClipboard(token)
+                try {
+                    mClipboardHelper.copyToClipboard(
+                        TemplateField.getLocalizedName(context, TemplateField.LABEL_TOKEN),
+                        token
+                    )
+                } catch (e: Exception) {
+                    Log.e(TAG, "Unable to copy the OTP token", e)
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockManager.kt
@@ -403,13 +403,11 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
             }
         }
 
-        @RequiresApi(api = Build.VERSION_CODES.M)
         fun isDeviceSecure(context: Context): Boolean {
-            val keyguardManager = ContextCompat.getSystemService(context, KeyguardManager::class.java)
-            return keyguardManager?.isDeviceSecure ?: false
+            return ContextCompat.getSystemService(context, KeyguardManager::class.java)
+                ?.isDeviceSecure ?: false
         }
 
-        @RequiresApi(api = Build.VERSION_CODES.M)
         fun biometricUnlockSupported(context: Context): Boolean {
             val biometricCanAuthenticate = try {
                 BiometricManager.from(context).canAuthenticate(BIOMETRIC_STRONG)
@@ -430,28 +428,23 @@ class AdvancedUnlockManager(private var retrieveContext: () -> FragmentActivity)
             )
         }
 
-        @RequiresApi(api = Build.VERSION_CODES.M)
         fun deviceCredentialUnlockSupported(context: Context): Boolean {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 val biometricCanAuthenticate = BiometricManager.from(context).canAuthenticate(DEVICE_CREDENTIAL)
-                return (biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
+                (biometricCanAuthenticate == BiometricManager.BIOMETRIC_SUCCESS
                         || biometricCanAuthenticate == BiometricManager.BIOMETRIC_STATUS_UNKNOWN
                         || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE
                         || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED
                         || biometricCanAuthenticate == BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED
                         )
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                ContextCompat.getSystemService(context, KeyguardManager::class.java)?.apply {
-                    return isDeviceSecure
-                }
+            } else {
+                true
             }
-            return false
         }
 
         /**
          * Remove entry key in keystore
          */
-        @RequiresApi(api = Build.VERSION_CODES.M)
         fun deleteEntryKeyInKeystoreForBiometric(fragmentActivity: FragmentActivity,
                                                  advancedCallback: AdvancedUnlockErrorCallback) {
             AdvancedUnlockManager{ fragmentActivity }.apply {

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDBX.kt
@@ -855,10 +855,6 @@ class DatabaseKDBX : DatabaseVersioned<UUID, UUID, GroupKDBX, EntryKDBX> {
         mFieldReferenceEngine.clear()
     }
 
-    fun containsPublicCustomData(): Boolean {
-        return publicCustomData.size() > 0
-    }
-
     fun buildNewBinaryAttachment(smallSize: Boolean,
                                  compression: Boolean,
                                  protection: Boolean,

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/exception/ClipboardException.kt b/app/src/main/java/com/kunzisoft/keepass/database/exception/ClipboardException.kt
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseHeaderOutputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseHeaderOutputKDBX.kt
@@ -92,7 +92,7 @@ constructor(private val databaseKDBX: DatabaseKDBX,
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.InnerRandomStreamID, uIntTo4Bytes(header.innerRandomStream!!.id))
         }
 
-        if (databaseKDBX.containsPublicCustomData()) {
+        if (databaseKDBX.publicCustomData.size() > 0) {
             val bos = ByteArrayOutputStream()
             VariantDictionary.serialize(databaseKDBX.publicCustomData, bos)
             writeHeaderField(DatabaseHeaderKDBX.PwDbHeaderV4Fields.PublicCustomData, bos.toByteArray())

diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt
@@ -359,6 +359,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
         writeBoolean(DatabaseKDBXXML.ElemEnableAutoType, group.enableAutoType)
         writeBoolean(DatabaseKDBXXML.ElemEnableSearching, group.enableSearching)
         writeUuid(DatabaseKDBXXML.ElemLastTopVisibleEntry, group.lastTopVisibleEntry)
+        writeCustomData(group.customData)
     }
 
     @Throws(IllegalArgumentException::class, IllegalStateException::class, IOException::class)

diff --git a/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationField.kt b/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationField.kt
@@ -33,6 +33,10 @@ class ClipboardEntryNotificationField : Parcelable {
 
     private var id: NotificationFieldId = NotificationFieldId.UNKNOWN
     var label: String = ""
+    val isSensitive: Boolean
+        get() {
+            return id == NotificationFieldId.PASSWORD
+        }
 
     val actionKey: String
         get() = getActionKey(id)

diff --git a/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt
@@ -31,7 +31,6 @@ import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.timeout.ClipboardHelper
 import com.kunzisoft.keepass.timeout.TimeoutHelper.NEVER
 import com.kunzisoft.keepass.utils.LOCK_ACTION
-import java.util.*
 
 class ClipboardEntryNotificationService : LockNotificationService() {
 
@@ -75,7 +74,7 @@ class ClipboardEntryNotificationService : LockNotificationService() {
             }
             ACTION_CLEAN_CLIPBOARD == intent.action -> {
                 mTimerJob?.cancel()
-                cleanClipboard()
+                clipboardHelper?.cleanClipboard()
                 stopNotificationAndSendLockIfNeeded()
             }
             else -> for (actionKey in ClipboardEntryNotificationField.allActionKeys) {
@@ -153,7 +152,11 @@ class ClipboardEntryNotificationService : LockNotificationService() {
 
         try {
             var generatedValue = fieldToCopy.getGeneratedValue(mEntryInfo)
-            clipboardHelper?.copyToClipboard(fieldToCopy.label, generatedValue)
+            clipboardHelper?.copyToClipboard(
+                fieldToCopy.label,
+                generatedValue,
+                fieldToCopy.isSensitive
+            )
 
             val builder = buildNewNotification()
                     .setSmallIcon(R.drawable.notification_ic_clipboard_key_24dp)
@@ -186,13 +189,17 @@ class ClipboardEntryNotificationService : LockNotificationService() {
                     // New auto generated value
                     if (generatedValue != newGeneratedValue) {
                         generatedValue = newGeneratedValue
-                        clipboardHelper?.copyToClipboard(fieldToCopy.label, generatedValue)
+                        clipboardHelper?.copyToClipboard(
+                            fieldToCopy.label,
+                            generatedValue,
+                            fieldToCopy.isSensitive
+                        )
                     }
                 }) {
                     stopNotificationAndSendLockIfNeeded()
                     // Clean password only if no next field
                     if (nextFields.size <= 0)
-                        cleanClipboard()
+                        clipboardHelper?.cleanClipboard()
                 }
             } else {
                 // No timer
@@ -202,25 +209,15 @@ class ClipboardEntryNotificationService : LockNotificationService() {
         } catch (e: Exception) {
             Log.e(TAG, "Clipboard can't be populate", e)
         }
-
-    }
-
-    private fun cleanClipboard() {
-        try {
-            clipboardHelper?.cleanClipboard()
-        } catch (e: Exception) {
-            Log.e(TAG, "Clipboard can't be cleaned", e)
-        }
     }
 
     override fun onTaskRemoved(rootIntent: Intent?) {
-        cleanClipboard()
-
+        clipboardHelper?.cleanClipboard()
         super.onTaskRemoved(rootIntent)
     }
 
     override fun onDestroy() {
-        cleanClipboard()
+        clipboardHelper?.cleanClipboard()
         super.onDestroy()
     }