mirrors/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-04-06 06:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add sorting by last access and by creation time

Browse source
This commit is contained in:
J-Jamet 2018-04-06 19:02:31 +02:00
parent db98f4b30c
commit a6046bc49a
6 changed files with 235 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -3,6 +3,7 @@ KeepassDX (2.5.0.0beta8)
* Best management of field references (https://keepass.info/help/base/fieldrefs.html) * Best management of field references (https://keepass.info/help/base/fieldrefs.html)
* Change database / default settings * Change database / default settings
* Add Autofill for search * Add Autofill for search
* Add sorting by last access and by creation time
* Rebuild custom entries * Rebuild custom entries
* Refactor old code * Refactor old code
* Fix bugs * Fix bugs

304
app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.java
View file

@ -37,9 +37,9 @@ public enum SortNodeEnum {
case CREATION_TIME: case CREATION_TIME:
return new NodeCreationComparator(ascending, groupsBefore); return new NodeCreationComparator(ascending, groupsBefore);
case LAST_MODIFY_TIME: case LAST_MODIFY_TIME:
return new NodeCreationComparator(ascending, groupsBefore); // TODO Sort return new NodeLastModificationComparator(ascending, groupsBefore);
case LAST_ACCESS_TIME: case LAST_ACCESS_TIME:
return new NodeCreationComparator(ascending, groupsBefore); // TODO Sort return new NodeLastAccessComparator(ascending, groupsBefore);
} }
} }
@ -51,24 +51,18 @@ public enum SortNodeEnum {
this.ascending = ascending; this.ascending = ascending;
this.groupsBefore = groupsBefore; this.groupsBefore = groupsBefore;
} }
}
/** int compareWith(Comparator<PwGroup> comparatorGroup,
* Comparator of Node by Title, Groups first, Entries second Comparator<PwEntry> comparatorEntry,
*/ PwNode object1,
public static class NodeTitleComparator extends NodeComparator { PwNode object2,
int resultOfNodeMethodCompare) {
public NodeTitleComparator(boolean ascending, boolean groupsBefore) {
super(ascending, groupsBefore);
}
public int compare(PwNode object1, PwNode object2) {
if (object1.equals(object2)) if (object1.equals(object2))
return 0; return 0;
if (object1 instanceof PwGroup) { if (object1 instanceof PwGroup) {
if (object2 instanceof PwGroup) { if (object2 instanceof PwGroup) {
return new GroupNameComparator(ascending) return comparatorGroup
.compare((PwGroup) object1, (PwGroup) object2); .compare((PwGroup) object1, (PwGroup) object2);
} else if (object2 instanceof PwEntry) { } else if (object2 instanceof PwEntry) {
if(groupsBefore) if(groupsBefore)
@ -80,7 +74,7 @@ public enum SortNodeEnum {
} }
} else if (object1 instanceof PwEntry) { } else if (object1 instanceof PwEntry) {
if(object2 instanceof PwEntry) { if(object2 instanceof PwEntry) {
return new EntryNameComparator(ascending) return comparatorEntry
.compare((PwEntry) object1, (PwEntry) object2); .compare((PwEntry) object1, (PwEntry) object2);
} else if (object2 instanceof PwGroup) { } else if (object2 instanceof PwGroup) {
if(groupsBefore) if(groupsBefore)
@ -91,12 +85,32 @@ public enum SortNodeEnum {
return -1; return -1;
} }
} }
int nodeNameComp = object1.getDisplayTitle()
.compareToIgnoreCase(object2.getDisplayTitle());
// If same name, can be different // If same name, can be different
if (nodeNameComp == 0) if (resultOfNodeMethodCompare == 0)
return object1.hashCode() - object2.hashCode(); return object1.hashCode() - object2.hashCode();
return nodeNameComp; return resultOfNodeMethodCompare;
}
}
/**
* Comparator of Node by Title, Groups first, Entries second
*/
public static class NodeTitleComparator extends NodeComparator {
NodeTitleComparator(boolean ascending, boolean groupsBefore) {
super(ascending, groupsBefore);
}
public int compare(PwNode object1, PwNode object2) {
return compareWith(
new GroupNameComparator(ascending),
new EntryNameComparator(ascending),
object1,
object2,
object1.getDisplayTitle()
.compareToIgnoreCase(object2.getDisplayTitle()));
} }
} }
@ -106,59 +120,91 @@ public enum SortNodeEnum {
public static class NodeCreationComparator extends NodeComparator { public static class NodeCreationComparator extends NodeComparator {
public NodeCreationComparator(boolean ascending, boolean groupsBefore) { NodeCreationComparator(boolean ascending, boolean groupsBefore) {
super(ascending, groupsBefore); super(ascending, groupsBefore);
} }
@Override @Override
public int compare(PwNode object1, PwNode object2) { public int compare(PwNode object1, PwNode object2) {
if (object1.equals(object2))
return 0;
if (object1 instanceof PwGroup) { return compareWith(
if (object2 instanceof PwGroup) { new GroupCreationComparator(ascending),
return new GroupCreationComparator(ascending) new EntryCreationComparator(ascending),
.compare((PwGroup) object1, (PwGroup) object2); object1,
} else if (object2 instanceof PwEntry) { object2,
if(groupsBefore) object1.getCreationTime().getDate()
return -1; .compareTo(object2.getCreationTime().getDate()));
else }
return 1; }
} else {
return -1; /**
} * Comparator of node by last modification, Groups first, Entries second
} else if (object1 instanceof PwEntry) { */
if(object2 instanceof PwEntry) { public static class NodeLastModificationComparator extends NodeComparator {
return new EntryCreationComparator(ascending)
.compare((PwEntry) object1, (PwEntry) object2); NodeLastModificationComparator(boolean ascending, boolean groupsBefore) {
} else if (object2 instanceof PwGroup) { super(ascending, groupsBefore);
if(groupsBefore) }
return 1;
else @Override
return -1; public int compare(PwNode object1, PwNode object2) {
} else {
return -1; return compareWith(
} new GroupLastModificationComparator(ascending),
} new EntryLastModificationComparator(ascending),
int nodeCreationComp = object1.getCreationTime().getDate() object1,
.compareTo(object2.getCreationTime().getDate()); object2,
// If same creation, can be different object1.getLastModificationTime().getDate()
if (nodeCreationComp == 0) { .compareTo(object2.getLastModificationTime().getDate()));
return object1.hashCode() - object2.hashCode(); }
} }
return nodeCreationComp;
/**
* Comparator of node by last access, Groups first, Entries second
*/
public static class NodeLastAccessComparator extends NodeComparator {
NodeLastAccessComparator(boolean ascending, boolean groupsBefore) {
super(ascending, groupsBefore);
}
@Override
public int compare(PwNode object1, PwNode object2) {
return compareWith(
new GroupLastAccessComparator(ascending),
new EntryLastAccessComparator(ascending),
object1,
object2,
object1.getLastAccessTime().getDate()
.compareTo(object2.getLastAccessTime().getDate()));
}
}
private static abstract class AscendingComparator<Node> implements Comparator<Node> {
private boolean ascending;
AscendingComparator(boolean ascending) {
this.ascending = ascending;
}
int compareWithAscending(int basicCompareResult) {
// If descending, revert
if (!ascending)
return -basicCompareResult;
return basicCompareResult;
} }
} }
/** /**
* Group comparator by name * Group comparator by name
*/ */
public static class GroupNameComparator implements Comparator<PwGroup> { public static class GroupNameComparator extends AscendingComparator<PwGroup> {
private boolean ascending; GroupNameComparator(boolean ascending) {
super(ascending);
public GroupNameComparator(boolean ascending) {
this.ascending = ascending;
} }
public int compare(PwGroup object1, PwGroup object2) { public int compare(PwGroup object1, PwGroup object2) {
@ -170,23 +216,18 @@ public enum SortNodeEnum {
if (groupNameComp == 0) { if (groupNameComp == 0) {
return object1.hashCode() - object2.hashCode(); return object1.hashCode() - object2.hashCode();
} }
// If descending
if (!ascending)
groupNameComp = -groupNameComp;
return groupNameComp; return compareWithAscending(groupNameComp);
} }
} }
/** /**
* Group comparator by name * Group comparator by name
*/ */
public static class GroupCreationComparator implements Comparator<PwGroup> { public static class GroupCreationComparator extends AscendingComparator<PwGroup> {
private boolean ascending; GroupCreationComparator(boolean ascending) {
super(ascending);
public GroupCreationComparator(boolean ascending) {
this.ascending = ascending;
} }
public int compare(PwGroup object1, PwGroup object2) { public int compare(PwGroup object1, PwGroup object2) {
@ -199,23 +240,66 @@ public enum SortNodeEnum {
if (groupCreationComp == 0) { if (groupCreationComp == 0) {
return object1.hashCode() - object2.hashCode(); return object1.hashCode() - object2.hashCode();
} }
// If descending
if (!ascending)
groupCreationComp = -groupCreationComp;
return groupCreationComp; return compareWithAscending(groupCreationComp);
}
}
/**
* Group comparator by last modification
*/
public static class GroupLastModificationComparator extends AscendingComparator<PwGroup> {
GroupLastModificationComparator(boolean ascending) {
super(ascending);
}
public int compare(PwGroup object1, PwGroup object2) {
if (object1.equals(object2))
return 0;
int groupLastModificationComp = object1.getLastModificationTime().getDate()
.compareTo(object2.getLastModificationTime().getDate());
// If same creation, can be different
if (groupLastModificationComp == 0) {
return object1.hashCode() - object2.hashCode();
}
return compareWithAscending(groupLastModificationComp);
}
}
/**
* Group comparator by last access
*/
public static class GroupLastAccessComparator extends AscendingComparator<PwGroup> {
GroupLastAccessComparator(boolean ascending) {
super(ascending);
}
public int compare(PwGroup object1, PwGroup object2) {
if (object1.equals(object2))
return 0;
int groupLastAccessComp = object1.getLastAccessTime().getDate()
.compareTo(object2.getLastAccessTime().getDate());
// If same creation, can be different
if (groupLastAccessComp == 0) {
return object1.hashCode() - object2.hashCode();
}
return compareWithAscending(groupLastAccessComp);
} }
} }
/** /**
* Comparator of Entry by Name * Comparator of Entry by Name
*/ */
public static class EntryNameComparator implements Comparator<PwEntry> { public static class EntryNameComparator extends AscendingComparator<PwEntry> {
private boolean ascending; EntryNameComparator(boolean ascending) {
super(ascending);
public EntryNameComparator(boolean ascending) {
this.ascending = ascending;
} }
public int compare(PwEntry object1, PwEntry object2) { public int compare(PwEntry object1, PwEntry object2) {
@ -227,23 +311,18 @@ public enum SortNodeEnum {
if (entryTitleComp == 0) { if (entryTitleComp == 0) {
return object1.hashCode() - object2.hashCode(); return object1.hashCode() - object2.hashCode();
} }
// If descending
if (!ascending)
entryTitleComp = -entryTitleComp;
return entryTitleComp; return compareWithAscending(entryTitleComp);
} }
} }
/** /**
* Comparator of Entry by Creation * Comparator of Entry by Creation
*/ */
public static class EntryCreationComparator implements Comparator<PwEntry> { public static class EntryCreationComparator extends AscendingComparator<PwEntry> {
private boolean ascending; EntryCreationComparator(boolean ascending) {
super(ascending);
public EntryCreationComparator(boolean ascending) {
this.ascending = ascending;
} }
public int compare(PwEntry object1, PwEntry object2) { public int compare(PwEntry object1, PwEntry object2) {
@ -256,11 +335,56 @@ public enum SortNodeEnum {
if (entryCreationComp == 0) { if (entryCreationComp == 0) {
return object1.hashCode() - object2.hashCode(); return object1.hashCode() - object2.hashCode();
} }
// If descending
if (!ascending)
entryCreationComp = -entryCreationComp;
return entryCreationComp; return compareWithAscending(entryCreationComp);
}
}
/**
* Comparator of Entry by Last Modification
*/
public static class EntryLastModificationComparator extends AscendingComparator<PwEntry> {
EntryLastModificationComparator(boolean ascending) {
super(ascending);
}
public int compare(PwEntry object1, PwEntry object2) {
if (object1.equals(object2))
return 0;
int entryLastModificationComp = object1.getLastModificationTime().getDate()
.compareTo(object2.getLastModificationTime().getDate());
// If same creation, can be different
if (entryLastModificationComp == 0) {
return object1.hashCode() - object2.hashCode();
}
return compareWithAscending(entryLastModificationComp);
}
}
/**
* Comparator of Entry by Last Access
*/
public static class EntryLastAccessComparator extends AscendingComparator<PwEntry> {
EntryLastAccessComparator(boolean ascending) {
super(ascending);
}
public int compare(PwEntry object1, PwEntry object2) {
if (object1.equals(object2))
return 0;
int entryLastAccessComp = object1.getLastAccessTime().getDate()
.compareTo(object2.getLastAccessTime().getDate());
// If same creation, can be different
if (entryLastAccessComp == 0) {
return object1.hashCode() - object2.hashCode();
}
return compareWithAscending(entryLastAccessComp);
} }
} }
} }

54
app/src/main/java/com/kunzisoft/keepass/dialogs/SortDialogFragment.java
View file

@ -21,7 +21,6 @@ package com.kunzisoft.keepass.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.IdRes; import android.support.annotation.IdRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -95,6 +94,7 @@ public class SortDialogFragment extends DialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
assert getActivity() != null;
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
LayoutInflater inflater = getActivity().getLayoutInflater(); LayoutInflater inflater = getActivity().getLayoutInflater();
@ -123,59 +123,37 @@ public class SortDialogFragment extends DialogFragment {
builder.setTitle(R.string.sort_menu); builder.setTitle(R.string.sort_menu);
builder.setView(rootView) builder.setView(rootView)
// Add action buttons // Add action buttons
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok,
@Override (dialog, id) -> mListener.onSortSelected(sortNodeEnum, mAscending, mGroupsBefore, mRecycleBinBottom))
public void onClick(DialogInterface dialog, int id) { .setNegativeButton(R.string.cancel, (dialog, id) -> {});
mListener.onSortSelected(sortNodeEnum, mAscending, mGroupsBefore, mRecycleBinBottom);
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {}
});
CompoundButton ascendingView = (CompoundButton) rootView.findViewById(R.id.sort_selection_ascending); CompoundButton ascendingView = rootView.findViewById(R.id.sort_selection_ascending);
// Check if is ascending or descending // Check if is ascending or descending
ascendingView.setChecked(mAscending); ascendingView.setChecked(mAscending);
ascendingView.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { ascendingView.setOnCheckedChangeListener(
@Override (buttonView, isChecked) -> mAscending = isChecked);
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mAscending = isChecked;
}
});
CompoundButton groupsBeforeView = (CompoundButton) rootView.findViewById(R.id.sort_selection_groups_before); CompoundButton groupsBeforeView = rootView.findViewById(R.id.sort_selection_groups_before);
// Check if groups before // Check if groups before
groupsBeforeView.setChecked(mGroupsBefore); groupsBeforeView.setChecked(mGroupsBefore);
groupsBeforeView.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { groupsBeforeView.setOnCheckedChangeListener(
@Override (buttonView, isChecked) -> mGroupsBefore = isChecked);
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mGroupsBefore = isChecked;
}
});
CompoundButton recycleBinBottomView = (CompoundButton) rootView.findViewById(R.id.sort_selection_recycle_bin_bottom); CompoundButton recycleBinBottomView = rootView.findViewById(R.id.sort_selection_recycle_bin_bottom);
if (!recycleBinAllowed) { if (!recycleBinAllowed) {
recycleBinBottomView.setVisibility(View.GONE); recycleBinBottomView.setVisibility(View.GONE);
} else { } else {
// Check if recycle bin at the bottom // Check if recycle bin at the bottom
recycleBinBottomView.setChecked(mRecycleBinBottom); recycleBinBottomView.setChecked(mRecycleBinBottom);
recycleBinBottomView.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { recycleBinBottomView.setOnCheckedChangeListener(
@Override (buttonView, isChecked) -> mRecycleBinBottom = isChecked);
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
mRecycleBinBottom = isChecked;
}
});
} }
RadioGroup sortSelectionRadioGroupView = (RadioGroup) rootView.findViewById(R.id.sort_selection_radio_group); RadioGroup sortSelectionRadioGroupView = rootView.findViewById(R.id.sort_selection_radio_group);
// Check value by default // Check value by default
sortSelectionRadioGroupView.check(mCheckedId); sortSelectionRadioGroupView.check(mCheckedId);
sortSelectionRadioGroupView.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { sortSelectionRadioGroupView.setOnCheckedChangeListener(
@Override (group, checkedId) -> sortNodeEnum = retrieveSortEnumFromViewId(checkedId));
public void onCheckedChanged(RadioGroup group, int checkedId) {
sortNodeEnum = retrieveSortEnumFromViewId(checkedId);
}
});
return builder.create(); return builder.create();
} }

