Merge branch 'release/2.5.0.0beta13'

This commit is contained in:
J-Jamet
2018-07-14 11:11:36 +02:00
9 changed files with 29 additions and 25 deletions

View File

@@ -1,3 +1,6 @@
KeepassDX (2.5.0.0beta11)
* Fix memory issue with parcelable (crash in beta12 version)
KeepassDX (2.5.0.0beta12) KeepassDX (2.5.0.0beta12)
* Added the Magikeyboard to fill the forms (settings still in development) * Added the Magikeyboard to fill the forms (settings still in development)
* Added move and copy for groups and entries * Added move and copy for groups and entries

View File

@@ -6,10 +6,10 @@ android {
defaultConfig { defaultConfig {
applicationId "com.kunzisoft.keepass" applicationId "com.kunzisoft.keepass"
minSdkVersion 14 minSdkVersion 15
targetSdkVersion 27 targetSdkVersion 27
versionCode = 12 versionCode = 13
versionName = "2.5.0.0beta12" versionName = "2.5.0.0beta13"
multiDexEnabled true multiDexEnabled true
testApplicationId = "com.kunzisoft.keepass.tests" testApplicationId = "com.kunzisoft.keepass.tests"

View File

@@ -881,12 +881,14 @@ public class GroupActivity extends ListNodesActivity
@Override @Override
protected void openGroup(PwGroup group) { protected void openGroup(PwGroup group) {
super.openGroup(group); super.openGroup(group);
addNodeButtonView.showButton(); if (addNodeButtonView != null)
addNodeButtonView.showButton();
} }
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); super.onBackPressed();
addNodeButtonView.showButton(); if (addNodeButtonView != null)
addNodeButtonView.showButton();
} }
} }

View File

@@ -102,7 +102,7 @@ public abstract class ListNodesActivity extends LockingActivity
listNodesFragment = (ListNodesFragment) getSupportFragmentManager() listNodesFragment = (ListNodesFragment) getSupportFragmentManager()
.findFragmentByTag(LIST_NODES_FRAGMENT_TAG); .findFragmentByTag(LIST_NODES_FRAGMENT_TAG);
if (listNodesFragment == null) if (listNodesFragment == null)
listNodesFragment = ListNodesFragment.newInstance(currentGroup); listNodesFragment = ListNodesFragment.newInstance(currentGroup.getId());
} }
/** /**

View File

@@ -35,7 +35,6 @@ public class ListNodesFragment extends StylishFragment implements
private static final String TAG = ListNodesFragment.class.getName(); private static final String TAG = ListNodesFragment.class.getName();
private static final String GROUP_KEY = "GROUP_KEY";
private static final String GROUP_ID_KEY = "GROUP_ID_KEY"; private static final String GROUP_ID_KEY = "GROUP_ID_KEY";
private NodeAdapter.NodeClickCallback nodeClickCallback; private NodeAdapter.NodeClickCallback nodeClickCallback;
@@ -49,16 +48,6 @@ public class ListNodesFragment extends StylishFragment implements
// Preferences for sorting // Preferences for sorting
private SharedPreferences prefs; private SharedPreferences prefs;
public static ListNodesFragment newInstance(PwGroup group) {
Bundle bundle = new Bundle();
if (group != null) {
bundle.putSerializable(GROUP_KEY, group);
}
ListNodesFragment listNodesFragment = new ListNodesFragment();
listNodesFragment.setArguments(bundle);
return listNodesFragment;
}
public static ListNodesFragment newInstance(PwGroupId groupId) { public static ListNodesFragment newInstance(PwGroupId groupId) {
Bundle bundle=new Bundle(); Bundle bundle=new Bundle();
if (groupId != null) { if (groupId != null) {
@@ -124,10 +113,6 @@ public class ListNodesFragment extends StylishFragment implements
PwGroup currentGroup = null; PwGroup currentGroup = null;
if (getArguments() != null) { if (getArguments() != null) {
// Contains all the group in element
if (getArguments().containsKey(GROUP_KEY)) {
currentGroup = (PwGroup) getArguments().getSerializable(GROUP_KEY);
}
// Contains only the group id, so the group must be retrieve // Contains only the group id, so the group must be retrieve
if (getArguments().containsKey(GROUP_ID_KEY)) { if (getArguments().containsKey(GROUP_ID_KEY)) {
PwGroupId pwGroupId = (PwGroupId) getArguments().getSerializable(GROUP_ID_KEY); PwGroupId pwGroupId = (PwGroupId) getArguments().getSerializable(GROUP_ID_KEY);

View File

@@ -3,5 +3,5 @@
* New navigation in a single screen / new animations between activities * New navigation in a single screen / new animations between activities
* New icons for the material pack * New icons for the material pack
* New adaptive launcher icon * New adaptive launcher icon
* Added a setting to disable the open button when no password is identified / the education screens / the copy of protected custom fields * Added a setting to disable the open button / the education screens / the copy of protected custom fields
* Fix the fingerprint recognition (WARNING : The keystore is reinit, you must delete the old keys) * Fix the fingerprint recognition

View File

@@ -0,0 +1,7 @@
* Added the Magikeyboard to fill the forms
* Added move and copy for groups and entries
* New navigation in a single screen / new animations between activities
* New icons for the material pack
* New adaptive launcher icon
* Added a setting to disable the open button / the education screens / the copy of protected custom fields
* Fix the fingerprint recognition / crash in beta 12

View File

@@ -3,5 +3,5 @@
* Nouvelle navigation dans un seul écran / nouvelles animations entre activités * Nouvelle navigation dans un seul écran / nouvelles animations entre activités
* Nouveaux icones pour le pack material * Nouveaux icones pour le pack material
* Nouvel icone de lancement adaptatif * Nouvel icone de lancement adaptatif
* Ajout d'un paramètre pour désactiver le bouton d'ouverture quand aucun mot de passe n'est identifié / les écrans d'éducation / la copie des champs customisés protégés * Ajout d'un paramètre pour désactiver le bouton d'ouverture / les écrans d'éducation / la copie des champs customisés protégés
* Correction de la reconnaissance des empreintes digitales (ATTENTION: le keystore est réinitialisé, vous devez supprimer les anciennes clés) * Correction de la reconnaissance des empreintes digitales

View File

@@ -0,0 +1,7 @@
* Ajout du Magikeyboard pour remplir les formulaires
* Déplacer et copier ajoutés pour les groupes et les entrées
* Nouvelle navigation dans un seul écran / nouvelles animations entre activités
* Nouveaux icones pour le pack material
* Nouvel icone de lancement adaptatif
* Ajout d'un paramètre pour désactiver le bouton d'ouverture / les écrans d'éducation / la copie des champs customisés protégés
* Correction de la reconnaissance des empreintes digitales / crash de la beta 12