Merge branch 'release/2.5.0.0beta21'

CHANGELOG

@@ -1,3 +1,11 @@
+KeepassDX (2.5.0.0beta21)
+ * Fix nested groups no longer visible in V1 databases
+ * Improved data import algorithm for V1 databases
+ * Add natural database sort
+ * Add username database sort
+ * Fix button disabled with only KeyFile
+ * Show the number of entries in a group
+
 KeepassDX (2.5.0.0beta20)
  * Fix a major bug that displays an entry history
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode = 20
-        versionName = "2.5.0.0beta20"
+        versionCode = 21
+        versionName = "2.5.0.0beta21"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.kt

@@ -25,6 +25,7 @@ import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.activities.stylish.StylishFragment
 import com.kunzisoft.keepass.activities.helpers.ReadOnlyHelper
+import com.kunzisoft.keepass.database.element.Database
 
 class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionListener {
 
@@ -205,24 +206,20 @@ class ListNodesFragment : StylishFragment(), SortDialogFragment.SortSelectionLis
 
             R.id.menu_sort -> {
                 context?.let { context ->
-                    val sortDialogFragment: SortDialogFragment
-
-                    /*
-                    // TODO Recycle bin bottom
-                    if (database.isRecycleBinAvailable() && database.isRecycleBinEnabled()) {
-                        sortDialogFragment =
+                    val sortDialogFragment: SortDialogFragment =
+                            if (Database.getInstance().isRecycleBinAvailable
+                                    && Database.getInstance().isRecycleBinEnabled) {
+                                SortDialogFragment.getInstance(
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context),
+                                        PreferencesUtil.getRecycleBinBottomSort(context))
+                            } else {
                                 SortDialogFragment.getInstance(
-                                        PrefsUtil.getListSort(this),
-                                        PrefsUtil.getAscendingSort(this),
-                                        PrefsUtil.getGroupsBeforeSort(this),
-                                        PrefsUtil.getRecycleBinBottomSort(this));
-                    } else {
-                    */
-                    sortDialogFragment = SortDialogFragment.getInstance(
-                            PreferencesUtil.getListSort(context),
-                            PreferencesUtil.getAscendingSort(context),
-                            PreferencesUtil.getGroupsBeforeSort(context))
-                    //}
+                                        PreferencesUtil.getListSort(context),
+                                        PreferencesUtil.getAscendingSort(context),
+                                        PreferencesUtil.getGroupsBeforeSort(context))
+                            }
 
                     sortDialogFragment.show(childFragmentManager, "sortDialog")
                 }

app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt

@@ -48,7 +48,6 @@ import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment
 import com.kunzisoft.keepass.activities.helpers.*
 import com.kunzisoft.keepass.activities.lock.LockingActivity
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
-import com.kunzisoft.keepass.app.App
 import com.kunzisoft.keepass.autofill.AutofillHelper
 import com.kunzisoft.keepass.database.action.LoadDatabaseRunnable
 import com.kunzisoft.keepass.database.action.ProgressDialogThread
@@ -148,10 +147,8 @@ class PasswordActivity : StylishActivity(),
             }
         })
 
-        enableButtonOnCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, isChecked ->
-            if (!PreferencesUtil.emptyPasswordAllowed(this@PasswordActivity)) {
-                confirmButtonView?.isEnabled = isChecked
-            }
+        enableButtonOnCheckedChangeListener = CompoundButton.OnCheckedChangeListener { _, _ ->
+            enableOrNotTheConfirmationButton()
         }
     }
 
@@ -175,15 +172,6 @@ class PasswordActivity : StylishActivity(),
         // For check shutdown
         super.onResume()
 
-        // Enable or not the open button
-        if (!PreferencesUtil.emptyPasswordAllowed(this@PasswordActivity)) {
-            checkboxPasswordView?.let {
-                confirmButtonView?.isEnabled = it.isChecked
-            }
-        } else {
-            confirmButtonView?.isEnabled = true
-        }
-
         UriIntentInitTask(WeakReference(this), this, mRememberKeyFile)
                 .execute(intent)
     }
@@ -288,6 +276,21 @@ class PasswordActivity : StylishActivity(),
             if (!fingerPrintInit) {
                 checkboxPasswordView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
             }