6
app/src/main/res/layout/sort_selection.xml
View file

@ -30,13 +30,11 @@
<RadioButton android:id="@+id/sort_selection_last_modify_time" <RadioButton android:id="@+id/sort_selection_last_modify_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sort_last_modify_time" android:text="@string/sort_last_modify_time"/>
android:visibility="gone"/>
<RadioButton android:id="@+id/sort_selection_last_access_time" <RadioButton android:id="@+id/sort_selection_last_access_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sort_last_access_time" android:text="@string/sort_last_access_time"/>
android:visibility="gone"/>
</RadioGroup> </RadioGroup>
<CheckBox android:id="@+id/sort_selection_ascending" <CheckBox android:id="@+id/sort_selection_ascending"
android:layout_width="wrap_content" android:layout_width="wrap_content"

1
fastlane/metadata/android/en-US/changelogs/8.txt
View file

@ -2,6 +2,7 @@
* Best management of field references (https://keepass.info/help/base/fieldrefs.html) * Best management of field references (https://keepass.info/help/base/fieldrefs.html)
* Change database / default settings * Change database / default settings
* Add Autofill for search * Add Autofill for search
* Add sorting by last access and by creation time
* Rebuild custom entries * Rebuild custom entries
* Refactor old code * Refactor old code
* Fix bugs * Fix bugs

1
fastlane/metadata/android/fr-FR/changelogs/8.txt
View file

@ -2,6 +2,7 @@
* Meilleure gestion des références de champs (https://keepass.info/help/base/fieldrefs.html) * Meilleure gestion des références de champs (https://keepass.info/help/base/fieldrefs.html)
* Changement des paramètres de base de données / par defaut * Changement des paramètres de base de données / par defaut
* Ajout du remplissage automatique pour la recherche * Ajout du remplissage automatique pour la recherche
* Ajout des tris par dernier accès et par temps de création
* Reconstruction des entrées customisées * Reconstruction des entrées customisées
* Refactorisation du vieux code * Refactorisation du vieux code
* Correction de bugs * Correction de bugs