From c74b82ebd843ac0e9116a6b155bb4a91986a5ee7 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 13 Jul 2018 17:06:20 +0200 Subject: [PATCH 1/4] Fix changelogs --- fastlane/metadata/android/en-US/changelogs/12.txt | 4 ++-- fastlane/metadata/android/fr-FR/changelogs/12.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fastlane/metadata/android/en-US/changelogs/12.txt b/fastlane/metadata/android/en-US/changelogs/12.txt index 6637169fd..3fb0da803 100644 --- a/fastlane/metadata/android/en-US/changelogs/12.txt +++ b/fastlane/metadata/android/en-US/changelogs/12.txt @@ -3,5 +3,5 @@ * 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 when no password is identified / the education screens / the copy of protected custom fields - * Fix the fingerprint recognition (WARNING : The keystore is reinit, you must delete the old keys) \ No newline at end of file + * Added a setting to disable the open button / the education screens / the copy of protected custom fields + * Fix the fingerprint recognition \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/12.txt b/fastlane/metadata/android/fr-FR/changelogs/12.txt index 5b0674d50..1de15e7b8 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/12.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/12.txt @@ -3,5 +3,5 @@ * 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 quand aucun mot de passe n'est identifié / 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) \ No newline at end of file + * 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 \ No newline at end of file From 33009138c31b31e59ef183544b7b09221e551a74 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 14 Jul 2018 10:23:04 +0200 Subject: [PATCH 2/4] Update version and fix memory crash --- app/build.gradle | 6 +++--- .../keepass/activities/ListNodesActivity.java | 2 +- .../keepass/activities/ListNodesFragment.java | 15 --------------- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 715399005..20cc7a46a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,10 +6,10 @@ android { defaultConfig { applicationId "com.kunzisoft.keepass" - minSdkVersion 14 + minSdkVersion 15 targetSdkVersion 27 - versionCode = 12 - versionName = "2.5.0.0beta12" + versionCode = 13 + versionName = "2.5.0.0beta13" multiDexEnabled true testApplicationId = "com.kunzisoft.keepass.tests" diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java index 9b5635508..6779949c7 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java @@ -102,7 +102,7 @@ public abstract class ListNodesActivity extends LockingActivity listNodesFragment = (ListNodesFragment) getSupportFragmentManager() .findFragmentByTag(LIST_NODES_FRAGMENT_TAG); if (listNodesFragment == null) - listNodesFragment = ListNodesFragment.newInstance(currentGroup); + listNodesFragment = ListNodesFragment.newInstance(currentGroup.getId()); } /** diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java index e657f768b..0dcbd3de1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/ListNodesFragment.java @@ -35,7 +35,6 @@ public class ListNodesFragment extends StylishFragment implements 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 NodeAdapter.NodeClickCallback nodeClickCallback; @@ -49,16 +48,6 @@ public class ListNodesFragment extends StylishFragment implements // Preferences for sorting 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) { Bundle bundle=new Bundle(); if (groupId != null) { @@ -124,10 +113,6 @@ public class ListNodesFragment extends StylishFragment implements PwGroup currentGroup = 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 if (getArguments().containsKey(GROUP_ID_KEY)) { PwGroupId pwGroupId = (PwGroupId) getArguments().getSerializable(GROUP_ID_KEY); From 99a9842a1f1ccfdf658e76310f6f57f25039372c Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 14 Jul 2018 10:47:52 +0200 Subject: [PATCH 3/4] Fix null pointer on nodeButtonView --- .../com/kunzisoft/keepass/activities/GroupActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java index 7999a5542..1f67e4815 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java @@ -881,12 +881,14 @@ public class GroupActivity extends ListNodesActivity @Override protected void openGroup(PwGroup group) { super.openGroup(group); - addNodeButtonView.showButton(); + if (addNodeButtonView != null) + addNodeButtonView.showButton(); } @Override public void onBackPressed() { super.onBackPressed(); - addNodeButtonView.showButton(); + if (addNodeButtonView != null) + addNodeButtonView.showButton(); } } From 846bc7edb125f062e5eb7908175abe9b8ff73fc9 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 14 Jul 2018 11:01:34 +0200 Subject: [PATCH 4/4] Update Changelogs --- CHANGELOG | 3 +++ fastlane/metadata/android/en-US/changelogs/13.txt | 7 +++++++ fastlane/metadata/android/fr-FR/changelogs/13.txt | 7 +++++++ 3 files changed, 17 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/13.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/13.txt diff --git a/CHANGELOG b/CHANGELOG index 1655ff149..895fd483e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +KeepassDX (2.5.0.0beta11) + * Fix memory issue with parcelable (crash in beta12 version) + KeepassDX (2.5.0.0beta12) * Added the Magikeyboard to fill the forms (settings still in development) * Added move and copy for groups and entries diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt new file mode 100644 index 000000000..f7a856abe --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/13.txt @@ -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 \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/13.txt b/fastlane/metadata/android/fr-FR/changelogs/13.txt new file mode 100644 index 000000000..49a0ddecd --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/13.txt @@ -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 \ No newline at end of file