+            checkboxKeyFileView?.setOnCheckedChangeListener(enableButtonOnCheckedChangeListener)
+        }
+
+        enableOrNotTheConfirmationButton()
+    }
+
+    private fun enableOrNotTheConfirmationButton() {
+        // Enable or not the open button if setting is checked
+        if (!PreferencesUtil.emptyPasswordAllowed(this@PasswordActivity)) {
+            checkboxPasswordView?.let {
+                confirmButtonView?.isEnabled = (checkboxPasswordView?.isChecked == true
+                        || checkboxKeyFileView?.isChecked == true)
+            }
+        } else {
+            confirmButtonView?.isEnabled = true
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt

@@ -35,12 +35,12 @@ class SortDialogFragment : DialogFragment() {
 
     private var mListener: SortSelectionListener? = null
 
-    private var mSortNodeEnum: SortNodeEnum? = null
+    private var mSortNodeEnum: SortNodeEnum = SortNodeEnum.DB
     @IdRes
     private var mCheckedId: Int = 0
-    private var mGroupsBefore: Boolean = false
-    private var mAscending: Boolean = false
-    private var mRecycleBinBottom: Boolean = false
+    private var mGroupsBefore: Boolean = true
+    private var mAscending: Boolean = true
+    private var mRecycleBinBottom: Boolean = true
 
     override fun onAttach(context: Context?) {
         super.onAttach(context)
@@ -50,18 +50,13 @@ class SortDialogFragment : DialogFragment() {
             throw ClassCastException(context!!.toString()
                     + " must implement " + SortSelectionListener::class.java.name)
         }
-
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         activity?.let { activity ->
             val builder = AlertDialog.Builder(activity)
 
-            mSortNodeEnum = SortNodeEnum.TITLE
-            mAscending = true
-            mGroupsBefore = true
             var recycleBinAllowed = false
-            mRecycleBinBottom = true
 
             arguments?.apply {
                 if (containsKey(SORT_NODE_ENUM_BUNDLE_KEY))

app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt

@@ -30,7 +30,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.App
 import com.kunzisoft.keepass.database.SortNodeEnum
 import com.kunzisoft.keepass.database.element.*
 import com.kunzisoft.keepass.icons.assignDatabaseIcon
@@ -48,11 +47,14 @@ class NodeAdapter
     private val inflater: LayoutInflater = LayoutInflater.from(context)
     private var textSize: Float = 0.toFloat()
     private var subtextSize: Float = 0.toFloat()
+    private var infoTextSize: Float = 0.toFloat()
     private var iconSize: Float = 0.toFloat()
-    private var listSort: SortNodeEnum? = null
-    private var groupsBeforeSort: Boolean = false
-    private var ascendingSort: Boolean = false
-    private var showUserNames: Boolean = false
+    private var listSort: SortNodeEnum = SortNodeEnum.DB
+    private var ascendingSort: Boolean = true
+    private var groupsBeforeSort: Boolean = true
+    private var recycleBinBottomSort: Boolean = true
+    private var showUserNames: Boolean = true
+    private var showNumberEntries: Boolean = true
 
     private var nodeClickCallback: NodeClickCallback? = null
     private var nodeMenuListener: NodeMenuListener? = null
@@ -80,7 +82,7 @@ class NodeAdapter
 
         this.nodeSortedList = SortedList(NodeVersioned::class.java, object : SortedListAdapterCallback<NodeVersioned>(this) {
             override fun compare(item1: NodeVersioned, item2: NodeVersioned): Int {
-                return listSort?.getNodeComparator(ascendingSort, groupsBeforeSort)?.compare(item1, item2) ?: 0
+                return listSort.getNodeComparator(ascendingSort, groupsBeforeSort, recycleBinBottomSort).compare(item1, item2)
             }
 
             override fun areContentsTheSame(oldItem: NodeVersioned, newItem: NodeVersioned): Boolean {
@@ -121,13 +123,16 @@ class NodeAdapter
         val textSizeDefault = java.lang.Float.parseFloat(context.getString(R.string.list_size_default))
         this.textSize = PreferencesUtil.getListTextSize(context)
         this.subtextSize = context.resources.getInteger(R.integer.list_small_size_default) * textSize / textSizeDefault
+        this.infoTextSize = context.resources.getInteger(R.integer.list_tiny_size_default) * textSize / textSizeDefault
         // Retrieve the icon size
         val iconDefaultSize = context.resources.getDimension(R.dimen.list_icon_size_default)
         this.iconSize = iconDefaultSize * textSize / textSizeDefault
         this.listSort = PreferencesUtil.getListSort(context)
-        this.groupsBeforeSort = PreferencesUtil.getGroupsBeforeSort(context)
         this.ascendingSort = PreferencesUtil.getAscendingSort(context)
+        this.groupsBeforeSort = PreferencesUtil.getGroupsBeforeSort(context)
+        this.recycleBinBottomSort = PreferencesUtil.getRecycleBinBottomSort(context)
         this.showUserNames = PreferencesUtil.showUsernamesListEntries(context)
+        this.showNumberEntries = PreferencesUtil.showNumberEntries(context)
     }
 
     /**
@@ -136,14 +141,12 @@ class NodeAdapter
     fun rebuildList(group: GroupVersioned) {
         this.nodeSortedList.clear()
         assignPreferences()
-        // TODO verify sort
         try {
-            this.nodeSortedList.addAll(group.getChildrenWithoutMetaStream())
+            this.nodeSortedList.addAll(group.getChildren())
         } catch (e: Exception) {
             Log.e(TAG, "Can't add node elements to the list", e)
             Toast.makeText(context, "Can't add node elements to the list : " + e.message, Toast.LENGTH_LONG).show()
         }
-
     }
 
     /**
@@ -239,6 +242,17 @@ class NodeAdapter
         holder.icon.layoutParams?.width = iconSize.toInt()
         holder.text.textSize = textSize
         holder.subText.textSize = subtextSize
+        if (subNode.type == Type.GROUP) {
+            if (showNumberEntries) {
+                holder.numberChildren?.apply {
+                    text = (subNode as GroupVersioned).getChildEntries().size.toString()
+                    textSize = infoTextSize
+                    visibility = View.VISIBLE
+                }
+            } else {
+                holder.numberChildren?.visibility = View.GONE
+            }
+        }
     }
 
     override fun getItemCount(): Int {
@@ -356,6 +370,7 @@ class NodeAdapter
         var icon: ImageView = itemView.findViewById(R.id.node_icon)
         var text: TextView = itemView.findViewById(R.id.node_text)
         var subText: TextView = itemView.findViewById(R.id.node_subtext)
+        var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)
     }
 
     companion object {