Fix font and upgrade version

2.5.0.0bet16

.gitignore

@@ -71,6 +71,7 @@ app/app.iml
 # Art
 art/screen*.png
 art/logo_512.png
+art/store_screens/
 
 # Dir linux
 .directory

CHANGELOG

@@ -1,3 +1,43 @@
+KeepassDX (2.5.0.0beta16)
+ * Fix font and search
+
+KeepassDX (2.5.0.0beta16)
+ * New search in a single fragment
+ * Search suggestions
+ * Added the display of usernames
+ * Added translations
+ * Fix read-only mode
+ * Fix parcelable / toolbar / back
+
+KeepassDX (2.5.0.0beta15)
+ * Read only mode
+ * Best group recovery for the navigation fragment
+ * Fix copies in notifications
+ * Fix orientation
+ * Added translations
+
+KeepassDX (2.5.0.0beta14)
+ * Optimize all the memory with parcelables / fix search
+
+KeepassDX (2.5.0.0beta13)
+ * 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
+ * New navigation in a single screen / new animations between activities
+ * New icons for the material pack / vectorization
+ * New adaptive launcher icon
+ * Icons depends now of setting of list items
+ * Added a setting to disable the open button when no password is identified
+ * Added a setting to disable the education screens
+ * Added a setting to disable the copy of protected custom fields
+ * Fix the fingerprint recognition (WARNING : The keystore is reinit, you must delete the old keys)
+ * Fix small bugs
+
+KeepassDX (2.5.0.0beta11)
+ * Fix crash in beta10 version
+
 KeepassDX (2.5.0.0beta10)
  * Dynamically change Algorithm and Key Derivation Function in settings
  * Upgrade translations

FAQ.md

@@ -33,6 +33,11 @@ KeePass DX was created to meet the security and usability needs of a KeePass app
 **Yes** you can, but you **must first save the .kdb or .kdbx file from your database to an external storage** *(like a hardrive or a cloud)*.
 We recommend you save your data after each modification so incase you loose your android device you could retrieve the data and import it into the new KeePass DX installed on the new android device. 
 
+## Why are updates not available at the same time on all stores?
+
+- **PlayStore** only needs an APK generated and manually signed to be available on the store, it usually takes **20 minutes** to be available because it is deployed with fastlane. But the management of the APK and its data by the google servers is obscure.
+- **F-Droid**, to **ensure that the code is open source**, checks the sources directly on git repository (by checking the presence of new tags) and builds itself the APK that the server signs during the compilation of code and dependencies. Updating the project will take **1-10 days** for F-Droid to analyze all available repositories, build sources and deploy the generated APK. So F-Droid is slower for deployment but it is run by **volunteers** and guaranteed a **clean APK**. :)
+
 ## Why not an online version?
 
 The offline and online client concepts only exists with Keepass2Android because the file access network tools are directly integrated into the code of the main application. Which is a very dubious choice knowing that **it is not normally the purpose of a password management application to take care of external file synchronization on clouds** (which can be under closed licensed and recover your data base), it is rather the purpose of the [file management application](https://developer.android.com/guide/topics/providers/document-provider).
@@ -41,7 +46,7 @@ The offline and online client concepts only exists with Keepass2Android because
 
 **Yes**, we have integrated a secure openning option of fingerprint for android devices that support this feature, so no one can access the application without scanning his/her fingerprint or fill a master key.
 
-## Can I open my database without my master key (master password and/or key file)?
+## Can I open my database without my master key (master password and/or key file)?
 
 **No**, you can not open a database file without the master password (and / or) the associated key file. Be sure to remember your master password and save the key file in a safe place.
 

ReadMe.md

@@ -13,6 +13,7 @@
  * **Fingerprint** for fast unlocking
  * Material design with **themes**
  * **AutoFill** and Integration
+ * Field filling **keyboard**
  * Precise management of **settings**
 
 Keepass DX is **open source** and **ad-free**. 
@@ -27,14 +28,14 @@ KeePass DX is a **free open source password manager for Android**, which helps y
 
 Yes, KeePass DX is under **free license (OSI certified)** and **without advertising**. You can have a look at its full source and check whether the encryption algorithms are implemented correctly.
 
-*Note : If you access the application from a store, visual features may not be available to incentivize the contribution to the work of open source projects. These optional visuals are accessible after a donation (and a small congratulation message :) or the purchase of an extended version, but do not worry, the main features remain completely free.*
+*Note : If you access the application from a store, visual features may not be available to incentivize the contribution to the work of open source projects. These optional visuals are accessible after a donation (and a small congratulation message :) or the purchase of an extended version, but do not worry, the main features remain completely free. If you contribute to the project and you do not have access to the themes, do not hesitate to contact me at [contact@kunzisoft.com](contact@kunzisoft.com), I will give you the procedure.*
 
 ## Contributions
 
 You can contribute in different ways to help us on our work.
 
-* Add features by a **pull request**.
-* Help to **translate** into your language
+* Add features by a **[pull request](https://help.github.com/articles/about-pull-requests/)**.
+* Help to **[translate](https://hosted.weblate.org/projects/keepass-dx/strings/)** into your language (By using [Weblate](https://hosted.weblate.org/projects/keepass-dx/) or with a manual [pull request](https://help.github.com/articles/about-pull-requests/))
 * **[Donate](https://www.kunzisoft.com/donation)**  人◕ ‿‿ ◕人Y for a better service and a quick development of your features.
 * Buy the **[Pro version](https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro)** of KeePass DX
 
@@ -52,7 +53,7 @@ You can contribute in different ways to help us on our work.
 	
 ## F.A.Q.
 
-Other questions? You can read the [F.A.Q.](https://raw.githubusercontent.com/Kunzisoft/KeePassDX/master/FAQ.md) 
+Other questions? You can read the [F.A.Q.](https://github.com/Kunzisoft/KeePassDX/blob/master/FAQ.md) 
 	
 ## Other devices
 

app/build.gradle

@@ -8,17 +8,13 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode = 10
-        versionName = "2.5.0.0beta10"
+        versionCode = 17
+        versionName = "2.5.0.0beta17"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
         testInstrumentationRunner = "android.test.InstrumentationTestRunner"
 
-        ndk {
-            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
-        }
-
         buildConfigField "String[]", "ICON_PACKS", "{\"classic\",\"material\"}"
     }
 
@@ -98,7 +94,7 @@ dependencies {
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'org.sufficientlysecure:html-textview:3.5'
     implementation 'com.nononsenseapps:filepicker:4.1.0'
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.11.0'
+    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.12.0'
     // Permissions
     implementation("com.github.hotchemi:permissionsdispatcher:$permissionDispatcherVersion") {
         // if you don't use android.app.Fragment you can exclude support for them
@@ -109,9 +105,11 @@ dependencies {
     implementation 'commons-collections:commons-collections:3.2.1'
     // Base64
     implementation 'biz.source_code:base64coder:2010-12-19'
-    implementation 'com.google.code.gson:gson:2.8.1'
+    implementation 'com.google.code.gson:gson:2.8.4'
     implementation 'com.google.guava:guava:23.0-android'
     // Icon pack, classic for all, material for libre and pro
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')
+    implementation project(path: ':magikeyboard')
+    implementation project(path: ':keepass-model')
 }

app/src/androidTest/java/com/kunzisoft/keepass/tests/PwEntryTestV4.java

@@ -45,10 +45,10 @@ public class PwEntryTestV4 extends TestCase {
 		
 		entry.setBackgroupColor("blue");
 		entry.putProtectedBinary("key1", new ProtectedBinary(false, new byte[] {0,1}));
-		entry.setCustomIcon(new PwIconCustom(UUID.randomUUID(), new byte[0]));
+		entry.setIconCustom(new PwIconCustom(UUID.randomUUID(), new byte[0]));
 		entry.setForegroundColor("red");
 		entry.addToHistory(new PwEntryV4());
-		entry.setIcon(new PwIconStandard(5));
+		entry.setIconStandard(new PwIconStandard(5));
 		entry.setOverrideURL("override");
 		entry.setParent(new PwGroupV4());
 		entry.addExtraField("key2", new ProtectedString(false, "value2"));

app/src/androidTest/java/com/kunzisoft/keepass/tests/database/DeleteEntry.java

@@ -19,8 +19,6 @@
  */
 package com.kunzisoft.keepass.tests.database;
 
-import java.util.List;
-
 import android.content.Context;
 import android.test.AndroidTestCase;
 
@@ -30,8 +28,10 @@ import com.kunzisoft.keepass.database.PwDatabaseV3;
 import com.kunzisoft.keepass.database.PwEntry;
 import com.kunzisoft.keepass.database.PwEntryV3;
 import com.kunzisoft.keepass.database.PwGroup;
-import com.kunzisoft.keepass.database.action.DeleteGroupRunnable;
-import com.kunzisoft.keepass.search.SearchDbHelper;
+import com.kunzisoft.keepass.database.action.node.DeleteGroupRunnable;
+import com.kunzisoft.keepass.database.search.SearchDbHelper;
+
+import java.util.List;
 
 public class DeleteEntry extends AndroidTestCase {
 	private static final String GROUP1_NAME = "Group1";
@@ -72,8 +72,8 @@ public class DeleteEntry extends AndroidTestCase {
 		
 		// Verify the entries were removed from the search index
 		SearchDbHelper dbHelp = new SearchDbHelper(ctx);
-		PwGroup results1 = dbHelp.search(db.getPwDatabase(), ENTRY1_NAME);
-		PwGroup results2 = dbHelp.search(db.getPwDatabase(), ENTRY2_NAME);
+		PwGroup results1 = dbHelp.search(db.getPwDatabase(), ENTRY1_NAME, 100);
+		PwGroup results2 = dbHelp.search(db.getPwDatabase(), ENTRY2_NAME, 100);
 		
 		assertEquals("Entry1 was not removed from the search results", 0, results1.numbersOfChildEntries());
 		assertEquals("Entry2 was not removed from the search results", 0, results2.numbersOfChildEntries());

app/src/androidTest/java/com/kunzisoft/keepass/tests/database/EntryV4.java

@@ -19,11 +19,11 @@
  */
 package com.kunzisoft.keepass.tests.database;
 
-import junit.framework.TestCase;
-
 import com.kunzisoft.keepass.database.PwDatabaseV4;
 import com.kunzisoft.keepass.database.PwEntryV4;
 
+import junit.framework.TestCase;
+
 public class EntryV4 extends TestCase {
 
 	public void testBackup() {
@@ -46,7 +46,7 @@ public class EntryV4 extends TestCase {
 		entry.createBackup(db);
 		
 		PwEntryV4 backup = entry.getHistory().get(0);
-		entry.endToManageFieldReferences();
+		entry.stopToManageFieldReferences();
 		assertEquals("Title2", backup.getTitle());
 		assertEquals("User2", backup.getUsername());
 	}

app/src/free/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+android:viewportWidth="108"
+android:viewportHeight="108"
+android:width="108dp"
+android:height="108dp">
+    <group
+        android:translateY="-332">
+        <group
+            android:translateY="332">
+            <path
+                android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
+                android:fillColor="@color/long_shadow"
+                android:strokeLineJoin="round"
+                android:strokeLineCap="round"
+                android:strokeMiterLimit="4" />
+        </group>
+        <group
+            android:scaleX="0.3939503"
+            android:scaleY="0.3939503"
+            android:translateX="33.66343"
+            android:translateY="233.998">
+            <path
+                android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
+                android:fillColor="#eaeaea"
+                android:strokeWidth="1"
+                android:strokeColor="#58000000" />
+        </group>
+        <group
+            android:scaleX="0.3939503"
+            android:scaleY="0.3939503"
+            android:translateX="33.66343"
+            android:translateY="233.998">
+            <path
+                android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
+                android:fillColor="#81c784" />
+        </group>
+        <group
+            android:scaleX="0.3939503"
+            android:scaleY="0.3939503"
+            android:translateX="33.66343"
+            android:translateY="233.998">
+            <path
+                android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
+                android:fillColor="#eaeaea"
+                android:strokeWidth="1"
+                android:strokeColor="#58000000" />
+        </group>
+    </group>
+</vector>

app/src/free/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/green" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

app/src/free/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/green" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

app/src/libre/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+android:viewportWidth="108"
+android:viewportHeight="108"
+android:width="108dp"
+android:height="108dp">
+    <group
+        android:translateY="-332">
+        <group
+            android:translateY="332">
+            <path
+                android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
+                android:fillColor="@color/long_shadow"
+                android:strokeLineJoin="round"
+                android:strokeLineCap="round"
+                android:strokeMiterLimit="4" />
+        </group>
+        <group
+            android:scaleX="0.3939503"
+            android:scaleY="0.3939503"
+            android:translateX="33.66343"
+            android:translateY="233.998">
+            <path
+                android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
+                android:fillColor="#eaeaea"
+                android:strokeWidth="1"
+                android:strokeColor="#58000000"/>
+        </group>
+        <group
+            android:scaleX="0.3939503"
+            android:scaleY="0.3939503"
+            android:translateX="33.66343"
+            android:translateY="233.998">
+            <path
+                android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
+                android:fillColor="#64b5f6" />
+        </group>
+        <group
+            android:scaleX="0.3939503"
+            android:scaleY="0.3939503"
+            android:translateX="33.66343"
+            android:translateY="233.998">
+            <path
+                android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
+                android:fillColor="#eaeaea"
+                android:strokeWidth="1"
+                android:strokeColor="#58000000" />
+        </group>
+    </group>
+</vector>

app/src/libre/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/green" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

app/src/libre/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/green" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
             android:name="com.kunzisoft.keepass.fileselect.FileSelectActivity"
             android:theme="@style/KeepassDXStyle.SplashScreen"
             android:label="@string/app_name"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
@@ -104,11 +104,19 @@
         <activity
             android:name="com.kunzisoft.keepass.activities.GroupActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:launchMode="singleTop">
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value="com.kunzisoft.keepass.search.SearchResults"
                 android:exported="false"/>
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
         </activity>
         <activity
             android:name="com.kunzisoft.keepass.activities.EntryActivity"
@@ -118,27 +126,18 @@
             android:name="com.kunzisoft.keepass.activities.EntryEditActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name="com.kunzisoft.keepass.search.SearchResultsActivity"
-            android:launchMode="standard">
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-                <category android:name="android.intent.category.DEFAULT" />
-             </intent-filter>
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-        </activity>
         <activity android:name="com.kunzisoft.keepass.settings.SettingsActivity" />
         <activity android:name="com.kunzisoft.keepass.autofill.AutoFillAuthActivity"
             android:configChanges="orientation|keyboardHidden" />
+        <activity android:name="com.kunzisoft.keepass.selection.EntrySelectionAuthActivity"
+            android:configChanges="orientation|keyboardHidden" />
         <activity android:name="com.kunzisoft.keepass.settings.SettingsAutofillActivity" />
 
-        <service android:name="com.kunzisoft.keepass.timeout.TimeoutService" />
         <service
             android:name="com.kunzisoft.keepass.notifications.NotificationCopyingService"
             android:enabled="true"
             android:exported="false" />
+        <!-- Receiver for Autofill -->
         <service
             android:name="com.kunzisoft.keepass.autofill.KeeAutofillService"
             android:label="@string/autofill_service_name"
@@ -146,11 +145,11 @@
             <meta-data
                 android:name="android.autofill"
                 android:resource="@xml/dataset_service" />
-
             <intent-filter>
                 <action android:name="android.service.autofill.AutofillService" />
             </intent-filter>
         </service>
+
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
     </application>
 </manifest> 

app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java

@@ -28,6 +28,7 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
@@ -46,7 +47,8 @@ import com.kunzisoft.keepass.database.ExtraFields;
 import com.kunzisoft.keepass.database.PwDatabase;
 import com.kunzisoft.keepass.database.PwEntry;
 import com.kunzisoft.keepass.database.security.ProtectedString;
-import com.kunzisoft.keepass.icons.IconPackChooser;
+import com.kunzisoft.keepass.lock.LockingActivity;
+import com.kunzisoft.keepass.lock.LockingHideActivity;
 import com.kunzisoft.keepass.notifications.NotificationCopyingService;
 import com.kunzisoft.keepass.notifications.NotificationField;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
@@ -63,6 +65,7 @@ import java.util.Date;
 import java.util.UUID;
 
 import static com.kunzisoft.keepass.settings.PreferencesUtil.isClipboardNotificationsEnable;
+import static com.kunzisoft.keepass.settings.PreferencesUtil.isFirstTimeAskAllowCopyPasswordAndProtectedFields;
 
 public class EntryActivity extends LockingHideActivity {
     private final static String TAG = EntryActivity.class.getName();
@@ -76,15 +79,17 @@ public class EntryActivity extends LockingHideActivity {
 	
 	protected PwEntry mEntry;
 	private boolean mShowPassword;
-	protected boolean readOnly = false;
 
 	private ClipboardHelper clipboardHelper;
 	private boolean firstLaunchOfActivity;
 
-    public static void launch(Activity act, PwEntry pw) {
+	private int iconColor;
+
+    public static void launch(Activity act, PwEntry pw, boolean readOnly) {
         if (LockingActivity.checkTimeIsAllowedOrFinish(act)) {
             Intent intent = new Intent(act, EntryActivity.class);
             intent.putExtra(KEY_ENTRY, Types.UUIDtoBytes(pw.getUUID()));
+            ReadOnlyHelper.putReadOnlyInIntent(intent, readOnly);
             act.startActivityForResult(intent, EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE);
         }
     }
@@ -108,7 +113,7 @@ public class EntryActivity extends LockingHideActivity {
 			finish();
 			return;
 		}
-		readOnly = db.isReadOnly();
+		readOnly = db.isReadOnly() || readOnly;
 
         mShowPassword = !PreferencesUtil.isPasswordMask(this);
 
@@ -121,6 +126,11 @@ public class EntryActivity extends LockingHideActivity {
 			finish();
 			return;
 		}
+
+        // Retrieve the textColor to tint the icon
+        int[] attrs = {R.attr.textColorInverse};
+        TypedArray ta = getTheme().obtainStyledAttributes(attrs);
+        iconColor = ta.getColor(0, Color.WHITE);
 		
 		// Refresh Menu contents in case onCreateMenuOptions was called before mEntry was set
 		invalidateOptionsMenu();
@@ -150,12 +160,28 @@ public class EntryActivity extends LockingHideActivity {
         // Start to manage field reference to copy a value from ref
         mEntry.startToManageFieldReferences(App.getDB().getPwDatabase());
 
+        boolean containsUsernameToCopy =
+                mEntry.getUsername().length() > 0;
+        boolean containsPasswordToCopy =
+                (mEntry.getPassword().length() > 0
+                        && PreferencesUtil.allowCopyPasswordAndProtectedFields(this));
+        boolean containsExtraFieldToCopy =
+                (mEntry.allowExtraFields()
+                        && ((mEntry.containsCustomFields()
+                                && mEntry.containsCustomFieldsNotProtected())
+                            || (mEntry.containsCustomFields()
+                                && mEntry.containsCustomFieldsProtected()
+                                && PreferencesUtil.allowCopyPasswordAndProtectedFields(this))
+                        )
+                );
+
         // If notifications enabled in settings
         // Don't if application timeout
         if (firstLaunchOfActivity && !App.isShutdown() && isClipboardNotificationsEnable(getApplicationContext())) {
-            if (mEntry.getUsername().length() > 0
-                    || (mEntry.getPassword().length() > 0 && PreferencesUtil.allowCopyPassword(this))
-                    || mEntry.containsCustomFields()) {
+            if (containsUsernameToCopy
+                    || containsPasswordToCopy
+                    || containsExtraFieldToCopy
+                    ) {
                 // username already copied, waiting for user's action before copy password.
                 Intent intent = new Intent(this, NotificationCopyingService.class);
                 intent.setAction(NotificationCopyingService.ACTION_NEW_NOTIFICATION);
@@ -164,35 +190,37 @@ public class EntryActivity extends LockingHideActivity {
                 // Construct notification fields
                 ArrayList<NotificationField> notificationFields = new ArrayList<>();
                 // Add username if exists to notifications
-                if (mEntry.getUsername().length() > 0)
+                if (containsUsernameToCopy)
                     notificationFields.add(
                             new NotificationField(
                                     NotificationField.NotificationFieldId.USERNAME,
                                     mEntry.getUsername(),
                                     getResources()));
                 // Add password to notifications
-                if (PreferencesUtil.allowCopyPassword(this)) {
-                    if (mEntry.getPassword().length() > 0)
-                        notificationFields.add(
-                                new NotificationField(
-                                        NotificationField.NotificationFieldId.PASSWORD,
-                                        mEntry.getPassword(),
-                                        getResources()));
+                if (containsPasswordToCopy) {
+                    notificationFields.add(
+                            new NotificationField(
+                                    NotificationField.NotificationFieldId.PASSWORD,
+                                    mEntry.getPassword(),
+                                    getResources()));
                 }
                 // Add extra fields
-                if (mEntry.allowExtraFields()) {
+                if (containsExtraFieldToCopy) {
                     try {
                         mEntry.getFields().doActionToAllCustomProtectedField(new ExtraFields.ActionProtected() {
                             private int anonymousFieldNumber = 0;
                             @Override
                             public void doAction(String key, ProtectedString value) {
-                                notificationFields.add(
-                                        new NotificationField(
-                                                NotificationField.NotificationFieldId.getAnonymousFieldId()[anonymousFieldNumber],
-                                                value.toString(),
-                                                key,
-                                                getResources()));
-                                anonymousFieldNumber++;
+                                //If value is not protected or allowed
+                                if (!value.isProtected() || PreferencesUtil.allowCopyPasswordAndProtectedFields(EntryActivity.this)) {
+                                    notificationFields.add(
+                                            new NotificationField(
+                                                    NotificationField.NotificationFieldId.getAnonymousFieldId()[anonymousFieldNumber],
+                                                    value.toString(),
+                                                    key,
+                                                    getResources()));
+                                    anonymousFieldNumber++;
+                                }
                             }
                         });
                     } catch (ArrayIndexOutOfBoundsException e) {
@@ -205,7 +233,7 @@ public class EntryActivity extends LockingHideActivity {
 
                 startService(intent);
             }
-            mEntry.endToManageFieldReferences();
+            mEntry.stopToManageFieldReferences();
         }
         firstLaunchOfActivity = false;
     }
@@ -215,68 +243,70 @@ public class EntryActivity extends LockingHideActivity {
      * Displays the explanation for copying a field and editing an entry
      */
     private void checkAndPerformedEducation(Menu menu) {
+        if (PreferencesUtil.isEducationScreensEnabled(this)) {
 
-        if (entryContentsView != null && entryContentsView.isUserNamePresent()
-                && !PreferencesUtil.isEducationCopyUsernamePerformed(this)) {
-            TapTargetView.showFor(this,
-                    TapTarget.forView(findViewById(R.id.entry_user_name_action_image),
-                            getString(R.string.education_field_copy_title),
-                            getString(R.string.education_field_copy_summary))
-                            .textColorInt(Color.WHITE)
-                            .tintTarget(false)
-                            .cancelable(true),
-                    new TapTargetView.Listener() {
-                        @Override
-                        public void onTargetClick(TapTargetView view) {
-                            super.onTargetClick(view);
-                            clipboardHelper.timeoutCopyToClipboard(mEntry.getUsername(),
-                                    getString(R.string.copy_field, getString(R.string.entry_user_name)));
-                        }
-
-                        @Override
-                        public void onOuterCircleClick(TapTargetView view) {
-                            super.onOuterCircleClick(view);
-                            view.dismiss(false);
-                            // Launch autofill settings
-                            startActivity(new Intent(EntryActivity.this, SettingsAutofillActivity.class));
-                        }
-                    });
-            PreferencesUtil.saveEducationPreference(this,
-                    R.string.education_copy_username_key);
-
-        } else if (!PreferencesUtil.isEducationEntryEditPerformed(this)) {
-
-            try {
+            if (entryContentsView != null && entryContentsView.isUserNamePresent()
+                    && !PreferencesUtil.isEducationCopyUsernamePerformed(this)) {
                 TapTargetView.showFor(this,
-                        TapTarget.forToolbarMenuItem(toolbar, R.id.menu_edit,
-                                getString(R.string.education_entry_edit_title),
-                                getString(R.string.education_entry_edit_summary))
+                        TapTarget.forView(findViewById(R.id.entry_user_name_action_image),
+                                getString(R.string.education_field_copy_title),
+                                getString(R.string.education_field_copy_summary))
                                 .textColorInt(Color.WHITE)
-                                .tintTarget(true)
+                                .tintTarget(false)
                                 .cancelable(true),
                         new TapTargetView.Listener() {
                             @Override
                             public void onTargetClick(TapTargetView view) {
                                 super.onTargetClick(view);
-                                MenuItem editItem = menu.findItem(R.id.menu_edit);
-                                onOptionsItemSelected(editItem);
+                                clipboardHelper.timeoutCopyToClipboard(mEntry.getUsername(),
+                                        getString(R.string.copy_field, getString(R.string.entry_user_name)));
                             }
 
                             @Override
                             public void onOuterCircleClick(TapTargetView view) {
                                 super.onOuterCircleClick(view);
                                 view.dismiss(false);
-                                // Open Keepass doc to create field references
-                                Intent browserIntent = new Intent(Intent.ACTION_VIEW,
-                                        Uri.parse(getString(R.string.field_references_url)));
-                                startActivity(browserIntent);
+                                // Launch autofill settings
+                                startActivity(new Intent(EntryActivity.this, SettingsAutofillActivity.class));
                             }
                         });
                 PreferencesUtil.saveEducationPreference(this,
-                        R.string.education_entry_edit_key);
-            } catch (Exception e) {
-                // If icon not visible
-                Log.w(TAG, "Can't performed education for entry's edition");
+                        R.string.education_copy_username_key);
+
+            } else if (!PreferencesUtil.isEducationEntryEditPerformed(this)) {
+
+                try {
+                    TapTargetView.showFor(this,
+                            TapTarget.forToolbarMenuItem(toolbar, R.id.menu_edit,
+                                    getString(R.string.education_entry_edit_title),
+                                    getString(R.string.education_entry_edit_summary))
+                                    .textColorInt(Color.WHITE)
+                                    .tintTarget(true)
+                                    .cancelable(true),
+                            new TapTargetView.Listener() {
+                                @Override
+                                public void onTargetClick(TapTargetView view) {
+                                    super.onTargetClick(view);
+                                    MenuItem editItem = menu.findItem(R.id.menu_edit);
+                                    onOptionsItemSelected(editItem);
+                                }
+
+                                @Override
+                                public void onOuterCircleClick(TapTargetView view) {
+                                    super.onOuterCircleClick(view);
+                                    view.dismiss(false);
+                                    // Open Keepass doc to create field references
+                                    Intent browserIntent = new Intent(Intent.ACTION_VIEW,
+                                            Uri.parse(getString(R.string.field_references_url)));
+                                    startActivity(browserIntent);
+                                }
+                            });
+                    PreferencesUtil.saveEducationPreference(this,
+                            R.string.education_entry_edit_key);
+                } catch (Exception e) {
+                    // If icon not visible
+                    Log.w(TAG, "Can't performed education for entry's edition");
+                }
             }
         }
     }
@@ -288,18 +318,10 @@ public class EntryActivity extends LockingHideActivity {
 		mEntry.startToManageFieldReferences(pm);
 
         // Assign title icon
-        if (IconPackChooser.getSelectedIconPack(this).tintable()) {
-            // Retrieve the textColor to tint the icon
-            int[] attrs = {R.attr.textColorInverse};
-            TypedArray ta = getTheme().obtainStyledAttributes(attrs);
-            int iconColor = ta.getColor(0, Color.WHITE);
-            App.getDB().getDrawFactory().assignDatabaseIconTo(this, titleIconView,  mEntry.getIcon(), true, iconColor);
-        } else {
-            App.getDB().getDrawFactory().assignDatabaseIconTo(this, titleIconView,  mEntry.getIcon());
-        }
+        db.getDrawFactory().assignDatabaseIconTo(this, titleIconView, mEntry.getIcon(), iconColor);
 
 		// Assign title text
-        titleView.setText(mEntry.getTitle());
+        titleView.setText(mEntry.getVisualTitle());
 
         // Assign basic fields
         entryContentsView.assignUserName(mEntry.getUsername());
@@ -308,12 +330,39 @@ public class EntryActivity extends LockingHideActivity {
                 getString(R.string.copy_field, getString(R.string.entry_user_name)))
         );
 
-		entryContentsView.assignPassword(mEntry.getPassword());
-		if (PreferencesUtil.allowCopyPassword(this)) {
+        boolean allowCopyPassword = PreferencesUtil.allowCopyPasswordAndProtectedFields(this);
+		entryContentsView.assignPassword(mEntry.getPassword(), allowCopyPassword);
+		if (allowCopyPassword) {
             entryContentsView.assignPasswordCopyListener(view ->
                     clipboardHelper.timeoutCopyToClipboard(mEntry.getPassword(),
                             getString(R.string.copy_field, getString(R.string.entry_password)))
             );
+        } else {
+		    // If dialog not already shown
+            if (isFirstTimeAskAllowCopyPasswordAndProtectedFields(this)) {
+                entryContentsView.assignPasswordCopyListener(v -> {
+                    String message = getString(R.string.allow_copy_password_warning) +
+                            "\n\n" +
+                            getString(R.string.clipboard_warning);
+                    AlertDialog warningDialog = new AlertDialog.Builder(EntryActivity.this)
+                            .setMessage(message).create();
+                    warningDialog.setButton(AlertDialog.BUTTON1, getText(android.R.string.ok),
+                            (dialog, which) -> {
+                                PreferencesUtil.setAllowCopyPasswordAndProtectedFields(EntryActivity.this, true);
+                                dialog.dismiss();
+                                fillData();
+                            });
+                    warningDialog.setButton(AlertDialog.BUTTON2, getText(android.R.string.cancel),
+                            (dialog, which) -> {
+                                PreferencesUtil.setAllowCopyPasswordAndProtectedFields(EntryActivity.this, false);
+                                dialog.dismiss();
+                                fillData();
+                            });
+                    warningDialog.show();
+                });
+            } else {
+                entryContentsView.assignPasswordCopyListener(null);
+            }
         }
 
         entryContentsView.assignURL(mEntry.getUrl());
@@ -325,14 +374,15 @@ public class EntryActivity extends LockingHideActivity {
 		if (mEntry.allowExtraFields()) {
 			entryContentsView.clearExtraFields();
 
-			mEntry.getFields().doActionToAllCustomProtectedField((label, value) ->
-
-                    entryContentsView.addExtraField(label, value, view ->
+			mEntry.getFields().doActionToAllCustomProtectedField((label, value) -> {
+			        boolean showAction = (!value.isProtected() || PreferencesUtil.allowCopyPasswordAndProtectedFields(EntryActivity.this));
+                    entryContentsView.addExtraField(label, value, showAction, view ->
                         clipboardHelper.timeoutCopyToClipboard(
                                 value.toString(),
                                 getString(R.string.copy_field, label)
                         )
-            ));
+                    );
+            });
 		}
 
         // Assign dates
@@ -346,7 +396,7 @@ public class EntryActivity extends LockingHideActivity {
             entryContentsView.assignExpiresDate(getString(R.string.never));
 		}
 
-        mEntry.endToManageFieldReferences();
+        mEntry.stopToManageFieldReferences();
 	}
 
 	@Override

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java

@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
@@ -49,14 +48,16 @@ import com.kunzisoft.keepass.database.PwEntry;
 import com.kunzisoft.keepass.database.PwGroup;
 import com.kunzisoft.keepass.database.PwGroupId;
 import com.kunzisoft.keepass.database.PwIconStandard;
-import com.kunzisoft.keepass.database.action.AddEntryRunnable;
-import com.kunzisoft.keepass.database.action.OnFinishRunnable;
+import com.kunzisoft.keepass.database.PwNode;
 import com.kunzisoft.keepass.database.action.RunnableOnFinish;
-import com.kunzisoft.keepass.database.action.UpdateEntryRunnable;
+import com.kunzisoft.keepass.database.action.node.AddEntryRunnable;
+import com.kunzisoft.keepass.database.action.node.AfterActionNodeOnFinish;
+import com.kunzisoft.keepass.database.action.node.UpdateEntryRunnable;
 import com.kunzisoft.keepass.database.security.ProtectedString;
 import com.kunzisoft.keepass.dialogs.GeneratePasswordDialogFragment;
 import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment;
-import com.kunzisoft.keepass.icons.IconPackChooser;
+import com.kunzisoft.keepass.lock.LockingActivity;
+import com.kunzisoft.keepass.lock.LockingHideActivity;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
 import com.kunzisoft.keepass.tasks.SaveDatabaseProgressTaskDialogFragment;
 import com.kunzisoft.keepass.tasks.UpdateProgressTaskStatus;
@@ -67,7 +68,9 @@ import com.kunzisoft.keepass.view.EntryEditCustomField;
 
 import java.util.UUID;
 
-import static com.kunzisoft.keepass.dialogs.IconPickerDialogFragment.UNDEFINED_ICON_ID;
+import javax.annotation.Nullable;
+
+import static com.kunzisoft.keepass.dialogs.IconPickerDialogFragment.KEY_ICON_STANDARD;
 
 public class EntryEditActivity extends LockingHideActivity
 		implements IconPickerDialogFragment.IconPickerListener,
@@ -85,10 +88,12 @@ public class EntryEditActivity extends LockingHideActivity
 	public static final int ADD_OR_UPDATE_ENTRY_REQUEST_CODE = 7129;
 	public static final String ADD_OR_UPDATE_ENTRY_KEY = "ADD_OR_UPDATE_ENTRY_KEY";
 
+	private Database database;
+
 	protected PwEntry mEntry;
 	protected PwEntry mCallbackNewEntry;
 	protected boolean mIsNew;
-	protected int mSelectedIconID = UNDEFINED_ICON_ID;
+	protected PwIconStandard mSelectedIconStandard;
 
     // Views
     private ScrollView scrollView;
@@ -139,7 +144,6 @@ public class EntryEditActivity extends LockingHideActivity
 		setContentView(R.layout.entry_edit);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbar.setTitle(getString(R.string.app_name));
         setSupportActionBar(toolbar);
         assert getSupportActionBar() != null;
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -158,8 +162,8 @@ public class EntryEditActivity extends LockingHideActivity
         entryExtraFieldsContainer = findViewById(R.id.advanced_container);
 		
 		// Likely the app has been killed exit the activity
-		Database db = App.getDB();
-		if ( ! db.getLoaded() ) {
+        database = App.getDB();
+		if ( ! database.getLoaded() ) {
 			finish();
 			return;
 		}
@@ -172,18 +176,16 @@ public class EntryEditActivity extends LockingHideActivity
         TypedArray ta = getTheme().obtainStyledAttributes(attrs);
         iconColor = ta.getColor(0, Color.WHITE);
 
-		PwDatabase pm = db.getPwDatabase();
+        mSelectedIconStandard = database.getPwDatabase().getIconFactory().getUnknownIcon();
+
+		PwDatabase pm = database.getPwDatabase();
 		if ( uuidBytes == null ) {
-            PwGroupId parentId = (PwGroupId) intent.getSerializableExtra(KEY_PARENT);
+            PwGroupId parentId = intent.getParcelableExtra(KEY_PARENT);
 			PwGroup parent = pm.getGroupByGroupId(parentId);
-			mEntry = db.createEntry(parent);
+			mEntry = database.createEntry(parent);
 			mIsNew = true;
 			// Add the default icon
-            if (IconPackChooser.getSelectedIconPack(this).tintable()) {
-                App.getDB().getDrawFactory().assignDefaultDatabaseIconTo(this, entryIconView, true, iconColor);
-            } else {
-                App.getDB().getDrawFactory().assignDefaultDatabaseIconTo(this, entryIconView);
-            }
+            database.getDrawFactory().assignDefaultDatabaseIconTo(this, entryIconView, iconColor);
 		} else {
 			UUID uuid = Types.bytestoUUID(uuidBytes);
 			mEntry = pm.getEntryByUUIDId(uuid);
@@ -191,8 +193,12 @@ public class EntryEditActivity extends LockingHideActivity
 			fillData();
 		}
 
+        // Assign title
+        setTitle((mIsNew) ? getString(R.string.add_entry) : getString(R.string.edit_entry));
+
 		// Retrieve the icon after an orientation change
-		if (savedInstanceState != null && savedInstanceState.containsKey(IconPickerDialogFragment.KEY_ICON_ID)) {
+		if (savedInstanceState != null
+                && savedInstanceState.containsKey(KEY_ICON_STANDARD)) {
             iconPicked(savedInstanceState);
         }
 
@@ -251,13 +257,13 @@ public class EntryEditActivity extends LockingHideActivity
         mCallbackNewEntry = populateNewEntry();
 
         // Open a progress dialog and save entry
-        OnFinishRunnable onFinish = new AfterSave();
+        AfterActionNodeOnFinish onFinish = new AfterSave();
         EntryEditActivity act = EntryEditActivity.this;
         RunnableOnFinish task;
         if ( mIsNew ) {
-            task = new AddEntryRunnable(act, App.getDB(), mCallbackNewEntry, onFinish);
+            task = new AddEntryRunnable(act, database, mCallbackNewEntry, onFinish);
         } else {
-            task = new UpdateEntryRunnable(act, App.getDB(), mEntry, mCallbackNewEntry, onFinish);
+            task = new UpdateEntryRunnable(act, database, mEntry, mCallbackNewEntry, onFinish);
         }
         task.setUpdateProgressTaskStatus(
                 new UpdateProgressTaskStatus(this,
@@ -272,59 +278,58 @@ public class EntryEditActivity extends LockingHideActivity
      * Displays the explanation for the icon selection, the password generator and for a new field
      */
     private void checkAndPerformedEducation() {
+        if (PreferencesUtil.isEducationScreensEnabled(this)) {
+            // TODO Show icon
 
-	    // TODO Show icon
+            if (!PreferencesUtil.isEducationPasswordGeneratorPerformed(this)) {
+                TapTargetView.showFor(this,
+                        TapTarget.forView(generatePasswordView,
+                                getString(R.string.education_generate_password_title),
+                                getString(R.string.education_generate_password_summary))
+                                .textColorInt(Color.WHITE)
+                                .tintTarget(false)
+                                .cancelable(true),
+                        new TapTargetView.Listener() {
+                            @Override
+                            public void onTargetClick(TapTargetView view) {
+                                super.onTargetClick(view);
+                                openPasswordGenerator();
+                            }
 
-        if (!PreferencesUtil.isEducationPasswordGeneratorPerformed(this)) {
-            TapTargetView.showFor(this,
-                    TapTarget.forView(generatePasswordView,
-                            getString(R.string.education_generate_password_title),
-                            getString(R.string.education_generate_password_summary))
-                            .textColorInt(Color.WHITE)
-                            .tintTarget(false)
-                            .cancelable(true),
-                    new TapTargetView.Listener() {
-                        @Override
-                        public void onTargetClick(TapTargetView view) {
-                            super.onTargetClick(view);
-                            openPasswordGenerator();
-                        }
-
-                        @Override
-                        public void onOuterCircleClick(TapTargetView view) {
-                            super.onOuterCircleClick(view);
-                            view.dismiss(false);
-                        }
-                    });
-            PreferencesUtil.saveEducationPreference(this,
-                    R.string.education_password_generator_key);
-        }
-
-        else if (mEntry.allowExtraFields()
+                            @Override
+                            public void onOuterCircleClick(TapTargetView view) {
+                                super.onOuterCircleClick(view);
+                                view.dismiss(false);
+                            }
+                        });
+                PreferencesUtil.saveEducationPreference(this,
+                        R.string.education_password_generator_key);
+            } else if (mEntry.allowExtraFields()
                     && !mEntry.containsCustomFields()
                     && !PreferencesUtil.isEducationEntryNewFieldPerformed(this)) {
-            TapTargetView.showFor(this,
-                    TapTarget.forView(addNewFieldView,
-                            getString(R.string.education_entry_new_field_title),
-                            getString(R.string.education_entry_new_field_summary))
-                            .textColorInt(Color.WHITE)
-                            .tintTarget(false)
-                            .cancelable(true),
-                    new TapTargetView.Listener() {
-                        @Override
-                        public void onTargetClick(TapTargetView view) {
-                            super.onTargetClick(view);
-                            addNewCustomField();
-                        }
+                TapTargetView.showFor(this,
+                        TapTarget.forView(addNewFieldView,
+                                getString(R.string.education_entry_new_field_title),
+                                getString(R.string.education_entry_new_field_summary))
+                                .textColorInt(Color.WHITE)
+                                .tintTarget(false)
+                                .cancelable(true),
+                        new TapTargetView.Listener() {
+                            @Override
+                            public void onTargetClick(TapTargetView view) {
+                                super.onTargetClick(view);
+                                addNewCustomField();
+                            }
 
-                        @Override
-                        public void onOuterCircleClick(TapTargetView view) {
-                            super.onOuterCircleClick(view);
-                            view.dismiss(false);
-                        }
-                    });
-            PreferencesUtil.saveEducationPreference(this,
-                    R.string.education_entry_new_field_key);
+                            @Override
+                            public void onOuterCircleClick(TapTargetView view) {
+                                super.onOuterCircleClick(view);
+                                view.dismiss(false);
+                            }
+                        });
+                PreferencesUtil.saveEducationPreference(this,
+                        R.string.education_entry_new_field_key);
+            }
         }
     }
 
@@ -406,7 +411,7 @@ public class EntryEditActivity extends LockingHideActivity
         newEntry.setLastModificationTime(new PwDate());
 
         newEntry.setTitle(entryTitleView.getText().toString());
-        newEntry.setIcon(retrieveIcon());
+        newEntry.setIconStandard(retrieveIcon());
 
         newEntry.setUrl(entryUrlView.getText().toString());
         newEntry.setUsername(entryUserNameView.getText().toString());
@@ -426,21 +431,21 @@ public class EntryEditActivity extends LockingHideActivity
             }
         }
 
-        newEntry.endToManageFieldReferences();
+        newEntry.stopToManageFieldReferences();
 
         return newEntry;
 	}
 
     /**
      * Retrieve the icon by the selection, or the first icon in the list if the entry is new or the last one
-     * @return
      */
 	private PwIconStandard retrieveIcon() {
-        if(mSelectedIconID != UNDEFINED_ICON_ID)
-            return App.getDB().getPwDatabase().getIconFactory().getIcon(mSelectedIconID);
+
+        if (!mSelectedIconStandard.isUnknown())
+            return mSelectedIconStandard;
         else {
             if (mIsNew) {
-                return App.getDB().getPwDatabase().getIconFactory().getFirstIcon();
+                return database.getPwDatabase().getIconFactory().getKeyIcon();
             }
             else {
                 // Keep previous icon, if no new one was selected
@@ -472,16 +477,21 @@ public class EntryEditActivity extends LockingHideActivity
 		return super.onOptionsItemSelected(item);
 	}
 
+	private void assignIconView() {
+        database.getDrawFactory()
+                .assignDatabaseIconTo(
+                        this,
+                        entryIconView,
+                        mEntry.getIcon(),
+                        iconColor);
+    }
+
 	protected void fillData() {
 
-        if (IconPackChooser.getSelectedIconPack(this).tintable()) {
-            App.getDB().getDrawFactory().assignDatabaseIconTo(this, entryIconView, mEntry.getIcon(), true, iconColor);
-        } else {
-            App.getDB().getDrawFactory().assignDatabaseIconTo(this, entryIconView, mEntry.getIcon());
-        }
+        assignIconView();
 
 		// Don't start the field reference manager, we want to see the raw ref
-        mEntry.endToManageFieldReferences();
+        mEntry.stopToManageFieldReferences();
 
         entryTitleView.setText(mEntry.getTitle());
         entryUserNameView.setText(mEntry.getUsername());
@@ -512,14 +522,15 @@ public class EntryEditActivity extends LockingHideActivity
 
     @Override
     public void iconPicked(Bundle bundle) {
-        mSelectedIconID = bundle.getInt(IconPickerDialogFragment.KEY_ICON_ID);
-        entryIconView.setImageResource(IconPackChooser.getSelectedIconPack(this).iconToResId(mSelectedIconID));
+        mSelectedIconStandard = bundle.getParcelable(KEY_ICON_STANDARD);
+        mEntry.setIconStandard(mSelectedIconStandard);
+        assignIconView();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        if (mSelectedIconID != UNDEFINED_ICON_ID) {
-            outState.putInt(IconPickerDialogFragment.KEY_ICON_ID, mSelectedIconID);
+        if (!mSelectedIconStandard.isUnknown()) {
+            outState.putParcelable(KEY_ICON_STANDARD, mSelectedIconStandard);
             super.onSaveInstanceState(outState);
         }
     }
@@ -545,7 +556,7 @@ public class EntryEditActivity extends LockingHideActivity
             if (mCallbackNewEntry != null) {
                 Bundle bundle = new Bundle();
                 Intent intentEntry = new Intent();
-                bundle.putSerializable(ADD_OR_UPDATE_ENTRY_KEY, mCallbackNewEntry);
+                bundle.putParcelable(ADD_OR_UPDATE_ENTRY_KEY, mCallbackNewEntry);
                 intentEntry.putExtras(bundle);
                 if (mIsNew) {
                     setResult(ADD_ENTRY_RESULT_CODE, intentEntry);
@@ -560,14 +571,10 @@ public class EntryEditActivity extends LockingHideActivity
         }
 	}
 
-	private final class AfterSave extends OnFinishRunnable {
-
-		AfterSave() {
-			super(new Handler());
-		}
+	private final class AfterSave extends AfterActionNodeOnFinish {
 
 		@Override
-		public void run() {
+        public void run(@Nullable PwNode oldNode, @Nullable PwNode newNode) {
 		    runOnUiThread(() -> {
                 if ( mSuccess ) {
                     finish();
@@ -578,6 +585,6 @@ public class EntryEditActivity extends LockingHideActivity
                 SaveDatabaseProgressTaskDialogFragment.stop(EntryEditActivity.this);
             });
 		}
-	}
+    }
 
 }

app/src/main/java/com/kunzisoft/keepass/activities/IntentBuildLauncher.java

@@ -0,0 +1,7 @@
+package com.kunzisoft.keepass.activities;
+
+import android.content.Intent;
+
+public interface IntentBuildLauncher {
+    void startActivityForResult(Intent intent);
+}

app/src/main/java/com/kunzisoft/keepass/activities/ListNodesActivity.java

@@ -1,383 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.activities;
-
-import android.annotation.SuppressLint;
-import android.app.assist.AssistStructure;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.adapters.NodeAdapter;
-import com.kunzisoft.keepass.app.App;
-import com.kunzisoft.keepass.autofill.AutofillHelper;
-import com.kunzisoft.keepass.compat.EditorCompat;
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass.database.PwGroup;
-import com.kunzisoft.keepass.database.PwNode;
-import com.kunzisoft.keepass.database.SortNodeEnum;
-import com.kunzisoft.keepass.database.action.AfterActionNodeOnFinish;
-import com.kunzisoft.keepass.database.action.OnFinishRunnable;
-import com.kunzisoft.keepass.dialogs.AssignMasterKeyDialogFragment;
-import com.kunzisoft.keepass.dialogs.SortDialogFragment;
-import com.kunzisoft.keepass.password.AssignPasswordHelper;
-import com.kunzisoft.keepass.settings.PreferencesUtil;
-import com.kunzisoft.keepass.tasks.SaveDatabaseProgressTaskDialogFragment;
-import com.kunzisoft.keepass.tasks.UIToastTask;
-import com.kunzisoft.keepass.utils.MenuUtil;
-
-public abstract class ListNodesActivity extends LockingActivity
-		implements AssignMasterKeyDialogFragment.AssignPasswordDialogListener,
-        NodeAdapter.OnNodeClickCallback,
-        SortDialogFragment.SortSelectionListener {
-
-    protected PwGroup mCurrentGroup;
-	protected NodeAdapter mAdapter;
-	
-	private SharedPreferences prefs;
-
-    protected AutofillHelper autofillHelper;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-        if ( isFinishing() ) {
-            return;
-        }
-		
-		// Likely the app has been killed exit the activity 
-		if ( ! App.getDB().getLoaded() ) {
-			finish();
-			return;
-		}
-		
-		prefs = PreferenceManager.getDefaultSharedPreferences(this);
-
-		invalidateOptionsMenu();
-
-		// TODO Move in search
-		setContentView(R.layout.list_nodes);
-
-        mCurrentGroup = initCurrentGroup();
-
-        mAdapter = new NodeAdapter(this);
-        addOptionsToAdapter(mAdapter);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            autofillHelper = new AutofillHelper();
-            autofillHelper.retrieveAssistStructure(getIntent());
-        }
-	}
-
-    protected abstract PwGroup initCurrentGroup();
-
-    protected abstract RecyclerView defineNodeList();
-
-    protected void addOptionsToAdapter(NodeAdapter nodeAdapter) {
-        mAdapter.setOnNodeClickListener(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        // Add elements to the list
-        mAdapter.rebuildList(mCurrentGroup);
-        assignListToNodeAdapter(defineNodeList());
-    }
-	
-	protected void setGroupTitle() {
-		if ( mCurrentGroup != null ) {
-			String name = mCurrentGroup.getName();
-            TextView tv = findViewById(R.id.group_name);
-			if ( name != null && name.length() > 0 ) {
-				if ( tv != null ) {
-					tv.setText(name);
-				}
-			} else {
-				if ( tv != null ) {
-					tv.setText(getText(R.string.root));
-				}
-			}
-		}
-	}
-
-	protected void assignListToNodeAdapter(RecyclerView recyclerView) {
-        recyclerView.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.setAdapter(mAdapter);
-	}
-
-    @Override
-    public void onNodeClick(PwNode node) {
-
-        // Add event when we have Autofill
-        AssistStructure assistStructure = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            assistStructure = autofillHelper.getAssistStructure();
-            if (assistStructure != null) {
-                switch (node.getType()) {
-                    case GROUP:
-                        GroupActivity.launch(this, (PwGroup) node, assistStructure);
-                        break;
-                    case ENTRY:
-                        // Build response with the entry selected
-                        autofillHelper.buildResponseWhenEntrySelected(this, (PwEntry) node);
-                        finish();
-                        break;
-                }
-            }
-        }
-        if ( assistStructure == null ){
-            switch (node.getType()) {
-                case GROUP:
-                    GroupActivity.launch(this, (PwGroup) node);
-                    break;
-                case ENTRY:
-                    EntryActivity.launch(this, (PwEntry) node);
-                    break;
-            }
-        }
-    }
-
-    @Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		
-		MenuInflater inflater = getMenuInflater();
-		MenuUtil.contributionMenuInflater(inflater, menu);
-		inflater.inflate(R.menu.tree, menu);
-		inflater.inflate(R.menu.default_menu, menu);
-
-		return true;
-	}
-
-    @Override
-    public void onSortSelected(SortNodeEnum sortNodeEnum, boolean ascending, boolean groupsBefore, boolean recycleBinBottom) {
-        // Toggle setting
-        Editor editor = prefs.edit();
-        editor.putString(getString(R.string.sort_node_key), sortNodeEnum.name());
-        editor.putBoolean(getString(R.string.sort_ascending_key), ascending);
-        editor.putBoolean(getString(R.string.sort_group_before_key), groupsBefore);
-        editor.putBoolean(getString(R.string.sort_recycle_bin_bottom_key), recycleBinBottom);
-        EditorCompat.apply(editor);
-
-        // Tell the adapter to refresh it's list
-        mAdapter.notifyChangeSort(sortNodeEnum, ascending, groupsBefore);
-        mAdapter.rebuildList(mCurrentGroup);
-    }
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch ( item.getItemId() ) {
-
-            case R.id.menu_sort:
-                SortDialogFragment sortDialogFragment;
-
-                PwDatabase database = App.getDB().getPwDatabase();
-                /*
-                // TODO Recycle bin bottom
-                if (database.isRecycleBinAvailable() && database.isRecycleBinEnabled()) {
-                    sortDialogFragment =
-                            SortDialogFragment.getInstance(
-                                    PrefsUtil.getListSort(this),
-                                    PrefsUtil.getAscendingSort(this),
-                                    PrefsUtil.getGroupsBeforeSort(this),
-                                    PrefsUtil.getRecycleBinBottomSort(this));
-                } else {
-                */
-                    sortDialogFragment =
-                            SortDialogFragment.getInstance(
-                                    PreferencesUtil.getListSort(this),
-                                    PreferencesUtil.getAscendingSort(this),
-                                    PreferencesUtil.getGroupsBeforeSort(this));
-                //}
-
-                sortDialogFragment.show(getSupportFragmentManager(), "sortDialog");
-                return true;
-
-            default:
-                // Check the time lock before launching settings
-                MenuUtil.onDefaultMenuOptionsItemSelected(this, item, true);
-                return super.onOptionsItemSelected(item);
-		}
-	}
-
-    @Override
-    public void onAssignKeyDialogPositiveClick(
-    		boolean masterPasswordChecked, String masterPassword,
-			boolean keyFileChecked, Uri keyFile) {
-
-        AssignPasswordHelper assignPasswordHelper =
-                new AssignPasswordHelper(this,
-                        masterPasswordChecked, masterPassword, keyFileChecked, keyFile);
-        assignPasswordHelper.assignPasswordInDatabase(null);
-    }
-
-    @Override
-    public void onAssignKeyDialogNegativeClick(
-			boolean masterPasswordChecked, String masterPassword,
-			boolean keyFileChecked, Uri keyFile) {
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        switch (requestCode) {
-            case EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE:
-                if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE ||
-                        resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
-                    PwNode newNode = (PwNode) data.getSerializableExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY);
-                    if (newNode != null) {
-						if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
-							mAdapter.addNode(newNode);
-						if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
-							//mAdapter.updateLastNodeRegister(newNode);
-							mAdapter.rebuildList(mCurrentGroup);
-						}
-					} else {
-                        Log.e(this.getClass().getName(), "New node can be retrieve in Activity Result");
-                    }
-                }
-                break;
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data);
-        }
-    }
-
-	@SuppressLint("RestrictedApi")
-    @Override
-	public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
-		/*
-		 * ACTION_SEARCH automatically forces a new task. This occurs when you open a kdb file in
-		 * another app such as Files or GoogleDrive and then Search for an entry. Here we remove the
-		 * FLAG_ACTIVITY_NEW_TASK flag bit allowing search to open it's activity in the current task.
-		 */
-		if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-			int flags = intent.getFlags();
-			flags &= ~Intent.FLAG_ACTIVITY_NEW_TASK;
-			intent.setFlags(flags);
-		}
-
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-			super.startActivityForResult(intent, requestCode, options);
-		}
-	}
-
-    class AfterAddNode extends AfterActionNodeOnFinish {
-        AfterAddNode(Handler handler) {
-            super(handler);
-        }
-
-        public void run(PwNode oldNode, PwNode newNode) {
-            super.run();
-
-            runOnUiThread(() -> {
-                if (mSuccess) {
-                    mAdapter.addNode(newNode);
-                } else {
-                    displayMessage(ListNodesActivity.this);
-                }
-
-                SaveDatabaseProgressTaskDialogFragment.stop(ListNodesActivity.this);
-            });
-        }
-    }
-
-    class AfterUpdateNode extends AfterActionNodeOnFinish {
-        AfterUpdateNode(Handler handler) {
-            super(handler);
-        }
-
-        public void run(PwNode oldNode, PwNode newNode) {
-            super.run();
-
-            runOnUiThread(() -> {
-                if (mSuccess) {
-                    mAdapter.updateNode(oldNode, newNode);
-                } else {
-                    displayMessage(ListNodesActivity.this);
-                }
-
-                SaveDatabaseProgressTaskDialogFragment.stop(ListNodesActivity.this);
-            });
-        }
-    }
-
-    class AfterDeleteNode extends OnFinishRunnable {
-        private PwNode pwNode;
-
-        AfterDeleteNode(Handler handler, PwNode pwNode) {
-            super(handler);
-            this.pwNode = pwNode;
-        }
-
-        @Override
-        public void run() {
-            super.run();
-
-            runOnUiThread(() -> {
-                if ( mSuccess) {
-                    mAdapter.removeNode(pwNode);
-                    PwGroup parent = pwNode.getParent();
-                    Database db = App.getDB();
-                    PwDatabase database = db.getPwDatabase();
-                    if (db.isRecycleBinAvailable() &&
-                            db.isRecycleBinEnabled()) {
-                        PwGroup recycleBin = database.getRecycleBin();
-                        // Add trash if it doesn't exists
-                        if (parent.equals(recycleBin)
-                                && mCurrentGroup != null
-                                && mCurrentGroup.getParent() == null
-                                && !mCurrentGroup.equals(recycleBin)) {
-                            mAdapter.addNode(parent);
-                        }
-                    }
-                } else {
-                    mHandler.post(new UIToastTask(ListNodesActivity.this, "Unrecoverable error: " + mMessage));
-                    App.setShutdown();
-                    finish();
-                }
-
-                SaveDatabaseProgressTaskDialogFragment.stop(ListNodesActivity.this);
-            });
-        }
-    }
-}

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

@@ -0,0 +1,297 @@
+package com.kunzisoft.keepass.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.adapters.NodeAdapter;
+import com.kunzisoft.keepass.app.App;
+import com.kunzisoft.keepass.database.PwDatabase;
+import com.kunzisoft.keepass.database.PwGroup;
+import com.kunzisoft.keepass.database.PwNode;
+import com.kunzisoft.keepass.database.SortNodeEnum;
+import com.kunzisoft.keepass.dialogs.SortDialogFragment;
+import com.kunzisoft.keepass.settings.PreferencesUtil;
+import com.kunzisoft.keepass.stylish.StylishFragment;
+
+public class ListNodesFragment extends StylishFragment implements
+        SortDialogFragment.SortSelectionListener {
+
+    private static final String TAG = ListNodesFragment.class.getName();
+
+    private static final String GROUP_KEY = "GROUP_KEY";
+    private static final String IS_SEARCH = "IS_SEARCH";
+
+    private NodeAdapter.NodeClickCallback nodeClickCallback;
+    private NodeAdapter.NodeMenuListener nodeMenuListener;
+    private OnScrollListener onScrollListener;
+
+    private RecyclerView listView;
+    private PwGroup currentGroup;
+    private NodeAdapter mAdapter;
+
+    private View notFoundView;
+    private boolean isASearchResult;
+
+    // Preferences for sorting
+    private SharedPreferences prefs;
+
+    private boolean readOnly;
+
+    public static ListNodesFragment newInstance(PwGroup group, boolean readOnly, boolean isASearch) {
+        Bundle bundle = new Bundle();
+        if (group != null) {
+            bundle.putParcelable(GROUP_KEY, group);
+        }
+        bundle.putBoolean(IS_SEARCH, isASearch);
+        ReadOnlyHelper.putReadOnlyInBundle(bundle, readOnly);
+        ListNodesFragment listNodesFragment = new ListNodesFragment();
+        listNodesFragment.setArguments(bundle);
+        return listNodesFragment;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        try {
+            nodeClickCallback = (NodeAdapter.NodeClickCallback) context;
+        } catch (ClassCastException e) {
+            // The activity doesn't implement the interface, throw exception
+            throw new ClassCastException(context.toString()
+                    + " must implement " + NodeAdapter.NodeClickCallback.class.getName());
+        }
+        try {
+            nodeMenuListener = (NodeAdapter.NodeMenuListener) context;
+        } catch (ClassCastException e) {
+            nodeMenuListener = null;
+            // Context menu can be omit
+            Log.w(TAG, context.toString()
+                    + " must implement " + NodeAdapter.NodeMenuListener.class.getName());
+        }
+        try {
+            onScrollListener = (OnScrollListener) context;
+        } catch (ClassCastException e) {
+            onScrollListener = null;
+            // Context menu can be omit
+            Log.w(TAG, context.toString()
+                    + " must implement " + RecyclerView.OnScrollListener.class.getName());
+        }
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if ( getActivity() != null ) {
+            setHasOptionsMenu(true);
+
+            readOnly = ReadOnlyHelper.retrieveReadOnlyFromInstanceStateOrArguments(savedInstanceState, getArguments());
+
+            if (getArguments() != null) {
+                // Contains all the group in element
+                if (getArguments().containsKey(GROUP_KEY)) {
+                    currentGroup = getArguments().getParcelable(GROUP_KEY);
+                }
+
+                if (getArguments().containsKey(IS_SEARCH)) {
+                    isASearchResult = getArguments().getBoolean(IS_SEARCH);
+                }
+            }
+
+            mAdapter = new NodeAdapter(getContextThemed(), getActivity().getMenuInflater());
+            mAdapter.setReadOnly(readOnly);
+            mAdapter.setIsASearchResult(isASearchResult);
+            mAdapter.setOnNodeClickListener(nodeClickCallback);
+
+            if (nodeMenuListener != null) {
+                mAdapter.setActivateContextMenu(true);
+                mAdapter.setNodeMenuListener(nodeMenuListener);
+            }
+            prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        ReadOnlyHelper.onSaveInstanceState(outState, readOnly);
+        super.onSaveInstanceState(outState);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        // To apply theme
+        View rootView = inflater.cloneInContext(getContextThemed())
+                .inflate(R.layout.list_nodes_fragment, container, false);
+        listView = rootView.findViewById(R.id.nodes_list);
+        notFoundView = rootView.findViewById(R.id.not_found_container);
+
+        if (onScrollListener != null) {
+            listView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                    super.onScrolled(recyclerView, dx, dy);
+                    onScrollListener.onScrolled(dy);
+                }
+            });
+        }
+
+        return rootView;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        rebuildList();
+
+        if (isASearchResult && mAdapter.isEmpty()) {
+            // To show the " no search entry found "
+            listView.setVisibility(View.GONE);
+            notFoundView.setVisibility(View.VISIBLE);
+        } else {
+            listView.setVisibility(View.VISIBLE);
+            notFoundView.setVisibility(View.GONE);
+        }
+    }
+
+    public void rebuildList() {
+        // Add elements to the list
+        if (currentGroup != null)
+            mAdapter.rebuildList(currentGroup);
+        assignListToNodeAdapter(listView);
+    }
+
+    protected void assignListToNodeAdapter(RecyclerView recyclerView) {
+        recyclerView.setScrollBarStyle(View.SCROLLBARS_INSIDE_INSET);
+        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        recyclerView.setAdapter(mAdapter);
+    }
+
+    @Override
+    public void onSortSelected(SortNodeEnum sortNodeEnum, boolean ascending, boolean groupsBefore, boolean recycleBinBottom) {
+        // Toggle setting
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putString(getString(R.string.sort_node_key), sortNodeEnum.name());
+        editor.putBoolean(getString(R.string.sort_ascending_key), ascending);
+        editor.putBoolean(getString(R.string.sort_group_before_key), groupsBefore);
+        editor.putBoolean(getString(R.string.sort_recycle_bin_bottom_key), recycleBinBottom);
+        editor.apply();
+
+        // Tell the adapter to refresh it's list
+        mAdapter.notifyChangeSort(sortNodeEnum, ascending, groupsBefore);
+        mAdapter.rebuildList(currentGroup);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.tree, menu);
+
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch ( item.getItemId() ) {
+
+            case R.id.menu_sort:
+                SortDialogFragment sortDialogFragment;
+
+                PwDatabase database = App.getDB().getPwDatabase();
+                /*
+                // TODO Recycle bin bottom
+                if (database.isRecycleBinAvailable() && database.isRecycleBinEnabled()) {
+                    sortDialogFragment =
+                            SortDialogFragment.getInstance(
+                                    PrefsUtil.getListSort(this),
+                                    PrefsUtil.getAscendingSort(this),
+                                    PrefsUtil.getGroupsBeforeSort(this),
+                                    PrefsUtil.getRecycleBinBottomSort(this));
+                } else {
+                */
+                sortDialogFragment =
+                        SortDialogFragment.getInstance(
+                                PreferencesUtil.getListSort(getContext()),
+                                PreferencesUtil.getAscendingSort(getContext()),
+                                PreferencesUtil.getGroupsBeforeSort(getContext()));
+                //}
+
+                sortDialogFragment.show(getChildFragmentManager(), "sortDialog");
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        switch (requestCode) {
+            case EntryEditActivity.ADD_OR_UPDATE_ENTRY_REQUEST_CODE:
+                if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE ||
+                        resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
+                    PwNode newNode = data.getParcelableExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY);
+                    if (newNode != null) {
+                        if (resultCode == EntryEditActivity.ADD_ENTRY_RESULT_CODE)
+                            mAdapter.addNode(newNode);
+                        if (resultCode == EntryEditActivity.UPDATE_ENTRY_RESULT_CODE) {
+                            //mAdapter.updateLastNodeRegister(newNode);
+                            mAdapter.rebuildList(currentGroup);
+                        }
+                    } else {
+                        Log.e(this.getClass().getName(), "New node can be retrieve in Activity Result");
+                    }
+                }
+                break;
+        }
+    }
+
+    public boolean isEmpty() {
+        return mAdapter == null || mAdapter.getItemCount() <= 0;
+    }
+
+    public void addNode(PwNode newNode) {
+        mAdapter.addNode(newNode);
+    }
+
+    public void updateNode(PwNode oldNode, PwNode newNode) {
+        mAdapter.updateNode(oldNode, newNode);
+    }
+
+    public void removeNode(PwNode pwNode) {
+        mAdapter.removeNode(pwNode);
+    }
+
+    public PwGroup getMainGroup() {
+        return currentGroup;
+    }
+
+    public interface OnScrollListener {
+
+        /**
+         * Callback method to be invoked when the RecyclerView has been scrolled. This will be
+         * called after the scroll has completed.
+         *
+         * @param dy The amount of vertical scroll.
+         */
+        void onScrolled(int dy);
+    }
+}

app/src/main/java/com/kunzisoft/keepass/activities/ReadOnlyHelper.java

@@ -0,0 +1,61 @@
+package com.kunzisoft.keepass.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.kunzisoft.keepass.settings.PreferencesUtil;
+
+public class ReadOnlyHelper {
+
+    public static final String READ_ONLY_KEY = "READ_ONLY_KEY";
+
+    public static final boolean READ_ONLY_DEFAULT = false;
+
+    public static boolean retrieveReadOnlyFromInstanceStateOrPreference(Context context, Bundle savedInstanceState) {
+        boolean readOnly;
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY);
+        } else {
+            readOnly = PreferencesUtil.enableReadOnlyDatabase(context);
+        }
+        return readOnly;
+    }
+
+    public static boolean retrieveReadOnlyFromInstanceStateOrArguments(Bundle savedInstanceState, Bundle arguments) {
+        boolean readOnly = READ_ONLY_DEFAULT;
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY);
+        } else if (arguments != null
+                    && arguments.containsKey(READ_ONLY_KEY)) {
+                readOnly = arguments.getBoolean(READ_ONLY_KEY);
+        }
+        return readOnly;
+    }
+
+    public static boolean retrieveReadOnlyFromInstanceStateOrIntent(Bundle savedInstanceState, Intent intent) {
+        boolean readOnly = READ_ONLY_DEFAULT;
+        if (savedInstanceState != null
+                && savedInstanceState.containsKey(READ_ONLY_KEY)) {
+            readOnly = savedInstanceState.getBoolean(READ_ONLY_KEY);
+        } else {
+            if (intent != null)
+                readOnly = intent.getBooleanExtra(READ_ONLY_KEY, READ_ONLY_DEFAULT);
+        }
+        return readOnly;
+    }
+
+    public static void putReadOnlyInIntent(Intent intent, boolean readOnly) {
+        intent.putExtra(READ_ONLY_KEY, readOnly);
+    }
+
+    public static void putReadOnlyInBundle(Bundle bundle, boolean readOnly) {
+        bundle.putBoolean(READ_ONLY_KEY, readOnly);
+    }
+
+    public static void onSaveInstanceState(Bundle outState, boolean readOnly) {
+        outState.putBoolean(READ_ONLY_KEY, readOnly);
+    }
+}

app/src/main/java/com/kunzisoft/keepass/adapters/BasicViewHolder.java

@@ -29,6 +29,7 @@ abstract class BasicViewHolder extends RecyclerView.ViewHolder {
     View container;
     ImageView icon;
     TextView text;
+    TextView subText;
 
     BasicViewHolder(View itemView) {
         super(itemView);

app/src/main/java/com/kunzisoft/keepass/adapters/EntryViewHolder.java

@@ -20,8 +20,6 @@
 package com.kunzisoft.keepass.adapters;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.kunzisoft.keepass.R;
 
@@ -30,7 +28,8 @@ class EntryViewHolder extends BasicViewHolder {
     EntryViewHolder(View itemView) {
         super(itemView);
         container = itemView.findViewById(R.id.entry_container);
-        icon = (ImageView) itemView.findViewById(R.id.entry_icon);
-        text = (TextView) itemView.findViewById(R.id.entry_text);
+        icon = itemView.findViewById(R.id.entry_icon);
+        text = itemView.findViewById(R.id.entry_text);
+        subText = itemView.findViewById(R.id.entry_subtext);
     }
 }

app/src/main/java/com/kunzisoft/keepass/adapters/GroupViewHolder.java

@@ -20,8 +20,6 @@
 package com.kunzisoft.keepass.adapters;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.kunzisoft.keepass.R;
 
@@ -30,7 +28,8 @@ class GroupViewHolder extends BasicViewHolder {
     GroupViewHolder(View itemView) {
         super(itemView);
         container = itemView.findViewById(R.id.group_container);
-        icon = (ImageView) itemView.findViewById(R.id.group_icon);
-        text = (TextView) itemView.findViewById(R.id.group_text);
+        icon = itemView.findViewById(R.id.group_icon);
+        text = itemView.findViewById(R.id.group_text);
+        subText = itemView.findViewById(R.id.group_subtext);
     }
 }

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

@@ -26,35 +26,49 @@ import android.support.annotation.NonNull;
 import android.support.v7.util.SortedList;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.util.SortedListAdapterCallback;
+import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
-import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.app.App;
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwEntry;
 import com.kunzisoft.keepass.database.PwGroup;
 import com.kunzisoft.keepass.database.PwNode;
 import com.kunzisoft.keepass.database.SortNodeEnum;
-import com.kunzisoft.keepass.icons.IconPackChooser;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
+import com.kunzisoft.keepass.utils.Util;
 
 public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
+    private static final String TAG = NodeAdapter.class.getName();
 
     private SortedList<PwNode> nodeSortedList;
 
     private Context context;
     private LayoutInflater inflater;
+    private MenuInflater menuInflater;
     private float textSize;
+    private float subtextSize;
+    private float iconSize;
     private SortNodeEnum listSort;
     private boolean groupsBeforeSort;
     private boolean ascendingSort;
+    private boolean showUsernames;
 
-    private OnNodeClickCallback onNodeClickCallback;
+    private NodeClickCallback nodeClickCallback;
     private NodeMenuListener nodeMenuListener;
     private boolean activateContextMenu;
+    private boolean readOnly;
+    private boolean isASearchResult;
+
+    private Database database;
 
     private int iconGroupColor;
     private int iconEntryColor;
@@ -63,14 +77,14 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
      * Create node list adapter with contextMenu or not
      * @param context Context to use
      */
-    public NodeAdapter(final Context context) {
+    public NodeAdapter(final Context context, MenuInflater menuInflater) {
         this.inflater = LayoutInflater.from(context);
+        this.menuInflater = menuInflater;
         this.context = context;
-        this.textSize = PreferencesUtil.getListTextSize(context);
-        this.listSort = PreferencesUtil.getListSort(context);
-        this.groupsBeforeSort = PreferencesUtil.getGroupsBeforeSort(context);
-        this.ascendingSort = PreferencesUtil.getAscendingSort(context);
+        assignPreferences();
         this.activateContextMenu = false;
+        this.readOnly = false;
+        this.isASearchResult = false;
 
         this.nodeSortedList = new SortedList<>(PwNode.class, new SortedListAdapterCallback<PwNode>(this) {
             @Override public int compare(PwNode item1, PwNode item2) {
@@ -86,6 +100,9 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
             }
         });
 
+        // Database
+        this.database = App.getDB();
+
         // Retrieve the color to tint the icon
         int[] attrTextColorPrimary = {android.R.attr.textColorPrimary};
         TypedArray taTextColorPrimary = context.getTheme().obtainStyledAttributes(attrTextColorPrimary);
@@ -97,20 +114,55 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
         taTextColor.recycle();
     }
 
+    public void setReadOnly(boolean readOnly) {
+        this.readOnly = readOnly;
+    }
+
+    public void setIsASearchResult(boolean isASearchResult) {
+        this.isASearchResult = isASearchResult;
+    }
+
     public void setActivateContextMenu(boolean activate) {
         this.activateContextMenu = activate;
     }
 
+    private void assignPreferences() {
+        float textSizeDefault = Util.getListTextDefaultSize(context);
+        this.textSize = PreferencesUtil.getListTextSize(context);
+        this.subtextSize = context.getResources().getInteger(R.integer.list_small_size_default)
+                * textSize / textSizeDefault;
+        // Retrieve the icon size
+        float iconDefaultSize = context.getResources().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.showUsernames = PreferencesUtil.showUsernamesListEntries(context);
+    }
+
     /**
      * Rebuild the list by clear and build children from the group
      */
     public void rebuildList(PwGroup group) {
         this.nodeSortedList.clear();
-        if (group != null) {
+        assignPreferences();
+        // TODO verify sort
+        try {
             this.nodeSortedList.addAll(group.getDirectChildren());
+        } catch (Exception e) {
+            Log.e(TAG, "Can't add node elements to the list", e);
+            Toast.makeText(context, "Can't add node elements to the list : " + e.getMessage(), Toast.LENGTH_LONG).show();
         }
     }
 
+    /**
+     * Determine if the adapter contains or not any element
+     * @return true if the list is empty
+     */
+    public boolean isEmpty() {
+        return nodeSortedList.size() <= 0;
+    }
+
     /**
      * Add a node to the list
      * @param node Node to add
@@ -172,32 +224,51 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
     public void onBindViewHolder(@NonNull BasicViewHolder holder, int position) {
         PwNode subNode = nodeSortedList.get(position);
         // Assign image
-        if (IconPackChooser.getSelectedIconPack(context).tintable()) {
-            int iconColor = Color.BLACK;
-            switch (subNode.getType()) {
-                case GROUP:
-                    iconColor = iconGroupColor;
-                    break;
-                case ENTRY:
-                    iconColor = iconEntryColor;
-                    break;
-            }
-            App.getDB().getDrawFactory().assignDatabaseIconTo(context, holder.icon, subNode.getIcon(), true, iconColor);
-        } else {
-            App.getDB().getDrawFactory().assignDatabaseIconTo(context, holder.icon, subNode.getIcon());
+        int iconColor = Color.BLACK;
+        switch (subNode.getType()) {
+            case GROUP:
+                iconColor = iconGroupColor;
+                break;
+            case ENTRY:
+                iconColor = iconEntryColor;
+                break;
         }
+        database.getDrawFactory().assignDatabaseIconTo(context, holder.icon, subNode.getIcon(), iconColor);
         // Assign text
-        holder.text.setText(subNode.getDisplayTitle());
+        holder.text.setText(subNode.getTitle());
         // Assign click
         holder.container.setOnClickListener(
                 new OnNodeClickListener(subNode));
         // Context menu
         if (activateContextMenu) {
             holder.container.setOnCreateContextMenuListener(
-                    new ContextMenuBuilder(subNode, nodeMenuListener));
+                    new ContextMenuBuilder(subNode, nodeMenuListener, readOnly));
         }
-        // Assign text size
+
+        // Add username
+        holder.subText.setText("");
+        holder.subText.setVisibility(View.GONE);
+        if (subNode.getType().equals(PwNode.Type.ENTRY)) {
+            PwEntry entry = (PwEntry) subNode;
+            entry.startToManageFieldReferences(database.getPwDatabase());
+
+            holder.text.setText(entry.getVisualTitle());
+
+            String username = entry.getUsername();
+            if (showUsernames && !username.isEmpty()) {
+                holder.subText.setVisibility(View.VISIBLE);
+                holder.subText.setText(username);
+            }
+
+            entry.stopToManageFieldReferences();
+        }
+
+        // Assign image and text size
+        // Relative size of the icon
+        holder.icon.getLayoutParams().height = ((int) iconSize);
+        holder.icon.getLayoutParams().width = ((int) iconSize);
         holder.text.setTextSize(textSize);
+        holder.subText.setTextSize(subtextSize);
     }
 
     @Override
@@ -208,8 +279,8 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
     /**
      * Assign a listener when a node is clicked
      */
-    public void setOnNodeClickListener(OnNodeClickCallback onNodeClickCallback) {
-        this.onNodeClickCallback = onNodeClickCallback;
+    public void setOnNodeClickListener(NodeClickCallback nodeClickCallback) {
+        this.nodeClickCallback = nodeClickCallback;
     }
 
     /**
@@ -222,7 +293,7 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
     /**
      * Callback listener to redefine to do an action when a node is click
      */
-    public interface OnNodeClickCallback {
+    public interface NodeClickCallback {
         void onNodeClick(PwNode node);
     }
 
@@ -232,6 +303,8 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
     public interface NodeMenuListener {
         boolean onOpenMenuClick(PwNode node);
         boolean onEditMenuClick(PwNode node);
+        boolean onCopyMenuClick(PwNode node);
+        boolean onMoveMenuClick(PwNode node);
         boolean onDeleteMenuClick(PwNode node);
     }
 
@@ -247,8 +320,8 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
 
         @Override
         public void onClick(View v) {
-            if (onNodeClickCallback != null)
-                onNodeClickCallback.onNodeClick(node);
+            if (nodeClickCallback != null)
+                nodeClickCallback.onNodeClick(node);
         }
     }
 
@@ -257,29 +330,60 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
      */
     private class ContextMenuBuilder implements View.OnCreateContextMenuListener {
 
-        private static final int MENU_OPEN = Menu.FIRST;
-        private static final int MENU_EDIT = MENU_OPEN + 1;
-        private static final int MENU_DELETE = MENU_EDIT + 1;
-
         private PwNode node;
         private NodeMenuListener menuListener;
+        private boolean readOnly;
 
-        ContextMenuBuilder(PwNode node, NodeMenuListener menuListener) {
+        ContextMenuBuilder(PwNode node, NodeMenuListener menuListener, boolean readOnly) {
             this.menuListener = menuListener;
             this.node = node;
+            this.readOnly = readOnly;
         }
 
         @Override
         public void onCreateContextMenu(ContextMenu contextMenu, View view, ContextMenu.ContextMenuInfo contextMenuInfo) {
-            MenuItem clearMenu = contextMenu.add(Menu.NONE, MENU_OPEN, Menu.NONE, R.string.menu_open);
-            clearMenu.setOnMenuItemClickListener(mOnMyActionClickListener);
-            if (!App.getDB().isReadOnly() && !node.equals(App.getDB().getPwDatabase().getRecycleBin())) {
-                // Edition
-                clearMenu = contextMenu.add(Menu.NONE, MENU_EDIT, Menu.NONE, R.string.menu_edit);
-                clearMenu.setOnMenuItemClickListener(mOnMyActionClickListener);
-                // Deletion
-                clearMenu = contextMenu.add(Menu.NONE, MENU_DELETE, Menu.NONE, R.string.menu_delete);
-                clearMenu.setOnMenuItemClickListener(mOnMyActionClickListener);
+            menuInflater.inflate(R.menu.node_menu, contextMenu);
+
+            // Opening
+            MenuItem menuItem = contextMenu.findItem(R.id.menu_open);
+            menuItem.setOnMenuItemClickListener(mOnMyActionClickListener);
+
+            // Edition
+            if (readOnly || node.equals(App.getDB().getPwDatabase().getRecycleBin())) {
+                contextMenu.removeItem(R.id.menu_edit);
+            } else {
+                menuItem = contextMenu.findItem(R.id.menu_edit);
+                menuItem.setOnMenuItemClickListener(mOnMyActionClickListener);
+            }
+
+            // Copy (not for group)
+            if (readOnly
+                    || isASearchResult
+                    || node.equals(App.getDB().getPwDatabase().getRecycleBin())
+                    || node.getType().equals(PwNode.Type.GROUP)) {
+                // TODO COPY For Group
+                contextMenu.removeItem(R.id.menu_copy);
+            } else {
+                menuItem = contextMenu.findItem(R.id.menu_copy);
+                menuItem.setOnMenuItemClickListener(mOnMyActionClickListener);
+            }
+
+            // Move
+            if (readOnly
+                    || isASearchResult
+                    || node.equals(App.getDB().getPwDatabase().getRecycleBin())) {
+                contextMenu.removeItem(R.id.menu_move);
+            } else {
+                menuItem = contextMenu.findItem(R.id.menu_move);
+                menuItem.setOnMenuItemClickListener(mOnMyActionClickListener);
+            }
+
+            // Deletion
+            if (readOnly || node.equals(App.getDB().getPwDatabase().getRecycleBin())) {
+                contextMenu.removeItem(R.id.menu_delete);
+            } else {
+                menuItem = contextMenu.findItem(R.id.menu_delete);
+                menuItem.setOnMenuItemClickListener(mOnMyActionClickListener);
             }
         }
 
@@ -289,11 +393,15 @@ public class NodeAdapter extends RecyclerView.Adapter<BasicViewHolder> {
                 if (menuListener == null)
                     return false;
                 switch ( item.getItemId() ) {
-                    case MENU_OPEN:
+                    case R.id.menu_open:
                         return menuListener.onOpenMenuClick(node);
-                    case MENU_EDIT:
+                    case R.id.menu_edit:
                         return menuListener.onEditMenuClick(node);
-                    case MENU_DELETE:
+                    case R.id.menu_copy:
+                        return menuListener.onCopyMenuClick(node);
+                    case R.id.menu_move:
+                        return menuListener.onMoveMenuClick(node);
+                    case R.id.menu_delete:
                         return menuListener.onDeleteMenuClick(node);
                     default:
                         return false;

app/src/main/java/com/kunzisoft/keepass/adapters/SearchEntryCursorAdapter.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.adapters;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.support.v4.widget.CursorAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.database.PwIcon;
+import com.kunzisoft.keepass.database.PwIconFactory;
+import com.kunzisoft.keepass.database.cursor.EntryCursor;
+import com.kunzisoft.keepass.settings.PreferencesUtil;
+
+import java.util.UUID;
+
+public class SearchEntryCursorAdapter extends CursorAdapter {
+
+    private LayoutInflater cursorInflater;
+    private Database database;
+    private boolean displayUsername;
+    private int iconColor;
+
+    public SearchEntryCursorAdapter(Context context, Database database) {
+        super(context, null, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);
+        cursorInflater = (LayoutInflater) context.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+        this.database = database;
+
+        // Get the icon color
+        int[] attrTextColor = {R.attr.textColorInverse};
+        TypedArray taTextColor = context.getTheme().obtainStyledAttributes(attrTextColor);
+        this.iconColor = taTextColor.getColor(0, Color.WHITE);
+        taTextColor.recycle();
+
+        reInit(context);
+    }
+
+    public void reInit(Context context) {
+        this.displayUsername = PreferencesUtil.showUsernamesListEntries(context);
+    }
+
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+
+        View view = cursorInflater.inflate(R.layout.search_entry, parent ,false);
+        ViewHolder viewHolder = new ViewHolder();
+        viewHolder.imageViewIcon = view.findViewById(R.id.entry_icon);
+        viewHolder.textViewTitle = view.findViewById(R.id.entry_text);
+        viewHolder.textViewSubTitle = view.findViewById(R.id.entry_subtext);
+        view.setTag(viewHolder);
+
+        return view;
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+
+        // Retrieve elements from cursor
+        UUID uuid = new UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
+                cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS)));
+        PwIconFactory iconFactory = database.getPwDatabase().getIconFactory();
+        PwIcon icon = iconFactory.getIcon(
+                new UUID(cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
+                        cursor.getLong(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))));
+        if (icon.isUnknown()) {
+            icon = iconFactory.getIcon(cursor.getInt(cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_STANDARD)));
+            if (icon.isUnknown())
+                icon = iconFactory.getKeyIcon();
+        }
+        String title = cursor.getString( cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_TITLE) );
+        String username = cursor.getString( cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_USERNAME) );
+        String url = cursor.getString( cursor.getColumnIndex(EntryCursor.COLUMN_INDEX_URL) );
+
+        ViewHolder viewHolder = (ViewHolder) view.getTag();
+
+        // Assign image
+        database.getDrawFactory().assignDatabaseIconTo(context, viewHolder.imageViewIcon, icon, iconColor);
+
+        // Assign title
+        String showTitle = PwEntry.getVisualTitle(false, title, username, url, uuid);
+        viewHolder.textViewTitle.setText(showTitle);
+        if (displayUsername && !username.isEmpty()) {
+            viewHolder.textViewSubTitle.setText(String.format("(%s)", username));
+        } else {
+            viewHolder.textViewSubTitle.setText("");
+        }
+    }
+
+    private static class ViewHolder {
+        ImageView imageViewIcon;
+        TextView textViewTitle;
+        TextView textViewSubTitle;
+    }
+
+    @Override
+    public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
+        return database.searchEntry(constraint.toString());
+    }
+
+    public PwEntry getEntryFromPosition(int position) {
+        PwEntry pwEntry = null;
+
+        Cursor cursor = this.getCursor();
+        if (cursor.moveToFirst()
+            &&
+            cursor.move(position)) {
+
+            pwEntry = database.createEntry();
+            database.populateEntry(pwEntry, (EntryCursor) cursor);
+        }
+        return pwEntry;
+    }
+
+}

app/src/main/java/com/kunzisoft/keepass/autofill/AutoFillAuthActivity.java

@@ -54,7 +54,7 @@ public class AutoFillAuthActivity extends AppCompatActivity {
         // Pass extra for Autofill (EXTRA_ASSIST_STRUCTURE)
         AssistStructure assistStructure = autofillHelper.retrieveAssistStructure(getIntent());
         if (assistStructure != null) {
-            FileSelectActivity.launch(this, assistStructure);
+            FileSelectActivity.launchForAutofillResult(this, assistStructure);
         } else {
             setResult(RESULT_CANCELED);
             finish();

app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.java

@@ -36,6 +36,7 @@ import android.widget.RemoteViews;
 
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.selection.EntrySelectionHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,6 +65,7 @@ public class AutofillHelper {
 
     public static void addAssistStructureExtraInIntent(Intent intent, AssistStructure assistStructure) {
         if (assistStructure != null) {
+            EntrySelectionHelper.addEntrySelectionModeExtraInIntent(intent);
             intent.putExtra(android.view.autofill.AutofillManager.EXTRA_ASSIST_STRUCTURE, assistStructure);
         }
     }
@@ -144,7 +146,7 @@ public class AutofillHelper {
     /**
      * Utility method to loop and close each activity with return data
      */
-    public static void onActivityResultSetResult(Activity activity, int requestCode, int resultCode, Intent data) {
+    public static void onActivityResultSetResultAndFinish(Activity activity, int requestCode, int resultCode, Intent data) {
         if (requestCode == AUTOFILL_RESPONSE_REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK) {
                 activity.setResult(resultCode, data);
@@ -152,15 +154,6 @@ public class AutofillHelper {
             if (resultCode == Activity.RESULT_CANCELED) {
                 activity.setResult(Activity.RESULT_CANCELED);
             }
-        }
-    }
-
-    /**
-     * Utility method to loop and close each activity with return data
-     */
-    public static void onActivityResultSetResultAndFinish(Activity activity, int requestCode, int resultCode, Intent data) {
-        if (requestCode == AUTOFILL_RESPONSE_REQUEST_CODE) {
-            onActivityResultSetResult(activity, requestCode, resultCode, data);
             activity.finish();
         }
     }

app/src/main/java/com/kunzisoft/keepass/compat/BackupManagerCompat.java

@@ -1,66 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.compat;
-
-import android.content.Context;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-
-
-@SuppressWarnings({"unchecked", "rawtypes"})
-public class BackupManagerCompat {
-	private static Class classBackupManager;
-	private static Constructor constructorBackupManager;
-	private static Method dataChanged;
-	
-	private Object backupManager;
-	
-	static {
-		try {
-			classBackupManager = Class.forName("android.app.backup.BackupManager");
-			constructorBackupManager = classBackupManager.getConstructor(Context.class);
-			dataChanged = classBackupManager.getMethod("dataChanged", (Class[]) null);
-		} catch (Exception e) {
-			// Do nothing, class does not exist
-		}
-	}
-	
-	public BackupManagerCompat(Context ctx) {
-		if (constructorBackupManager != null) {
-			try {
-				backupManager = constructorBackupManager.newInstance(ctx);
-			} catch (Exception e) {
-				// Do nothing
-			}
-		}
-	}
-	
-	public void dataChanged() {
-		if (backupManager != null && dataChanged != null) {
-			try {
-				dataChanged.invoke(backupManager, (Object[]) null);
-			} catch (Exception e) {
-				// Do nothing
-			}
-		}
-	}
-
-}

app/src/main/java/com/kunzisoft/keepass/compat/BitmapDrawableCompat.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.compat;
-
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-
-import java.lang.reflect.Constructor;
-
-// This compatiblity hack can go away when support for Android 1.5 api level 3 is dropped
-public class BitmapDrawableCompat {
-	private static Constructor<BitmapDrawable> constResBitmap;
-	
-	static {
-		try {
-			constResBitmap = BitmapDrawable.class.getConstructor(Resources.class, Bitmap.class);
-			// This constructor is support in this api version
-		} catch (Exception e) {
-			// This constructor is not supported
-		}
-	}
-	
-	public static BitmapDrawable getBitmapDrawable(Resources res, Bitmap bitmap) {
-		if (constResBitmap != null) {
-			try {
-				return constResBitmap.newInstance(res, bitmap);
-			} catch (Exception e) {
-				// Do nothing, fall through to the safe constructor
-			}
-		}
-		
-		return new BitmapDrawable(bitmap);
-	}
-
-}

app/src/main/java/com/kunzisoft/keepass/compat/BuildCompat.java

@@ -1,70 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.compat;
-
-import android.os.Build;
-
-import java.lang.reflect.Field;
-
-public class BuildCompat {
-	private static Field manufacturer;
-	private static String manuText;
-	
-	public static final int VERSION_CODE_GINGERBREAD = 9;
-	public static final int VERSION_CODE_ICE_CREAM_SANDWICH = 14;
-	public static final int VERSION_CODE_JELLY_BEAN = 16;
-	public static final int VERSION_CODE_JELLY_BEAN_MR2 = 18;
-	public static final int VERSION_KITKAT = 19;
-	public static final int VERSION_CODE_M = 23;
-
-	private static Field versionSDK;
-	private static int versionInt;
-	
-	static {
-		// MANUFACTURER is only available in API version 4 and later
-		try {
-			manufacturer = Build.class.getField("MANUFACTURER");
-			manuText = (String) manufacturer.get(null);
-		} catch (Exception e) {
-			manuText = "";
-		}
-		
-		// SDK is only available in API version 4 and later
-		try {
-			versionSDK = Build.VERSION.class.getField("SDK_INT");
-			versionInt = versionSDK.getInt(null);
-		} catch (Exception e) {
-			try {
-                versionInt = Integer.parseInt(Build.VERSION.SDK);
-			} catch (Exception nfe) {
-				versionInt = -1;
-			}
-		}
-	}
-	
-	public static String getManufacturer() {
-		return manuText;
-	}
-	
-	public static int getSdkVersion() {
-		return versionInt;
-	}
-
-}

app/src/main/java/com/kunzisoft/keepass/compat/ClipDataCompat.java

@@ -25,9 +25,6 @@ import android.net.Uri;
 import java.lang.reflect.Method;
 
 public class ClipDataCompat {
-    private static Class clipData;
-    private static Class clipDataItem;
-    private static Class clipDescription;
     private static Method getClipDataFromIntent;
     private static Method getDescription;
     private static Method getItemCount;
@@ -39,14 +36,14 @@ public class ClipDataCompat {
 
     static {
         try {
-            clipData = Class.forName("android.content.ClipData");
+            Class clipData = Class.forName("android.content.ClipData");
             getDescription = clipData.getMethod("getDescription", (Class[])null);
             getItemCount = clipData.getMethod("getItemCount", (Class[])null);
             getItemAt = clipData.getMethod("getItemAt", new Class[]{int.class});
-            clipDescription = Class.forName("android.content.ClipDescription");
+            Class clipDescription = Class.forName("android.content.ClipDescription");
             getLabel = clipDescription.getMethod("getLabel", (Class[])null);
 
-            clipDataItem = Class.forName("android.content.ClipData$Item");
+            Class clipDataItem = Class.forName("android.content.ClipData$Item");
             getUri = clipDataItem.getMethod("getUri", (Class[])null);
 
             getClipDataFromIntent = Intent.class.getMethod("getClipData", (Class[])null);
@@ -58,7 +55,6 @@ public class ClipDataCompat {
     }
 
     public static Uri getUriFromIntent(Intent i, String key) {
-        boolean clipDataSucceeded = false;
         if (initSucceded) {
             try {
                 Object clip = getClipDataFromIntent.invoke(i);

app/src/main/java/com/kunzisoft/keepass/compat/ContentResolverCompat.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.compat;
-
-import android.content.ContentResolver;
-import android.net.Uri;
-
-import java.lang.reflect.Method;
-
-public class ContentResolverCompat {
-    public static boolean available;
-    private static Class contentResolver;
-    private static Method takePersistableUriPermission;
-
-    static {
-        try {
-            contentResolver = ContentResolver.class;
-            takePersistableUriPermission = contentResolver.getMethod("takePersistableUriPermission", new Class[]{Uri.class, int.class});
-
-            available = true;
-        } catch (Exception e) {
-            available = false;
-        }
-    }
-
-    public static void takePersistableUriPermission(ContentResolver resolver, Uri uri, int modeFlags) {
-        if (available) {
-            try {
-                takePersistableUriPermission.invoke(resolver, new Object[]{uri, modeFlags});
-            } catch (Exception e) {
-                // Fail silently
-            }
-        }
-    }
-}

app/src/main/java/com/kunzisoft/keepass/compat/EditorCompat.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.compat;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-
-import java.lang.reflect.Method;
-
-public class EditorCompat {
-	private static Method apply;
-	
-	static {
-		try {
-			apply = Activity.class.getMethod("apply", (Class<SharedPreferences.Editor>[]) null);
-		} catch (Exception e) {
-			// Substitute commit for apply when not available (API level < 9)
-			try {
-				apply = Activity.class.getMethod("commit", (Class<SharedPreferences.Editor>[]) null);
-			} catch (Exception f) {
-				// Should be impossible, but leave apply null in this case
-			}
-		}
-	}
-	
-	public static void apply(SharedPreferences.Editor edit) {
-		try {
-			apply.invoke(edit, (Object[]) null);
-		} catch (Exception e) {
-			// Shouldn't be possible, but call commit directly if this happens
-			edit.commit();
-		}
-		
-	}
-
-}

app/src/main/java/com/kunzisoft/keepass/compat/PRNGFixes.java

@@ -44,7 +44,6 @@ public final class PRNGFixes {
 
     private static final byte[] BUILD_FINGERPRINT_AND_DEVICE_SERIAL =
         getBuildFingerprintAndDeviceSerial();
-    private static int sdkVersion = BuildCompat.getSdkVersion();
 
     /** Hidden constructor to prevent instantiation. */
     private PRNGFixes() {}
@@ -67,11 +66,11 @@ public final class PRNGFixes {
     
     private static boolean supportedOnThisDevice() {
     	// Blacklist on samsung devices
-    	if (StrUtil.indexOfIgnoreCase(BuildCompat.getManufacturer(), "samsung", Locale.ENGLISH) >= 0) {
+    	if (StrUtil.indexOfIgnoreCase(Build.MANUFACTURER, "samsung", Locale.ENGLISH) >= 0) {
     		return false;
     	}
     	
-        if (sdkVersion > BuildCompat.VERSION_CODE_JELLY_BEAN_MR2) {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) {
             return false;
         }
         
@@ -126,8 +125,8 @@ public final class PRNGFixes {
      * @throws SecurityException if the fix is needed but could not be applied.
      */
     private static void applyOpenSSLFix() throws SecurityException {
-        if ((sdkVersion < BuildCompat.VERSION_CODE_JELLY_BEAN)
-                || (sdkVersion > BuildCompat.VERSION_CODE_JELLY_BEAN_MR2)) {
+        if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
+                || (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2)) {
             // No need to apply the fix
             return;
         }
@@ -162,7 +161,7 @@ public final class PRNGFixes {
      */
     private static void installLinuxPRNGSecureRandom()
             throws SecurityException {
-        if (sdkVersion > BuildCompat.VERSION_CODE_JELLY_BEAN_MR2) {
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) {
             // No need to apply the fix
             return;
         }

app/src/main/java/com/kunzisoft/keepass/compat/StorageAF.java

@@ -22,6 +22,7 @@ package com.kunzisoft.keepass.compat;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.preference.PreferenceManager;
 
 import com.kunzisoft.keepass.R;
@@ -45,7 +46,7 @@ public class StorageAF {
         }
     }
 
-    public static boolean supportsStorageFramework() { return BuildCompat.getSdkVersion() >= BuildCompat.VERSION_KITKAT; }
+    public static boolean supportsStorageFramework() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; }
 
     public static boolean useStorageFramework(Context ctx) {
         if (!supportsStorageFramework()) { return false; }

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.java

@@ -33,8 +33,8 @@ import java.util.UUID;
 
 public class AesKdf extends KdfEngine {
 
-    public static final int DEFAULT_ROUNDS = 6000;
-    public static final String DEFAULT_NAME = "AES-KDF";
+    private static final int DEFAULT_ROUNDS = 6000;
+    private static final String DEFAULT_NAME = "AES-KDF";
 
     public static final UUID CIPHER_UUID = Types.bytestoUUID(
             new byte[]{(byte) 0xC9, (byte) 0xD9, (byte) 0xF3, (byte) 0x9A, (byte) 0x62, (byte) 0x8A, (byte) 0x44, (byte) 0x60,
@@ -44,8 +44,8 @@ public class AesKdf extends KdfEngine {
     public static final String ParamRounds = "R";
     public static final String ParamSeed = "S";
 
-    public AesKdf() {
-        uuid = CIPHER_UUID;
+    AesKdf() {
+        setUUID(CIPHER_UUID);
     }
 
     @Override

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/Argon2Kdf.java

@@ -35,16 +35,16 @@ public class Argon2Kdf extends KdfEngine {
                     (byte) 0x91, (byte) 0xF7, (byte) 0xA9, (byte) 0xA4, (byte)0x03, (byte) 0xE3, (byte) 0x0A, (byte) 0x0C
             });
 
-    public static final String ParamSalt = "S"; // byte[]
-    public static final String ParamParallelism = "P"; // UInt32
-    public static final String ParamMemory = "M"; // UInt64
-    public static final String ParamIterations = "I"; // UInt64
-    public static final String ParamVersion = "V"; // UInt32
-    public static final String ParamSecretKey = "K"; // byte[]
-    public static final String ParamAssocData = "A"; // byte[]
+    private static final String ParamSalt = "S"; // byte[]
+    private static final String ParamParallelism = "P"; // UInt32
+    private static final String ParamMemory = "M"; // UInt64
+    private static final String ParamIterations = "I"; // UInt64
+    private static final String ParamVersion = "V"; // UInt32
+    private static final String ParamSecretKey = "K"; // byte[]
+    private static final String ParamAssocData = "A"; // byte[]
 
-    public static final long MinVersion = 0x10;
-    public static final long MaxVersion = 0x13;
+    private static final long MinVersion = 0x10;
+    private static final long MaxVersion = 0x13;
 
     private static final int MinSalt = 8;
     private static final int MaxSalt = Integer.MAX_VALUE;
@@ -64,8 +64,8 @@ public class Argon2Kdf extends KdfEngine {
 
     private static final String DEFAULT_NAME = "Argon2";
 
-    public Argon2Kdf() {
-        uuid = CIPHER_UUID;
+    Argon2Kdf() {
+        setUUID(CIPHER_UUID);
     }
 
     @Override

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfEngine.java

@@ -29,7 +29,15 @@ public abstract class KdfEngine implements ObjectNameResource{
     public static final int UNKNOW_VALUE = -1;
     public static final String UNKNOW_VALUE_STRING = String.valueOf(-1);
 
-    public UUID uuid;
+    protected UUID uuid;
+
+    public UUID getUUID() {
+        return uuid;
+    }
+
+    public void setUUID(UUID uuid) {
+        this.uuid = uuid;
+    }
 
     public abstract KdfParameters getDefaultParameters();
 

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfFactory.java

@@ -19,6 +19,8 @@
  */
 package com.kunzisoft.keepass.crypto.keyDerivation;
 
+import com.kunzisoft.keepass.database.exception.UnknownKDF;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,22 +30,26 @@ public class KdfFactory {
     public static Argon2Kdf argon2Kdf = new Argon2Kdf();
 
     public static List<KdfEngine> kdfListV3 = new ArrayList<>();
-    public static List<KdfEngine> kdfList = new ArrayList<>();
+    public static List<KdfEngine> kdfListV4 = new ArrayList<>();
 
     static {
         kdfListV3.add(aesKdf);
 
-        kdfList.add(aesKdf);
-        kdfList.add(argon2Kdf);
+        kdfListV4.add(aesKdf);
+        kdfListV4.add(argon2Kdf);
     }
 
-    public static KdfEngine get(KdfParameters kdfParameters) {
-        for (KdfEngine engine: kdfList) {
-            if (engine.uuid.equals(kdfParameters.kdfUUID)) {
+    public static KdfEngine getEngineV4(KdfParameters kdfParameters) throws UnknownKDF {
+        UnknownKDF unknownKDFException = new UnknownKDF();
+        if (kdfParameters == null) {
+            throw unknownKDFException;
+        }
+        for (KdfEngine engine: kdfListV4) {
+            if (engine.getUUID().equals(kdfParameters.getUUID())) {
                 return engine;
             }
         }
-        return null;
+        throw unknownKDFException;
     }
 
 }

app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/KdfParameters.java

@@ -31,7 +31,7 @@ import java.util.UUID;
 
 public class KdfParameters extends VariantDictionary {
 
-    public UUID kdfUUID;
+    private UUID kdfUUID;
 
     private static final String ParamUUID = "$UUID";
 
@@ -39,6 +39,10 @@ public class KdfParameters extends VariantDictionary {
         kdfUUID = uuid;
     }
 
+    public UUID getUUID() {
+        return kdfUUID;
+    }
+
     protected void setParamUUID() {
         setByteArray(ParamUUID, Types.UUIDtoBytes(kdfUUID));
     }

app/src/main/java/com/kunzisoft/keepass/database/AutoType.java

@@ -19,20 +19,57 @@
  */
 package com.kunzisoft.keepass.database;
 
-import java.io.Serializable;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.kunzisoft.keepass.utils.MemUtil;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-public class AutoType implements Cloneable, Serializable {
+public class AutoType implements Cloneable, Parcelable {
     private static final long OBF_OPT_NONE = 0;
 
     public boolean enabled = true;
     public long obfuscationOptions = OBF_OPT_NONE;
     public String defaultSequence = "";
-
     private HashMap<String, String> windowSeqPairs = new HashMap<>();
 
+    public AutoType() {}
+
+    public AutoType(Parcel in) {
+        enabled = in.readByte() != 0;
+        obfuscationOptions = in.readLong();
+        defaultSequence = in.readString();
+        windowSeqPairs = MemUtil.readStringParcelableMap(in);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeByte((byte) (enabled ? 1 : 0));
+        dest.writeLong(obfuscationOptions);
+        dest.writeString(defaultSequence);
+        MemUtil.writeStringParcelableMap(dest, windowSeqPairs);
+    }
+
+    public static final Parcelable.Creator<AutoType> CREATOR = new Parcelable.Creator<AutoType>() {
+        @Override
+        public AutoType createFromParcel(Parcel in) {
+            return new AutoType(in);
+        }
+
+        @Override
+        public AutoType[] newArray(int size) {
+            return new AutoType[size];
+        }
+    };
+
     @SuppressWarnings("unchecked")
     public AutoType clone() {
         AutoType auto;

app/src/main/java/com/kunzisoft/keepass/database/Database.java

@@ -20,24 +20,22 @@
 package com.kunzisoft.keepass.database;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.database.Cursor;
 import android.net.Uri;
-import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine;
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory;
+import com.kunzisoft.keepass.database.cursor.EntryCursor;
 import com.kunzisoft.keepass.database.exception.ContentFileNotFoundException;
 import com.kunzisoft.keepass.database.exception.InvalidDBException;
-import com.kunzisoft.keepass.database.exception.InvalidPasswordException;
 import com.kunzisoft.keepass.database.exception.PwDbOutputException;
 import com.kunzisoft.keepass.database.load.Importer;
 import com.kunzisoft.keepass.database.load.ImporterFactory;
 import com.kunzisoft.keepass.database.save.PwDbOutput;
+import com.kunzisoft.keepass.database.search.SearchDbHelper;
 import com.kunzisoft.keepass.icons.IconDrawableFactory;
-import com.kunzisoft.keepass.search.SearchDbHelper;
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater;
 import com.kunzisoft.keepass.utils.UriUtil;
 
@@ -51,6 +49,9 @@ import java.io.OutputStream;
 import java.io.SyncFailedException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
 
 
 public class Database {
@@ -107,7 +108,7 @@ public class Database {
         loadData(ctx, uri, password, keyfile, status, !Importer.DEBUG);
     }
 
-    public void loadData(Context ctx, Uri uri, String password, Uri keyfile, ProgressTaskUpdater status, boolean debug) throws IOException, FileNotFoundException, InvalidDBException {
+    private void loadData(Context ctx, Uri uri, String password, Uri keyfile, ProgressTaskUpdater status, boolean debug) throws IOException, FileNotFoundException, InvalidDBException {
         mUri = uri;
         readOnly = false;
         if (uri.getScheme().equals("file")) {
@@ -115,26 +116,10 @@ public class Database {
             readOnly = !file.canWrite();
         }
 
-        try {
-            passUrisAsInputStreams(ctx, uri, password, keyfile, status, debug, 0);
-        } catch (InvalidPasswordException e) {
-            // Retry with rounds fix
-            try {
-                passUrisAsInputStreams(ctx, uri, password, keyfile, status, debug, getFixRounds(ctx));
-            } catch (Exception e2) {
-                // Rethrow original exception
-                throw e;
-            }
-        }
+        passUrisAsInputStreams(ctx, uri, password, keyfile, status, debug);
     }
 
-    private long getFixRounds(Context ctx) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
-        return prefs.getLong(ctx.getString(R.string.roundsFix_key), ctx.getResources().getInteger(R.integer.roundsFix_default));
-    }
-
-
-    private void passUrisAsInputStreams(Context ctx, Uri uri, String password, Uri keyfile, ProgressTaskUpdater status, boolean debug, long roundsFix) throws IOException, FileNotFoundException, InvalidDBException {
+    private void passUrisAsInputStreams(Context ctx, Uri uri, String password, Uri keyfile, ProgressTaskUpdater status, boolean debug) throws IOException, FileNotFoundException, InvalidDBException {
         InputStream is, kfIs;
         try {
             is = UriUtil.getUriInputStream(ctx, uri);
@@ -149,14 +134,14 @@ public class Database {
             Log.e("KPD", "Database::loadData", e);
             throw ContentFileNotFoundException.getInstance(keyfile);
         }
-        loadData(ctx, is, password, kfIs, status, debug, roundsFix);
+        loadData(ctx, is, password, kfIs, status, debug);
     }
 
     public void loadData(Context ctx, InputStream is, String password, InputStream keyFileInputStream, boolean debug) throws IOException, InvalidDBException {
-        loadData(ctx, is, password, keyFileInputStream, null, debug, 0);
+        loadData(ctx, is, password, keyFileInputStream, null, debug);
     }
 
-    private void loadData(Context ctx, InputStream is, String password, InputStream keyFileInputStream, ProgressTaskUpdater progressTaskUpdater, boolean debug, long roundsFix) throws IOException, InvalidDBException {
+    private void loadData(Context ctx, InputStream is, String password, InputStream keyFileInputStream, ProgressTaskUpdater progressTaskUpdater, boolean debug) throws IOException, InvalidDBException {
         BufferedInputStream bis = new BufferedInputStream(is);
 
         if ( ! bis.markSupported() ) {
@@ -170,7 +155,7 @@ public class Database {
 
         bis.reset();  // Return to the start
 
-        pm = databaseImporter.openDatabase(bis, password, keyFileInputStream, progressTaskUpdater, roundsFix);
+        pm = databaseImporter.openDatabase(bis, password, keyFileInputStream, progressTaskUpdater);
         if ( pm != null ) {
             try {
                 switch (pm.getVersion()) {
@@ -196,13 +181,17 @@ public class Database {
     }
 
     public PwGroup search(String str) {
+        return search(str, Integer.MAX_VALUE);
+    }
+
+    public PwGroup search(String str, int max) {
         if (searchHelper == null) { return null; }
         try {
             switch (pm.getVersion()) {
                 case V3:
-                    return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pm), str);
+                    return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pm), str, max);
                 case V4:
-                    return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pm), str);
+                    return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pm), str, max);
             }
         } catch (Exception e) {
             Log.e(TAG, "Search can't be performed with this SearchHelper", e);
@@ -210,11 +199,61 @@ public class Database {
         return null;
     }
 
+    public Cursor searchEntry(String query) {
+        final EntryCursor cursor = new EntryCursor();
+
+        // TODO real content provider
+        if (!query.isEmpty()) {
+            PwGroup searchResult = search(query, 6);
+            PwVersion version = getPwDatabase().getVersion();
+            if (searchResult != null) {
+                for (int i = 0; i < searchResult.numbersOfChildEntries(); i++) {
+                    PwEntry entry = searchResult.getChildEntryAt(i);
+                    if (!entry.isMetaStream()) { // TODO metastream
+                        try {
+                            switch (version) {
+                                case V3:
+                                    cursor.addEntry((PwEntryV3) entry);
+                                    continue;
+                                case V4:
+                                    cursor.addEntry((PwEntryV4) entry);
+                            }
+                        } catch (Exception e) {
+                            Log.e(TAG, "Can't add PwEntry to the cursor", e);
+                        }
+                    }
+                }
+            }
+        }
+        return cursor;
+    }
+
+    public void populateEntry(PwEntry pwEntry, EntryCursor cursor) {
+        PwIconFactory iconFactory = getPwDatabase().getIconFactory();
+        try {
+            switch (getPwDatabase().getVersion()) {
+                case V3:
+                    cursor.populateEntry((PwEntryV3) pwEntry, iconFactory);
+                    break;
+                case V4:
+                    // TODO invert field reference manager
+                    pwEntry.startToManageFieldReferences(getPwDatabase());
+                    cursor.populateEntry((PwEntryV4) pwEntry, iconFactory);
+                    pwEntry.stopToManageFieldReferences();
+                    break;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "This version of PwGroup can't be populated", e);
+        }
+    }
+
     public void saveData(Context ctx) throws IOException, PwDbOutputException {
         saveData(ctx, mUri);
     }
 
     private void saveData(Context ctx, Uri uri) throws IOException, PwDbOutputException {
+        String errorMessage = "Failed to store database.";
+
         if (uri.getScheme().equals("file")) {
             String filename = uri.getPath();
             File tempFile = new File(filename + ".tmp");
@@ -226,7 +265,8 @@ public class Database {
                 if (pmo != null)
                     pmo.output();
             } catch (Exception e) {
-                throw new IOException("Failed to store database.");
+                Log.e(TAG, errorMessage, e);
+                throw new IOException(errorMessage, e);
             } finally {
                 if (fos != null)
                     fos.close();
@@ -242,7 +282,7 @@ public class Database {
             File orig = new File(filename);
 
             if (!tempFile.renameTo(orig)) {
-                throw new IOException("Failed to store database.");
+                throw new IOException(errorMessage);
             }
         }
         else {
@@ -253,7 +293,8 @@ public class Database {
                 if (pmo != null)
                     pmo.output();
             } catch (Exception e) {
-                throw new IOException("Failed to store database.");
+                Log.e(TAG, errorMessage, e);
+                throw new IOException(errorMessage, e);
             } finally {
                 if (os != null)
                     os.close();
@@ -262,6 +303,7 @@ public class Database {
         mUri = uri;
     }
 
+    // TODO Clear database when lock broadcast is receive in backstage
     public void clear() {
         drawFactory.clearCache();
 
@@ -380,7 +422,7 @@ public class Database {
     public List<KdfEngine> getAvailableKdfEngines() {
         switch (getPwDatabase().getVersion()) {
             case V4:
-                return KdfFactory.kdfList;
+                return KdfFactory.kdfListV4;
             case V3:
                 return KdfFactory.kdfListV3;
         }
@@ -392,14 +434,24 @@ public class Database {
     }
 
     public KdfEngine getKdfEngine() {
-        return getPwDatabase().getKdfEngine();
+        switch (getPwDatabase().getVersion()) {
+            case V4:
+                KdfEngine kdfEngine = ((PwDatabaseV4) getPwDatabase()).getKdfEngine();
+                if (kdfEngine == null)
+                    return KdfFactory.aesKdf;
+                return kdfEngine;
+            default:
+            case V3:
+                return KdfFactory.aesKdf;
+        }
     }
 
     public void assignKdfEngine(KdfEngine kdfEngine) {
         switch (getPwDatabase().getVersion()) {
             case V4:
                 PwDatabaseV4 db = ((PwDatabaseV4) getPwDatabase());
-                if (!db.getKdfParameters().kdfUUID.equals(kdfEngine.getDefaultParameters().kdfUUID))
+                if (db.getKdfParameters() == null
+                        || !db.getKdfParameters().getUUID().equals(kdfEngine.getDefaultParameters().getUUID()))
                     db.setKdfParameters(kdfEngine.getDefaultParameters());
                 setNumberKeyEncryptionRounds(kdfEngine.getDefaultKeyRounds());
                 setMemoryUsage(kdfEngine.getDefaultMemoryUsage());
@@ -409,7 +461,7 @@ public class Database {
     }
 
     public String getKeyDerivationName(Resources resources) {
-        KdfEngine kdfEngine = getPwDatabase().getKdfEngine();
+        KdfEngine kdfEngine = getKdfEngine();
         if (kdfEngine != null) {
             return kdfEngine.getName(resources);
         }
@@ -466,19 +518,22 @@ public class Database {
         }
     }
 
-    public PwEntry createEntry(PwGroup parent) {
-        PwEntry newPwEntry = null;
+    public PwEntry createEntry() {
+        return createEntry(null);
+    }
+
+    public PwEntry createEntry(@Nullable PwGroup parent) {
         try {
             switch (getPwDatabase().getVersion()) {
                 case V3:
-                    newPwEntry = new PwEntryV3((PwGroupV3) parent);
+                    return new PwEntryV3((PwGroupV3) parent);
                 case V4:
-                    newPwEntry = new PwEntryV4((PwGroupV4) parent);
+                    return new PwEntryV4((PwGroupV4) parent);
             }
         } catch (Exception e) {
             Log.e(TAG, "This version of PwEntry can't be created", e);
         }
-        return newPwEntry;
+        return null;
     }
 
     public PwGroup createGroup(PwGroup parent) {
@@ -645,6 +700,44 @@ public class Database {
         }
     }
 
+    /**
+     * @return A duplicate entry with the same values, a new UUID,
+     * @param entryToCopy
+     * @param newParent
+     */
+    public @Nullable PwEntry copyEntry(PwEntry entryToCopy, PwGroup newParent) {
+        try {
+            // TODO encapsulate
+            switch (getPwDatabase().getVersion()) {
+                case V3:
+                    PwEntryV3 entryV3Copied = ((PwEntryV3) entryToCopy).clone();
+                    entryV3Copied.setUUID(UUID.randomUUID());
+                    entryV3Copied.setParent((PwGroupV3) newParent);
+                    addEntryTo(entryV3Copied, newParent);
+                    return entryV3Copied;
+                case V4:
+                    PwEntryV4 entryV4Copied = ((PwEntryV4) entryToCopy).clone();
+                    entryV4Copied.setUUID(UUID.randomUUID());
+                    entryV4Copied.setParent((PwGroupV4) newParent);
+                    addEntryTo(entryV4Copied, newParent);
+                    return entryV4Copied;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "This version of PwEntry can't be updated", e);
+        }
+        return null;
+    }
+
+    public void moveEntry(PwEntry entryToMove, PwGroup newParent) {
+        removeEntryFrom(entryToMove, entryToMove.parent);
+        addEntryTo(entryToMove, newParent);
+    }
+
+    public void moveGroup(PwGroup groupToMove, PwGroup newParent) {
+        removeGroupFrom(groupToMove, groupToMove.parent);
+        addGroupTo(groupToMove, newParent);
+    }
+
     public void deleteEntry(PwEntry entry) {
         try {
             switch (getPwDatabase().getVersion()) {

app/src/main/java/com/kunzisoft/keepass/database/ExtraFields.java

@@ -19,9 +19,12 @@
  */
 package com.kunzisoft.keepass.database;
 
-import com.kunzisoft.keepass.database.security.ProtectedString;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.kunzisoft.keepass.database.security.ProtectedString;
+import com.kunzisoft.keepass.utils.MemUtil;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -32,7 +35,7 @@ import static com.kunzisoft.keepass.database.PwEntryV4.STR_TITLE;
 import static com.kunzisoft.keepass.database.PwEntryV4.STR_URL;
 import static com.kunzisoft.keepass.database.PwEntryV4.STR_USERNAME;
 
-public class ExtraFields implements Serializable, Cloneable {
+public class ExtraFields implements Parcelable, Cloneable {
 
     private Map<String, ProtectedString> fields;
 
@@ -40,10 +43,52 @@ public class ExtraFields implements Serializable, Cloneable {
         fields = new HashMap<>();
     }
 
+    public ExtraFields(Parcel in) {
+        fields = MemUtil.readStringParcelableMap(in, ProtectedString.class);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        MemUtil.writeStringParcelableMap(dest, flags, fields);
+    }
+
+    public static final Parcelable.Creator<ExtraFields> CREATOR = new Parcelable.Creator<ExtraFields>() {
+        @Override
+        public ExtraFields createFromParcel(Parcel in) {
+            return new ExtraFields(in);
+        }
+
+        @Override
+        public ExtraFields[] newArray(int size) {
+            return new ExtraFields[size];
+        }
+    };
+
     public boolean containsCustomFields() {
         return !getCustomProtectedFields().keySet().isEmpty();
     }
 
+    public boolean containsCustomFieldsProtected() {
+        for (Map.Entry<String, ProtectedString> field : getCustomProtectedFields().entrySet()) {
+            if (field.getValue().isProtected())
+                return true;
+        }
+        return false;
+    }
+
+    public boolean containsCustomFieldsNotProtected() {
+        for (Map.Entry<String, ProtectedString> field : getCustomProtectedFields().entrySet()) {
+            if (!field.getValue().isProtected())
+                return true;
+        }
+        return false;
+    }
+
     public String getProtectedStringValue(String key) {
         ProtectedString value = fields.get(key);
         if ( value == null ) return "";

app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java

@@ -19,7 +19,6 @@
  */
 package com.kunzisoft.keepass.database;
 
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine;
 import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
 import com.kunzisoft.keepass.database.exception.KeyFileEmptyException;
 import com.kunzisoft.keepass.utils.Util;
@@ -36,7 +35,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-public abstract class PwDatabase<PwGroupDB extends PwGroup<PwGroupDB, PwGroupDB, PwEntryDB>,
+public abstract class PwDatabase<PwGroupDB extends PwGroup<PwGroupDB, PwEntryDB>,
         PwEntryDB extends PwEntry<PwGroupDB>> {
 
     public static final UUID UUID_ZERO = new UUID(0,0);
@@ -249,8 +248,6 @@ public abstract class PwDatabase<PwGroupDB extends PwGroup<PwGroupDB, PwGroupDB,
 
     public abstract List<PwEncryptionAlgorithm> getAvailableEncryptionAlgorithms();
 
-    public abstract KdfEngine getKdfEngine();
-
     public abstract List<PwGroupDB> getGrpRoots();
 
     public abstract List<PwGroupDB> getGroups();

app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3.java

@@ -47,8 +47,6 @@ package com.kunzisoft.keepass.database;
 
 import com.kunzisoft.keepass.crypto.finalkey.FinalKey;
 import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory;
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine;
-import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory;
 import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
 import com.kunzisoft.keepass.stream.NullOutputStream;
 
@@ -93,7 +91,7 @@ public class PwDatabaseV3 extends PwDatabase<PwGroupV3, PwEntryV3> {
         PwGroupV3 group = createGroup();
         group.setId(newGroupId());
         group.setName(name);
-        group.setIcon(iconFactory.getIcon(iconId));
+        group.setIconStandard(iconFactory.getIcon(iconId));
         addGroupTo(group, parent);
     }
 
@@ -102,11 +100,6 @@ public class PwDatabaseV3 extends PwDatabase<PwGroupV3, PwEntryV3> {
 		return PwVersion.V3;
 	}
 
-    @Override
-    public KdfEngine getKdfEngine() {
-        return KdfFactory.aesKdf;
-    }
-
 	@Override
 	public List<PwEncryptionAlgorithm> getAvailableEncryptionAlgorithms() {
 		List<PwEncryptionAlgorithm> list = new ArrayList<>();
@@ -183,7 +176,7 @@ public class PwDatabaseV3 extends PwDatabase<PwGroupV3, PwEntryV3> {
 		 */
 		for (int i = 0; i < entries.size(); i++) {
 			PwEntryV3 ent = entries.get(i);
-			if (ent.getGroupId() == parent.getGroupId())
+			if (ent.getParent().getGroupId() == parent.getGroupId())
 				kids.add(ent);
 		}
 		return kids;

app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java

@@ -19,17 +19,18 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.util.Log;
 import android.webkit.URLUtil;
 
 import com.kunzisoft.keepass.collections.VariantDictionary;
 import com.kunzisoft.keepass.crypto.CryptoUtil;
 import com.kunzisoft.keepass.crypto.engine.AesEngine;
 import com.kunzisoft.keepass.crypto.engine.CipherEngine;
-import com.kunzisoft.keepass.crypto.keyDerivation.AesKdf;
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine;
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory;
 import com.kunzisoft.keepass.crypto.keyDerivation.KdfParameters;
 import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
+import com.kunzisoft.keepass.database.exception.UnknownKDF;
 import com.kunzisoft.keepass.utils.EmptyUtils;
 
 import org.w3c.dom.Document;
@@ -50,6 +51,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.annotation.Nullable;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -57,6 +59,7 @@ import biz.source_code.base64Coder.Base64Coder;
 
 
 public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
+    private static final String TAG = PwDatabaseV4.class.getName();
 
 	private static final int DEFAULT_HISTORY_MAX_ITEMS = 10; // -1 unlimited
 	private static final long DEFAULT_HISTORY_MAX_SIZE = 6 * 1024 * 1024; // -1 unlimited
@@ -149,10 +152,14 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
         this.compressionAlgorithm = compressionAlgorithm;
     }
 
-    @Override
-	public KdfEngine getKdfEngine() {
-		return KdfFactory.get(getKdfParameters());
-	}
+	public @Nullable KdfEngine getKdfEngine() {
+        try {
+            return KdfFactory.getEngineV4(kdfParameters);
+        } catch (UnknownKDF unknownKDF) {
+            Log.i(TAG, "Unable to retrieve KDF engine", unknownKDF);
+            return null;
+        }
+    }
 
     public KdfParameters getKdfParameters() {
 	    return kdfParameters;
@@ -395,22 +402,8 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
 	}
 
 	public void makeFinalKey(byte[] masterSeed) throws IOException {
-    	makeFinalKey(masterSeed, 0);
-	}
 
-	public void makeFinalKey(byte[] masterSeed, long roundsFix)
-			throws IOException {
-
-        KdfEngine kdfEngine = KdfFactory.get(kdfParameters);
-		if (kdfEngine == null) {
-			throw new IOException("Unknown key derivation function");
-		}
-
-		// Set to 6000 rounds to open corrupted database
-		if (roundsFix > 0 && kdfParameters.kdfUUID.equals(AesKdf.CIPHER_UUID)) {
-            kdfParameters.setUInt32(AesKdf.ParamRounds, roundsFix);
-			numKeyEncRounds = roundsFix;
-		}
+        KdfEngine kdfEngine = KdfFactory.getEngineV4(kdfParameters);
 
 		byte[] transformedMasterKey = kdfEngine.transform(masterKey, kdfParameters);
 		if (transformedMasterKey.length != 32) {
@@ -562,15 +555,15 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
 		super.populateGlobals(currentGroup);
 	}
 	
-	/** Ensure that the recycle bin tree exists, if enabled and create it
-	 *  if it doesn't exist 
-	 *  
+	/**
+     * Ensure that the recycle bin tree exists, if enabled and create it
+     * if it doesn't exist
 	 */
 	private void ensureRecycleBin() {
 		if (getRecycleBin() == null) {
 			// Create recycle bin
 				
-			PwGroupV4 recycleBin = new PwGroupV4(RECYCLEBIN_NAME, iconFactory.getIcon(PwIconStandard.TRASH_BIN));
+			PwGroupV4 recycleBin = new PwGroupV4(RECYCLEBIN_NAME, iconFactory.getTrashIcon());
 			recycleBin.setEnableAutoType(false);
 			recycleBin.setEnableSearching(false);
 			recycleBin.setExpanded(false);
@@ -694,8 +687,7 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
 	@Override
 	public void undoDeleteEntry(PwEntryV4 entry, PwGroupV4 origParent) {
 		super.undoDeleteEntry(entry, origParent);
-		// TODO undo delete entry
-        deletedObjects.remove(entry);
+        deletedObjects.remove(new PwDeletedObject(entry.getUUID()));
 	}
 
 	@Override
@@ -744,7 +736,7 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
 
 	@Override
 	public void initNew(String dbPath) {
-		rootGroup = new PwGroupV4(dbNameFromPath(dbPath), iconFactory.getIcon(PwIconStandard.FOLDER));
+		rootGroup = new PwGroupV4(dbNameFromPath(dbPath), iconFactory.getFolderIcon());
 		groups.put(rootGroup.getId(), rootGroup);
 	}
 	

app/src/main/java/com/kunzisoft/keepass/database/PwDate.java

@@ -19,10 +19,12 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import com.kunzisoft.keepass.app.App;
 import com.kunzisoft.keepass.utils.Types;
 
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -33,15 +35,14 @@ import java.util.Date;
  * @author bpellin
  *
  */
-public class PwDate implements Cloneable, Serializable {
+public class PwDate implements Cloneable, Parcelable {
 
-	private static final int DATE_SIZE = 5; 
-	
-	private boolean cDateBuilt = false;
+	private static final int DATE_SIZE = 5;
+
+    private Date jDate;
 	private boolean jDateBuilt = false;
-	
-	private Date jDate;
-	private byte[] cDate;
+	transient private byte[] cDate;
+    transient private boolean cDateBuilt = false;
 
     public static final Date NEVER_EXPIRE = getNeverExpire();
     public static final Date DEFAULT_DATE = getDefaultDate();
@@ -93,6 +94,35 @@ public class PwDate implements Cloneable, Serializable {
 		jDate = new Date();
 		jDateBuilt = true;
 	}
+
+	protected PwDate(Parcel in) {
+		jDate = (Date) in.readSerializable();
+		jDateBuilt = in.readByte() != 0;
+        cDateBuilt = false;
+	}
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+	public void writeToParcel(Parcel dest, int flags) {
+        dest.writeSerializable(getDate());
+        dest.writeByte((byte) (jDateBuilt ? 1 : 0));
+	}
+
+	public static final Creator<PwDate> CREATOR = new Creator<PwDate>() {
+		@Override
+		public PwDate createFromParcel(Parcel in) {
+			return new PwDate(in);
+		}
+
+		@Override
+		public PwDate[] newArray(int size) {
+			return new PwDate[size];
+		}
+	};
 	
 	@Override
 	public PwDate clone() {

app/src/main/java/com/kunzisoft/keepass/database/PwDbHeaderV4.java

@@ -46,7 +46,6 @@ public class PwDbHeaderV4 extends PwDbHeader {
     private static final int FILE_VERSION_CRITICAL_MASK = 0xFFFF0000;
     public static final int FILE_VERSION_32_3 =           0x00030001;
 	public static final int FILE_VERSION_32_4 =           0x00040000;
-	public static final int FILE_VERSION_32 =             FILE_VERSION_32_4;
 
     public class PwDbHeaderV4Fields {
         public static final byte EndOfHeader = 0;
@@ -146,13 +145,13 @@ public class PwDbHeaderV4 extends PwDbHeader {
 	private int getMinKdbxVersion(PwDatabaseV4 databaseV4) {
 		// Return v4 if AES is not use
 		if (databaseV4.getKdfParameters() != null
-                && !databaseV4.getKdfParameters().kdfUUID.equals(AesKdf.CIPHER_UUID)) {
-			return PwDbHeaderV4.FILE_VERSION_32;
+                && !databaseV4.getKdfParameters().getUUID().equals(AesKdf.CIPHER_UUID)) {
+			return PwDbHeaderV4.FILE_VERSION_32_4;
 		}
 
 		// Return V4 if custom data are present
 		if (databaseV4.containsPublicCustomData()) {
-			return PwDbHeaderV4.FILE_VERSION_32;
+			return PwDbHeaderV4.FILE_VERSION_32_4;
 		}
 
 		EntryHasCustomData entryHandler = new EntryHasCustomData();
@@ -163,7 +162,7 @@ public class PwDbHeaderV4 extends PwDbHeader {
 		}
         databaseV4.getRootGroup().preOrderTraverseTree(groupHandler, entryHandler);
 		if (groupHandler.hasCustomData || entryHandler.hasCustomData) {
-			return PwDbHeaderV4.FILE_VERSION_32;
+			return PwDbHeaderV4.FILE_VERSION_32_4;
 		}
 
 		return PwDbHeaderV4.FILE_VERSION_32_3;
@@ -210,7 +209,7 @@ public class PwDbHeaderV4 extends PwDbHeader {
 	
 	private boolean readHeaderField(LEDataInputStream dis) throws IOException {
 		byte fieldID = (byte) dis.read();
-		
+
 		int fieldSize;
 		if (version < FILE_VERSION_32_4) {
 			fieldSize = dis.readUShort();
@@ -221,7 +220,7 @@ public class PwDbHeaderV4 extends PwDbHeader {
 		byte[] fieldData = null;
 		if ( fieldSize > 0 ) {
 			fieldData = new byte[fieldSize];
-			
+
 			int readSize = dis.read(fieldData);
 			if ( readSize != fieldSize ) {
 				throw new IOException("Header ended early.");
@@ -287,7 +286,7 @@ public class PwDbHeaderV4 extends PwDbHeader {
 	}
 
 	private void assignAesKdfEngineIfNotExists() {
-        if (db.getKdfParameters() == null || !db.getKdfParameters().kdfUUID.equals(KdfFactory.aesKdf.uuid)) {
+        if (db.getKdfParameters() == null || !db.getKdfParameters().getUUID().equals(KdfFactory.aesKdf.getUUID())) {
             db.setKdfParameters(KdfFactory.aesKdf.getDefaultParameters());
         }
     }
@@ -346,11 +345,11 @@ public class PwDbHeaderV4 extends PwDbHeader {
 	 * @return true if it's a supported version
 	 */
 	private boolean validVersion(long version) {
-		return ! ((version & FILE_VERSION_CRITICAL_MASK) > (FILE_VERSION_32 & FILE_VERSION_CRITICAL_MASK));
+		return ! ((version & FILE_VERSION_CRITICAL_MASK) > (FILE_VERSION_32_4 & FILE_VERSION_CRITICAL_MASK));
 	}
 
 	public static boolean matchesHeader(int sig1, int sig2) {
-	    return (sig1 == PWM_DBSIG_1) && ( (sig2 == DBSIG_PRE2) || (sig2 == DBSIG_2) ); // TODO verify add DBSIG_PRE2
+	    return (sig1 == PWM_DBSIG_1) && ( (sig2 == DBSIG_PRE2) || (sig2 == DBSIG_2) );
 	}
 
 	public static byte[] computeHeaderHmac(byte[] header, byte[] key) throws IOException{

app/src/main/java/com/kunzisoft/keepass/database/PwEntry.java

@@ -19,6 +19,8 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 import com.kunzisoft.keepass.database.iterator.EntrySearchStringIterator;
 import com.kunzisoft.keepass.database.security.ProtectedString;
 
@@ -30,6 +32,19 @@ public abstract class PwEntry<Parent extends PwGroup> extends PwNode<Parent> {
 
 	protected UUID uuid = PwDatabase.UUID_ZERO;
 
+	public PwEntry() {}
+
+	public PwEntry(Parcel in) {
+		super(in);
+		uuid = (UUID) in.readSerializable();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		super.writeToParcel(dest, flags);
+		dest.writeSerializable(uuid);
+	}
+
 	@Override
 	protected void construct(Parent parent) {
 	    super.construct(parent);
@@ -61,7 +76,7 @@ public abstract class PwEntry<Parent extends PwGroup> extends PwNode<Parent> {
     }
 
 	public void startToManageFieldReferences(PwDatabase db) {}
-	public void endToManageFieldReferences() {}
+	public void stopToManageFieldReferences() {}
 
 	public abstract String getTitle();
     public abstract void setTitle(String title);
@@ -82,15 +97,31 @@ public abstract class PwEntry<Parent extends PwGroup> extends PwNode<Parent> {
 		return getTitle().equals(PMS_TAN_ENTRY) && (getUsername().length() > 0);
 	}
 
-	@Override
-	public String getDisplayTitle() {
-		if ( isTan() ) {
-			return PMS_TAN_ENTRY + " " + getUsername();
-		} else {
-			return getTitle();
-		}
+    /**
+     * {@inheritDoc}
+     * Get the display title from an entry, <br />
+     * {@link #startToManageFieldReferences(PwDatabase)} and {@link #stopToManageFieldReferences()} must be called
+     * before and after {@link #getVisualTitle()}
+     */
+	public String getVisualTitle() {
+	    // only used to compare, don't car if it's a reference
+	    return getVisualTitle(isTan(), getTitle(), getUsername(), getUrl(), getUUID());
 	}
 
+	public static String getVisualTitle(boolean isTAN, String title, String username, String url, UUID uuid) {
+        if ( isTAN ) {
+            return PMS_TAN_ENTRY + " " + username;
+        } else {
+            if (title.isEmpty())
+                if (url.isEmpty())
+                    return uuid.toString();
+                else
+                    return url;
+            else
+                return title;
+        }
+    }
+
 	// TODO encapsulate extra fields
 
     /**
@@ -117,6 +148,22 @@ public abstract class PwEntry<Parent extends PwGroup> extends PwNode<Parent> {
 		return getFields().containsCustomFields();
 	}
 
+	/**
+	 * If entry contains extra fields that are protected
+	 * @return true if there is extra fields protected
+	 */
+	public boolean containsCustomFieldsProtected() {
+		return getFields().containsCustomFieldsProtected();
+	}
+
+	/**
+	 * If entry contains extra fields that are not protected
+	 * @return true if there is extra fields not protected
+	 */
+	public boolean containsCustomFieldsNotProtected() {
+		return getFields().containsCustomFieldsNotProtected();
+	}
+
     /**
      * Add an extra field to the list (standard or custom)
      * @param label Label of field, must be unique

app/src/main/java/com/kunzisoft/keepass/database/PwEntryV3.java

@@ -42,6 +42,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 import java.io.UnsupportedEncodingException;
 import java.util.UUID;
 
@@ -75,15 +77,11 @@ public class PwEntryV3 extends PwEntry<PwGroupV3> {
 	private static final String PMS_ID_USER    = "SYSTEM";
 	private static final String PMS_ID_URL     = "$";
 
-    // TODO Parent ID to remove
-    private int groupId;
-
     private String title;
 	private	String username;
 	private byte[] password;
 	private String url;
 	private String additional;
-
 	/** A string describing what is in pBinaryData */
 	private String           binaryDesc;
 	private byte[]          binaryData;
@@ -94,12 +92,45 @@ public class PwEntryV3 extends PwEntry<PwGroupV3> {
 	
 	public PwEntryV3(PwGroupV3 p) {
 	    construct(p);
-		groupId = ((PwGroupIdV3) this.parent.getId()).getId(); // TODO remove
 	}
 
+    public PwEntryV3(Parcel in) {
+        super(in);
+        title = in.readString();
+        username = in.readString();
+        in.readByteArray(password);
+        url = in.readString();
+        additional = in.readString();
+        binaryDesc = in.readString();
+        in.readByteArray(binaryData);
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeString(title);
+        dest.writeString(username);
+        dest.writeByteArray(password);
+        dest.writeString(url);
+        dest.writeString(additional);
+        dest.writeString(binaryDesc);
+        dest.writeByteArray(binaryData);
+    }
+
+    public static final Creator<PwEntryV3> CREATOR = new Creator<PwEntryV3>() {
+        @Override
+        public PwEntryV3 createFromParcel(Parcel in) {
+            return new PwEntryV3(in);
+        }
+
+        @Override
+        public PwEntryV3[] newArray(int size) {
+            return new PwEntryV3[size];
+        }
+    };
+
     protected void updateWith(PwEntryV3 source) {
         super.assign(source);
-        groupId = source.groupId;
 
         title = source.title;
         username = source.username;
@@ -145,12 +176,9 @@ public class PwEntryV3 extends PwEntry<PwGroupV3> {
         return newEntry;
     }
 
-    public int getGroupId() {
-	    return groupId;
-    }
-
     public void setGroupId(int groupId) {
-	    this.groupId = groupId;
+	    this.parent = new PwGroupV3();
+	    this.parent.setGroupId(groupId);
     }
 
     @Override
@@ -199,7 +227,7 @@ public class PwEntryV3 extends PwEntry<PwGroupV3> {
     public void populateBlankFields(PwDatabaseV3 db) {
 	    // TODO verify and remove
         if (icon == null) {
-            icon = db.getIconFactory().getFirstIcon();
+            icon = db.getIconFactory().getKeyIcon();
         }
 
         if (username == null) {

app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java

@@ -19,8 +19,11 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 import com.kunzisoft.keepass.database.security.ProtectedBinary;
 import com.kunzisoft.keepass.database.security.ProtectedString;
+import com.kunzisoft.keepass.utils.MemUtil;
 import com.kunzisoft.keepass.utils.SprEngineV4;
 
 import java.util.ArrayList;
@@ -37,7 +40,7 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 	public static final String STR_URL = "URL";
 	public static final String STR_NOTES = "Notes";
 
-	// To decode each field not serializable
+	// To decode each field not parcelable
     private transient PwDatabaseV4 mDatabase = null;
     private transient boolean mDecodeRef = false;
 
@@ -45,7 +48,6 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
     private long usageCount = 0;
     private PwDate parentGroupLastMod = new PwDate();
     private Map<String, String> customData = new HashMap<>();
-
     private ExtraFields fields = new ExtraFields();
     private HashMap<String, ProtectedBinary> binaries = new HashMap<>();
 	private String foregroundColor = "";
@@ -53,7 +55,6 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 	private String overrideURL = "";
 	private AutoType autoType = new AutoType();
 	private ArrayList<PwEntryV4> history = new ArrayList<>();
-
 	private String url = "";
 	private String additional = "";
 	private String tags = "";
@@ -71,8 +72,8 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
         customIcon = source.customIcon;
         usageCount = source.usageCount;
         parentGroupLastMod = source.parentGroupLastMod;
-        // TODO customData
-
+        customData.clear();
+		customData.putAll(source.customData); // Add all custom elements in map
         fields = source.fields;
         binaries = source.binaries;
         foregroundColor = source.foregroundColor;
@@ -80,12 +81,61 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
         overrideURL = source.overrideURL;
         autoType = source.autoType;
         history = source.history;
-
         url = source.url;
         additional = source.additional;
         tags = source.tags;
     }
 
+	public PwEntryV4(Parcel in) {
+		super(in);
+		customIcon = in.readParcelable(PwIconCustom.class.getClassLoader());
+		usageCount = in.readLong();
+		parentGroupLastMod = in.readParcelable(PwDate.class.getClassLoader());
+		customData = MemUtil.readStringParcelableMap(in);
+		fields = in.readParcelable(ExtraFields.class.getClassLoader());
+		// TODO binaries takes too much memory for parcelable
+		// binaries = MemUtil.readStringParcelableMap(in, ProtectedBinary.class);
+		foregroundColor = in.readString();
+		backgroupColor = in.readString();
+		overrideURL = in.readString();
+		autoType = in.readParcelable(AutoType.class.getClassLoader());
+		history = in.readArrayList(PwEntryV4.class.getClassLoader()); // TODO verify
+		url = in.readString();
+		additional = in.readString();
+		tags = in.readString();
+	}
+
+	@Override
+	public void writeToParcel(Parcel dest, int flags) {
+		super.writeToParcel(dest, flags);
+		dest.writeParcelable(customIcon, flags);
+		dest.writeLong(usageCount);
+		dest.writeParcelable(parentGroupLastMod, flags);
+		MemUtil.writeStringParcelableMap(dest, customData);
+		dest.writeParcelable(fields, flags);
+        // TODO MemUtil.writeStringParcelableMap(dest, flags, binaries);
+		dest.writeString(foregroundColor);
+		dest.writeString(backgroupColor);
+		dest.writeString(overrideURL);
+		dest.writeParcelable(autoType, flags);
+		dest.writeList(history);
+		dest.writeString(url);
+		dest.writeString(additional);
+		dest.writeString(tags);
+	}
+
+	public static final Creator<PwEntryV4> CREATOR = new Creator<PwEntryV4>() {
+		@Override
+		public PwEntryV4 createFromParcel(Parcel in) {
+			return new PwEntryV4(in);
+		}
+
+		@Override
+		public PwEntryV4[] newArray(int size) {
+			return new PwEntryV4[size];
+		}
+	};
+
     @SuppressWarnings("unchecked")
     @Override
     public PwEntryV4 clone() {
@@ -120,7 +170,7 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 	}
 
 	@Override
-	public void endToManageFieldReferences() {
+	public void stopToManageFieldReferences() {
         this.mDatabase = null;
         this.mDecodeRef = false;
 	}
@@ -156,41 +206,31 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 
 	@Override
 	public void setTitle(String title) {
-		PwDatabaseV4 db = mDatabase;
-		boolean protect = db.getMemoryProtection().protectTitle;
-		
+		boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectTitle;
 		setProtectedString(STR_TITLE, title, protect);
 	}
 
 	@Override
 	public void setUsername(String user) {
-		PwDatabaseV4 db = mDatabase;
-		boolean protect = db.getMemoryProtection().protectUserName;
-		
+		boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectUserName;
 		setProtectedString(STR_USERNAME, user, protect);
 	}
 
 	@Override
 	public void setPassword(String pass) {
-		PwDatabaseV4 db = mDatabase;
-		boolean protect = db.getMemoryProtection().protectPassword;
-		
+		boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectPassword;
 		setProtectedString(STR_PASSWORD, pass, protect);
 	}
 
 	@Override
 	public void setUrl(String url) {
-		PwDatabaseV4 db = mDatabase;
-		boolean protect = db.getMemoryProtection().protectUrl;
-		
+		boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectUrl;
 		setProtectedString(STR_URL, url, protect);
 	}
 
 	@Override
 	public void setNotes(String notes) {
-		PwDatabaseV4 db = mDatabase;
-		boolean protect = db.getMemoryProtection().protectNotes;
-		
+		boolean protect = (mDatabase != null) && mDatabase.getMemoryProtection().protectNotes;
 		setProtectedString(STR_NOTES, notes, protect);
 	}
 
@@ -202,14 +242,6 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 		fields.putProtectedString(key, value, protect);
 	}
 
-	public PwIconCustom getCustomIcon() {
-	    return customIcon;
-    }
-
-    public void setCustomIcon(PwIconCustom icon) {
-	    this.customIcon = icon;
-    }
-
 	public PwDate getLocationChanged() {
 		return parentGroupLastMod;
 	}
@@ -236,15 +268,28 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 		return decodeRefKey(mDecodeRef, STR_URL);
 	}
 
-	@Override
+    @Override
 	public PwIcon getIcon() {
-		if (customIcon == null || customIcon.uuid.equals(PwDatabase.UUID_ZERO)) {
+		if (customIcon == null || customIcon.isUnknown()) {
 			return super.getIcon();
 		} else {
 			return customIcon;
 		}
 	}
 
+	public void setIconCustom(PwIconCustom icon) {
+		this.customIcon = icon;
+	}
+
+	public PwIconCustom getIconCustom() {
+		return customIcon;
+	}
+
+	public void setIconStandard(PwIconStandard icon) {
+		this.icon = icon;
+		this.customIcon = PwIconCustom.ZERO;
+	}
+
 	@Override
 	public boolean allowExtraFields() {
 		return true;

app/src/main/java/com/kunzisoft/keepass/database/PwGroup.java

@@ -19,16 +19,34 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class PwGroup<Parent extends PwGroup, ChildGroup extends PwGroup, ChildEntry extends PwEntry>
-        extends PwNode<Parent> {
+public abstract class PwGroup<GroupG extends PwGroup, EntryE extends PwEntry>
+        extends PwNode<GroupG> {
 
     protected String name = "";
 
-	protected List<ChildGroup> childGroups = new ArrayList<>();
-	protected List<ChildEntry> childEntries = new ArrayList<>();
+    // TODO verify children not needed
+	transient protected List<GroupG> childGroups = new ArrayList<>();
+    transient protected List<EntryE> childEntries = new ArrayList<>();
+
+    protected PwGroup() {
+        super();
+    }
+
+    protected PwGroup(Parcel in) {
+        super(in);
+        name = in.readString();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeString(name);
+    }
 
     @Override
     public PwGroup clone() {
@@ -36,48 +54,48 @@ public abstract class PwGroup<Parent extends PwGroup, ChildGroup extends PwGroup
         return (PwGroup) super.clone();
     }
 
-    protected void assign(PwGroup<Parent, ChildGroup, ChildEntry> source) {
+    protected void assign(PwGroup<GroupG, EntryE> source) {
         super.assign(source);
         name = source.name;
     }
 
-    public List<ChildGroup> getChildGroups() {
+    public List<GroupG> getChildGroups() {
         return childGroups;
     }
 
-    public List<ChildEntry> getChildEntries() {
+    public List<EntryE> getChildEntries() {
         return childEntries;
     }
 
-    public void setGroups(List<ChildGroup> groups) {
+    public void setGroups(List<GroupG> groups) {
         childGroups = groups;
     }
 
-    public void setEntries(List<ChildEntry> entries) {
+    public void setEntries(List<EntryE> entries) {
         childEntries = entries;
     }
 
-    public void addChildGroup(ChildGroup group) {
+    public void addChildGroup(GroupG group) {
         this.childGroups.add(group);
     }
 
-    public void addChildEntry(ChildEntry entry) {
+    public void addChildEntry(EntryE entry) {
         this.childEntries.add(entry);
     }
 
-    public ChildGroup getChildGroupAt(int number) {
+    public GroupG getChildGroupAt(int number) {
         return this.childGroups.get(number);
     }
 
-    public ChildEntry getChildEntryAt(int number) {
+    public EntryE getChildEntryAt(int number) {
         return this.childEntries.get(number);
     }
 
-    public void removeChildGroup(ChildGroup group) {
+    public void removeChildGroup(GroupG group) {
         this.childGroups.remove(group);
     }
 
-    public void removeChildEntry(ChildEntry entry) {
+    public void removeChildEntry(EntryE entry) {
         this.childEntries.remove(entry);
     }
 
@@ -101,7 +119,7 @@ public abstract class PwGroup<Parent extends PwGroup, ChildGroup extends PwGroup
     public List<PwNode> getDirectChildren() {
         List<PwNode> children = new ArrayList<>();
         children.addAll(childGroups);
-        for(ChildEntry child : childEntries) {
+        for(EntryE child : childEntries) {
             if (!child.isMetaStream())
             children.add(child);
         }
@@ -112,10 +130,18 @@ public abstract class PwGroup<Parent extends PwGroup, ChildGroup extends PwGroup
 	public abstract void setId(PwGroupId id);
 
     @Override
-    public String getDisplayTitle() {
+    protected String getVisualTitle() {
+        return getTitle();
+    }
+
+    @Override
+    public String getTitle() {
         return getName();
     }
 
+    /**
+     * The same thing as {@link #getTitle()}
+     */
     public String getName() {
         return name;
     }
@@ -128,15 +154,15 @@ public abstract class PwGroup<Parent extends PwGroup, ChildGroup extends PwGroup
 		return false;
 	}
 
-	public boolean preOrderTraverseTree(GroupHandler<ChildGroup> groupHandler,
-                                        EntryHandler<ChildEntry> entryHandler) {
+	public boolean preOrderTraverseTree(GroupHandler<GroupG> groupHandler,
+                                        EntryHandler<EntryE> entryHandler) {
 		if (entryHandler != null) {
-			for (ChildEntry entry : childEntries) {
+			for (EntryE entry : childEntries) {
 				if (!entryHandler.operate(entry)) return false;
 			}
 		}
 	
-		for (ChildGroup group : childGroups) {
+		for (GroupG group : childGroups) {
 			if ((groupHandler != null) && !groupHandler.operate(group)) return false;
 			group.preOrderTraverseTree(groupHandler, entryHandler);
 		}

app/src/main/java/com/kunzisoft/keepass/database/PwGroupId.java

@@ -19,8 +19,20 @@
  */
 package com.kunzisoft.keepass.database;
 
-import java.io.Serializable;
+import android.os.Parcel;
+import android.os.Parcelable;
 
-public abstract class PwGroupId implements Serializable {
+public abstract class PwGroupId implements Parcelable {
 
+    public PwGroupId() {}
+
+    public PwGroupId(Parcel in) {}
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {}
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 }

app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV3.java

@@ -19,13 +19,39 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 public class PwGroupIdV3 extends PwGroupId {
 
 	private int id;
 	
-	public PwGroupIdV3(int i) {
-		id = i;
+	public PwGroupIdV3(int groupId) {
+	    super();
+		this.id = groupId;
 	}
+
+	public PwGroupIdV3(Parcel in) {
+        super(in);
+        id = in.readInt();
+	}
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeInt(id);
+    }
+
+    public static final Creator<PwGroupIdV3> CREATOR = new Creator<PwGroupIdV3>() {
+        @Override
+        public PwGroupIdV3 createFromParcel(Parcel in) {
+            return new PwGroupIdV3(in);
+        }
+
+        @Override
+        public PwGroupIdV3[] newArray(int size) {
+            return new PwGroupIdV3[size];
+        }
+    };
 	
 	@Override
 	public boolean equals(Object compare) {

app/src/main/java/com/kunzisoft/keepass/database/PwGroupIdV4.java

@@ -19,15 +19,42 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 import java.util.UUID;
 
 public class PwGroupIdV4 extends PwGroupId {
+
 	private UUID uuid;
 	
-	public PwGroupIdV4(UUID u) {
-		uuid = u;
+	public PwGroupIdV4(UUID uuid) {
+	    super();
+        this.uuid = uuid;
 	}
-	
+
+	public PwGroupIdV4(Parcel in) {
+	    super(in);
+		uuid = (UUID) in.readSerializable();
+	}
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+	    super.writeToParcel(dest, flags);
+        dest.writeSerializable(uuid);
+    }
+
+    public static final Creator<PwGroupIdV4> CREATOR = new Creator<PwGroupIdV4>() {
+        @Override
+        public PwGroupIdV4 createFromParcel(Parcel in) {
+            return new PwGroupIdV4(in);
+        }
+
+        @Override
+        public PwGroupIdV4[] newArray(int size) {
+            return new PwGroupIdV4[size];
+        }
+    };
+
 	@Override
 	public boolean equals(Object id) {
 		if ( ! (id instanceof PwGroupIdV4) ) {
@@ -36,12 +63,12 @@ public class PwGroupIdV4 extends PwGroupId {
 		PwGroupIdV4 v4 = (PwGroupIdV4) id;
 		return uuid.equals(v4.uuid);
 	}
-	
+
 	@Override
 	public int hashCode() {
 		return uuid.hashCode();
 	}
-	
+
 	public UUID getId() {
 		return uuid;
 	}

app/src/main/java/com/kunzisoft/keepass/database/PwGroupV3.java

@@ -20,19 +20,13 @@
 
 package com.kunzisoft.keepass.database;
 
-/**
- * @author Brian Pellin <bpellin@gmail.com>
- * @author Naomaru Itoi <nao@phoneid.org>
- * @author Bill Zwicky <wrzwicky@pobox.com>
- * @author Dominik Reichl <dominik.reichl@t-online.de>
- */
-public class PwGroupV3 extends PwGroup<PwGroupV3, PwGroupV3, PwEntryV3> {
+import android.os.Parcel;
+
+public class PwGroupV3 extends PwGroup<PwGroupV3, PwEntryV3> {
 
 	// for tree traversing
 	private int groupId;
-
 	private int level = 0; // short
-
 	/** Used by KeePass internally, don't use */
 	private int flags;
 
@@ -40,6 +34,33 @@ public class PwGroupV3 extends PwGroup<PwGroupV3, PwGroupV3, PwEntryV3> {
         super();
     }
 
+    public PwGroupV3(Parcel in) {
+        super(in);
+        groupId = in.readInt();
+        level = in.readInt();
+        flags = in.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeInt(groupId);
+        dest.writeInt(level);
+        dest.writeInt(flags);
+    }
+
+    public static final Creator<PwGroupV3> CREATOR = new Creator<PwGroupV3>() {
+        @Override
+        public PwGroupV3 createFromParcel(Parcel in) {
+            return new PwGroupV3(in);
+        }
+
+        @Override
+        public PwGroupV3[] newArray(int size) {
+            return new PwGroupV3[size];
+        }
+    };
+
     public PwGroupV3(PwGroupV3 p) {
         construct(p);
     }
@@ -109,7 +130,7 @@ public class PwGroupV3 extends PwGroup<PwGroupV3, PwGroupV3, PwEntryV3> {
     public void populateBlankFields(PwDatabaseV3 db) {
 	    // TODO populate blanck field
         if (icon == null) {
-            icon = db.getIconFactory().getFirstIcon();
+            icon = db.getIconFactory().getFolderIcon();
         }
 
         if (name == null) {

app/src/main/java/com/kunzisoft/keepass/database/PwGroupV4.java

@@ -19,11 +19,15 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
+import com.kunzisoft.keepass.utils.MemUtil;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-public class PwGroupV4 extends PwGroup<PwGroupV4, PwGroupV4, PwEntryV4> implements ITimeLogger {
+public class PwGroupV4 extends PwGroup<PwGroupV4, PwEntryV4> implements ITimeLogger {
 
 	public static final boolean DEFAULT_SEARCHING_ENABLED = true;
 
@@ -32,9 +36,7 @@ public class PwGroupV4 extends PwGroup<PwGroupV4, PwGroupV4, PwEntryV4> implemen
     private long usageCount = 0;
     private PwDate parentGroupLastMod = new PwDate();
     private Map<String, String> customData = new HashMap<>();
-
     private boolean expires = false;
-
     private String notes = "";
 	private boolean isExpanded = true;
 	private String defaultAutoTypeSequence = "";
@@ -57,6 +59,53 @@ public class PwGroupV4 extends PwGroup<PwGroupV4, PwGroupV4, PwEntryV4> implemen
 		this.icon = icon;
 	}
 
+    public PwGroupV4(Parcel in) {
+        super(in);
+        uuid = (UUID) in.readSerializable();
+        customIcon = in.readParcelable(PwIconCustom.class.getClassLoader());
+        usageCount = in.readLong();
+        parentGroupLastMod = in.readParcelable(PwDate.class.getClassLoader());
+        // TODO customData = MemUtil.readStringParcelableMap(in);
+        expires = in.readByte() != 0;
+        notes = in.readString();
+        isExpanded = in.readByte() != 0;
+        defaultAutoTypeSequence = in.readString();
+        byte autoTypeByte = in.readByte();
+        enableAutoType = (autoTypeByte == -1) ? null : autoTypeByte != 0;
+        byte enableSearchingByte = in.readByte();
+        enableSearching = (enableSearchingByte == -1) ? null : enableSearchingByte != 0;
+        lastTopVisibleEntry = (UUID) in.readSerializable();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeSerializable(uuid);
+        dest.writeParcelable(customIcon, flags);
+        dest.writeLong(usageCount);
+        dest.writeParcelable(parentGroupLastMod, flags);
+        // TODO MemUtil.writeStringParcelableMap(dest, customData);
+        dest.writeByte((byte) (expires ? 1 : 0));
+        dest.writeString(notes);
+        dest.writeByte((byte) (isExpanded ? 1 : 0));
+        dest.writeString(defaultAutoTypeSequence);
+        dest.writeByte((byte) (enableAutoType == null ? -1 : (enableAutoType ? 1 : 0)));
+        dest.writeByte((byte) (enableAutoType == null ? -1 : (enableAutoType ? 1 : 0)));
+        dest.writeSerializable(lastTopVisibleEntry);
+    }
+
+    public static final Creator<PwGroupV4> CREATOR = new Creator<PwGroupV4>() {
+        @Override
+        public PwGroupV4 createFromParcel(Parcel in) {
+            return new PwGroupV4(in);
+        }
+
+        @Override
+        public PwGroupV4[] newArray(int size) {
+            return new PwGroupV4[size];
+        }
+    };
+
     protected void updateWith(PwGroupV4 source) {
         super.assign(source);
         uuid = source.uuid;
@@ -120,14 +169,6 @@ public class PwGroupV4 extends PwGroup<PwGroupV4, PwGroupV4, PwEntryV4> implemen
         this.uuid = uuid;
     }
 
-    public PwIconCustom getCustomIcon() {
-        return customIcon;
-    }
-
-    public void setCustomIcon(PwIconCustom icon) {
-        this.customIcon = icon;
-    }
-
 	@Override
 	public PwGroupId getId() {
 		return new PwGroupIdV4(uuid);
@@ -176,13 +217,26 @@ public class PwGroupV4 extends PwGroup<PwGroupV4, PwGroupV4, PwEntryV4> implemen
 
 	@Override
 	public PwIcon getIcon() {
-		if (customIcon == null || customIcon.uuid.equals(PwDatabase.UUID_ZERO)) {
+		if (customIcon == null || customIcon.getUUID().equals(PwDatabase.UUID_ZERO)) {
 			return super.getIcon();
 		} else {
 			return customIcon;
 		}
 	}
 
+    public PwIconCustom getIconCustom() {
+        return customIcon;
+    }
+
+    public void setIconCustom(PwIconCustom icon) {
+        this.customIcon = icon;
+    }
+
+    public void setIconStandard(PwIconStandard icon) { // TODO Encapsulate with PwEntryV4
+        this.icon = icon;
+        this.customIcon = PwIconCustom.ZERO;
+    }
+
     public void putCustomData(String key, String value) {
         customData.put(key, value);
     }

app/src/main/java/com/kunzisoft/keepass/database/PwIcon.java

@@ -19,11 +19,23 @@
  */
 package com.kunzisoft.keepass.database;
 
-import java.io.Serializable;
+import android.os.Parcel;
+import android.os.Parcelable;
 
-public abstract class PwIcon implements Serializable {
+public abstract class PwIcon implements Parcelable {
 
 	public boolean isMetaStreamIcon() {
 		return false;
 	}
+
+    protected PwIcon() {}
+
+    protected PwIcon(Parcel in) {}
+
+	public abstract boolean isUnknown();
+
+	@Override
+	public int describeContents() {
+		return 0;
+	}
 }

app/src/main/java/com/kunzisoft/keepass/database/PwIconCustom.java

@@ -19,25 +19,71 @@
  */
 package com.kunzisoft.keepass.database;
 
+import android.os.Parcel;
+
 import java.util.UUID;
 
 public class PwIconCustom extends PwIcon {
 	public static final PwIconCustom ZERO = new PwIconCustom(PwDatabase.UUID_ZERO, new byte[0]);
 	
-	public final UUID uuid;
-	public byte[] imageData;
+	private final UUID uuid;
+	transient private byte[] imageData;
 	
-	public PwIconCustom(UUID u, byte[] data) {
-		uuid = u;
-		imageData = data;
+	public PwIconCustom(UUID uuid, byte[] data) {
+	    super();
+		this.uuid = uuid;
+		this.imageData = data;
 	}
 
     public PwIconCustom(PwIconCustom icon) {
+	    super();
         uuid = icon.uuid;
         imageData = icon.imageData;
     }
 
+	protected PwIconCustom(Parcel in) {
+	    super(in);
+        uuid = (UUID) in.readSerializable();
+        // TODO Take too much memories
+        // in.readByteArray(imageData);
+	}
+
 	@Override
+	public boolean isUnknown() {
+		return uuid == null || this.equals(ZERO);
+	}
+
+    public UUID getUUID() {
+        return uuid;
+    }
+
+    public byte[] getImageData() {
+        return imageData;
+    }
+
+    public void setImageData(byte[] imageData) {
+        this.imageData = imageData;
+    }
+
+    @Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeSerializable(uuid);
+		// Too big for a parcelable dest.writeByteArray(imageData);
+	}
+
+    public static final Creator<PwIconCustom> CREATOR = new Creator<PwIconCustom>() {
+        @Override
+        public PwIconCustom createFromParcel(Parcel in) {
+            return new PwIconCustom(in);
+        }
+
+        @Override
+        public PwIconCustom[] newArray(int size) {
+            return new PwIconCustom[size];
+        }
+    };
+
+    @Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
@@ -55,10 +101,7 @@ public class PwIconCustom extends PwIcon {
 			return false;
 		PwIconCustom other = (PwIconCustom) obj;
 		if (uuid == null) {
-			if (other.uuid != null)
-				return false;
-		} else if (!uuid.equals(other.uuid))
-			return false;
-		return true;
+			return other.uuid == null;
+		} else return uuid.equals(other.uuid);
 	}
 }

app/src/main/java/com/kunzisoft/keepass/database/PwIconFactory.java

@@ -37,20 +37,27 @@ public class PwIconFactory {
 	 */
 	private ReferenceMap customCache = new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK);
 
-	public PwIconStandard getFirstIcon() {
-		return getIcon(0);
+    public PwIconStandard getUnknownIcon() {
+        return getIcon(PwIconStandard.UNKNOWN);
+    }
+
+	public PwIconStandard getKeyIcon() {
+		return getIcon(PwIconStandard.KEY);
+	}
+
+	public PwIconStandard getTrashIcon() {
+		return getIcon(PwIconStandard.TRASH);
+	}
+
+    public PwIconStandard getFolderIcon() {
+		return getIcon(PwIconStandard.FOLDER);
 	}
 
 	public PwIconStandard getIcon(int iconId) {
 		PwIconStandard icon = (PwIconStandard) cache.get(iconId);
 		
 		if (icon == null) {
-			if (iconId == 1) {
-				icon = PwIconStandard.FIRST;
-			}
-			else {
-				icon = new PwIconStandard(iconId);
-			}
+			icon = new PwIconStandard(iconId);
 			cache.put(iconId, icon);
 		}
 		
@@ -68,25 +75,8 @@ public class PwIconFactory {
 		return icon;
 	}
 	
-	public PwIconCustom getIcon(UUID iconUuid, byte[] data) {
-		PwIconCustom icon = (PwIconCustom) customCache.get(iconUuid);
-		
-		if (icon == null) {
-			icon = new PwIconCustom(iconUuid, data);
-			customCache.put(iconUuid, icon);
-		} else {
-			icon.imageData = data;
-		}
-		
-		return icon;
-	}
-	
-	public void setIconData(UUID iconUuid, byte[] data) {
-		getIcon(iconUuid, data);
-	}
-	
 	public void put(PwIconCustom icon) {
-		customCache.put(icon.uuid, icon);
+		customCache.put(icon.getUUID(), icon);
 	}
 
 }

app/src/main/java/com/kunzisoft/keepass/database/PwIconStandard.java

@@ -19,15 +19,20 @@
  */
 package com.kunzisoft.keepass.database;
 
-public class PwIconStandard extends PwIcon {
-	public final int iconId;
+import android.os.Parcel;
 
-	// The first is number 0
-	public static PwIconStandard FIRST = new PwIconStandard(0);
-	
-	public static final int TRASH_BIN = 43;
+public class PwIconStandard extends PwIcon {
+	private final int iconId;
+
+	public static final int UNKNOWN = -1;
+	public static final int KEY = 0;
+	public static final int TRASH = 43;
 	public static final int FOLDER = 48;
-	
+
+	public PwIconStandard() {
+		this.iconId = KEY;
+	}
+
 	public PwIconStandard(int iconId) {
 		this.iconId = iconId;
 	}
@@ -36,6 +41,37 @@ public class PwIconStandard extends PwIcon {
         this.iconId = icon.iconId;
     }
 
+	protected PwIconStandard(Parcel in) {
+		super(in);
+		iconId = in.readInt();
+	}
+
+	@Override
+	public boolean isUnknown() {
+	    return iconId == UNKNOWN;
+    }
+
+    public int getIconId() {
+        return iconId;
+    }
+
+    @Override
+	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeInt(iconId);
+	}
+
+	public static final Creator<PwIconStandard> CREATOR = new Creator<PwIconStandard>() {
+		@Override
+		public PwIconStandard createFromParcel(Parcel in) {
+			return new PwIconStandard(in);
+		}
+
+		@Override
+		public PwIconStandard[] newArray(int size) {
+			return new PwIconStandard[size];
+		}
+	};
+
 	@Override
 	public boolean isMetaStreamIcon() {
 		return iconId == 0;

app/src/main/java/com/kunzisoft/keepass/database/PwNode.java

@@ -20,33 +20,69 @@
  */
 package com.kunzisoft.keepass.database;
 
-import org.joda.time.LocalDate;
+import android.os.Parcel;
+import android.os.Parcelable;
 
-import java.io.Serializable;
+import com.kunzisoft.keepass.app.App;
+
+import org.joda.time.LocalDate;
 
 /**
  * Abstract class who manage Groups and Entries
  */
-public abstract class PwNode<Parent extends PwGroup> implements ISmallTimeLogger, Serializable, Cloneable {
+public abstract class PwNode<Parent extends PwGroup> implements ISmallTimeLogger, Parcelable, Cloneable {
 
     protected Parent parent = null;
-
-    protected PwIconStandard icon = PwIconStandard.FIRST;
-
+    protected PwIconStandard icon = new PwIconStandard();
     protected PwDate creation = new PwDate();
     protected PwDate lastMod = new PwDate();
     protected PwDate lastAccess = new PwDate();
     protected PwDate expireDate = PwDate.PW_NEVER_EXPIRE;
 
+    protected PwNode() {}
+
+    protected PwNode(Parcel in) {
+        // TODO better technique ?
+        try {
+            PwGroupId pwGroupId = in.readParcelable(PwGroupId.class.getClassLoader());
+            parent = (Parent) App.getDB().getPwDatabase().getGroupByGroupId(pwGroupId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        icon = in.readParcelable(PwIconStandard.class.getClassLoader());
+        creation = in.readParcelable(PwDate.class.getClassLoader());
+        lastMod = in.readParcelable(PwDate.class.getClassLoader());
+        lastAccess = in.readParcelable(PwDate.class.getClassLoader());
+        expireDate = in.readParcelable(PwDate.class.getClassLoader());
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        PwGroupId parentId = null;
+        if (parent != null)
+            parentId = parent.getId();
+        dest.writeParcelable(parentId, flags);
+
+        dest.writeParcelable(icon, flags);
+        dest.writeParcelable(creation, flags);
+        dest.writeParcelable(lastMod, flags);
+        dest.writeParcelable(lastAccess, flags);
+        dest.writeParcelable(expireDate, flags);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
     protected void construct(Parent parent) {
         this.parent = parent;
     }
 
     protected void assign(PwNode<Parent> source) {
         this.parent = source.parent;
-
         this.icon = source.icon;
-
         this.creation = source.creation;
         this.lastMod = source.lastMod;
         this.lastAccess = source.lastAccess;
@@ -59,9 +95,7 @@ public abstract class PwNode<Parent extends PwGroup> implements ISmallTimeLogger
         try {
             newNode = (PwNode) super.clone();
             // newNode.parent stay the same in copy
-
             newNode.icon = new PwIconStandard(this.icon);
-
             newNode.creation = creation.clone();
             newNode.lastMod = lastMod.clone();
             newNode.lastAccess = lastAccess.clone();
@@ -85,22 +119,27 @@ public abstract class PwNode<Parent extends PwGroup> implements ISmallTimeLogger
     public abstract Type getType();
 
     /**
-     * @return Title to display as view
+     * @return Title
      */
-    public abstract String getDisplayTitle();
+    public abstract String getTitle();
+
+    /**
+     * @return Title to display, typically return alternative title if {@link #getTitle()} is empty
+     */
+    protected abstract String getVisualTitle();
 
     /**
      * @return Visual icon
      */
     public PwIcon getIcon() {
-        return icon;
+        return getIconStandard();
     }
 
     public PwIconStandard getIconStandard() {
         return icon;
     }
 
-    public void setIcon(PwIconStandard icon) {
+    public void setIconStandard(PwIconStandard icon) {
         this.icon = icon;
     }
 
@@ -119,6 +158,13 @@ public abstract class PwNode<Parent extends PwGroup> implements ISmallTimeLogger
         parent = prt;
     }
 
+    /**
+     * @return true if parent is present (can be a root or a detach element)
+     */
+    public boolean containsParent() {
+        return getParent() != null;
+    }
+
     public PwDate getCreationTime() {
         return creation;
     }
@@ -169,7 +215,7 @@ public abstract class PwNode<Parent extends PwGroup> implements ISmallTimeLogger
      */
     public boolean isContentVisuallyTheSame(PwNode o) {
         return getType().equals(o.getType())
-                && getDisplayTitle().equals(o.getDisplayTitle())
+                && getVisualTitle().equals(o.getVisualTitle())
                 && getIcon().equals(o.getIcon());
     }
 

app/src/main/java/com/kunzisoft/keepass/database/SortNodeEnum.java

@@ -109,8 +109,8 @@ public enum SortNodeEnum {
                     new EntryNameComparator(ascending),
                     object1,
                     object2,
-                    object1.getDisplayTitle()
-                            .compareToIgnoreCase(object2.getDisplayTitle()));
+                    object1.getTitle()
+                            .compareToIgnoreCase(object2.getTitle()));
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/database/action/ActionWithSaveDatabaseRunnable.java

@@ -0,0 +1,47 @@
+package com.kunzisoft.keepass.database.action;
+
+import android.content.Context;
+
+import com.kunzisoft.keepass.database.Database;
+
+public abstract class ActionWithSaveDatabaseRunnable extends RunnableOnFinish {
+
+    protected Context mContext;
+    protected boolean mDontSave;
+    protected Database mDatabase;
+
+    public ActionWithSaveDatabaseRunnable(Context context, Database database, OnFinishRunnable finish, boolean dontSave) {
+        super(finish);
+
+        this.mDatabase = database;
+        this.mContext = context;
+        this.mDontSave = dontSave;
+        this.mFinish = new AfterActionRunnable(finish);
+    }
+
+    @Override
+    public void run() {
+        // Commit to disk
+        SaveDatabaseRunnable save = new SaveDatabaseRunnable(mContext, mDatabase, mFinish, mDontSave);
+        save.run();
+    }
+
+    public void runWithoutSaveDatabase() {
+        mFinish.run();
+    }
+
+    abstract protected void onFinish(boolean success, String message);
+
+    private class AfterActionRunnable extends OnFinishRunnable {
+
+        AfterActionRunnable(OnFinishRunnable finish) {
+            super(finish);
+        }
+
+        @Override
+        public void run() {
+            onFinish(mSuccess, mMessage);
+            super.run();
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/action/AssignPasswordInDBRunnable.java

@@ -1,116 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.action;
-
-import android.content.Context;
-import android.net.Uri;
-
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwDatabase;
-import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
-import com.kunzisoft.keepass.utils.UriUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class AssignPasswordInDBRunnable extends RunnableOnFinish {
-	
-	private String mPassword;
-	private Uri mKeyfile;
-	private Database mDb;
-	private boolean mDontSave;
-	private Context ctx;
-	
-	public AssignPasswordInDBRunnable(Context ctx, Database db, String password, Uri keyfile, OnFinishRunnable finish) {
-		this(ctx, db, password, keyfile, finish, false);
-		
-	}
-
-	public AssignPasswordInDBRunnable(Context ctx, Database db, String password, Uri keyfile, OnFinishRunnable finish, boolean dontSave) {
-		super(finish);
-		
-		mDb = db;
-		mPassword = password;
-		mKeyfile = keyfile;
-		mDontSave = dontSave;
-		this.ctx = ctx;
-	}
-	
-	@Override
-	public void run() {
-		PwDatabase pm = mDb.getPwDatabase();
-		
-		byte[] backupKey = new byte[pm.getMasterKey().length];
-		System.arraycopy(pm.getMasterKey(), 0, backupKey, 0, backupKey.length);
-
-		// Set key
-		try {
-			InputStream is = UriUtil.getUriInputStream(ctx, mKeyfile);
-			pm.retrieveMasterKey(mPassword, is);
-		} catch (InvalidKeyFileException e) {
-			erase(backupKey);
-			finish(false, e.getMessage());
-			return;
-		} catch (IOException e) {
-			erase(backupKey);
-			finish(false, e.getMessage());
-			return;
-		}
-		
-		// Save Database
-		mFinish = new AfterSave(backupKey, mFinish);
-		SaveDBRunnable save = new SaveDBRunnable(ctx, mDb, mFinish, mDontSave);
-		save.run();
-	}
-	
-	private class AfterSave extends OnFinishRunnable {
-		private byte[] mBackup;
-		
-		public AfterSave(byte[] backup, OnFinishRunnable finish) {
-			super(finish);
-			
-			mBackup = backup;
-		}
-
-		@Override
-		public void run() {
-			if ( ! mSuccess ) {
-				// Erase the current master key
-				erase(mDb.getPwDatabase().getMasterKey());
-				mDb.getPwDatabase().setMasterKey(mBackup);
-			}
-			
-			super.run();
-		}
-
-	}
-	
-	/** Overwrite the array as soon as we don't need it to avoid keeping the extra data in memory
-	 * @param array
-	 */
-	private void erase(byte[] array) {
-		if ( array == null ) return;
-		
-		for ( int i = 0; i < array.length; i++ ) {
-			array[i] = 0;
-		}
-	}
-
-}

app/src/main/java/com/kunzisoft/keepass/database/action/AssignPasswordInDatabaseRunnable.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action;
+
+import android.content.Context;
+import android.net.Uri;
+
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwDatabase;
+import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
+import com.kunzisoft.keepass.utils.UriUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class AssignPasswordInDatabaseRunnable extends ActionWithSaveDatabaseRunnable {
+	
+	private String mPassword;
+	private Uri mKeyfile;
+	private byte[] mBackupKey;
+	
+	public AssignPasswordInDatabaseRunnable(Context ctx, Database db, String password, Uri keyfile, OnFinishRunnable finish) {
+		this(ctx, db, password, keyfile, finish, false);
+	}
+
+	public AssignPasswordInDatabaseRunnable(Context ctx, Database db, String password, Uri keyfile, OnFinishRunnable finish, boolean dontSave) {
+		super(ctx, db, finish, dontSave);
+
+		this.mPassword = password;
+		this.mKeyfile = keyfile;
+	}
+	
+	@Override
+	public void run() {
+		PwDatabase pm = mDatabase.getPwDatabase();
+		
+		mBackupKey = new byte[pm.getMasterKey().length];
+		System.arraycopy(pm.getMasterKey(), 0, mBackupKey, 0, mBackupKey.length);
+
+		// Set key
+		try {
+			InputStream is = UriUtil.getUriInputStream(mContext, mKeyfile);
+			pm.retrieveMasterKey(mPassword, is);
+            // Save Database
+            super.run();
+		} catch (InvalidKeyFileException|IOException e) {
+			erase(mBackupKey);
+			finish(false, e.getMessage());
+			super.runWithoutSaveDatabase();
+		}
+
+	}
+
+    @Override
+    protected void onFinish(boolean success, String message) {
+        if (!success) {
+            // Erase the current master key
+            erase(mDatabase.getPwDatabase().getMasterKey());
+            mDatabase.getPwDatabase().setMasterKey(mBackupKey);
+        }
+    }
+	
+	/**
+     * Overwrite the array as soon as we don't need it to avoid keeping the extra data in memory
+	 */
+	private void erase(byte[] array) {
+		if ( array == null ) return;
+		
+		for ( int i = 0; i < array.length; i++ ) {
+			array[i] = 0;
+		}
+	}
+
+}

app/src/main/java/com/kunzisoft/keepass/database/action/CreateDatabaseRunnable.java

@@ -26,18 +26,18 @@ import com.kunzisoft.keepass.database.Database;
 import com.kunzisoft.keepass.database.PwDatabase;
 import com.kunzisoft.keepass.utils.UriUtil;
 
-public class CreateDBRunnable extends RunnableOnFinish {
-	
-	private String mFilename;
-	private boolean mDontSave;
-	private Context ctx;
+public class CreateDatabaseRunnable extends RunnableOnFinish {
 
-	public CreateDBRunnable(Context ctx, String filename, OnFinishRunnable finish, boolean dontSave) {
+    private Context mContext;
+    private boolean mDontSave;
+	private String mFilename;
+
+	public CreateDatabaseRunnable(Context mContext, String filename, OnFinishRunnable finish, boolean dontSave) {
 		super(finish);
 
-		mFilename = filename;
-		mDontSave = dontSave;
-		this.ctx = ctx;
+        this.mContext = mContext;
+        this.mDontSave = dontSave;
+        this.mFilename = filename;
 	}
 
 	@Override
@@ -56,8 +56,9 @@ public class CreateDBRunnable extends RunnableOnFinish {
 		App.clearShutdown();
 
 		// Commit changes
-		SaveDBRunnable save = new SaveDBRunnable(ctx, db, mFinish, mDontSave);
+		SaveDatabaseRunnable save = new SaveDatabaseRunnable(mContext, db, mFinish, mDontSave);
 		mFinish = null;
+
 		save.run();
 	}
 }

app/src/main/java/com/kunzisoft/keepass/database/action/DeleteEntryRunnable.java

@@ -1,103 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.action;
-
-import android.content.Context;
-
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass.database.PwGroup;
-
-/** Task to delete entries
- * @author bpellin
- *
- */
-public class DeleteEntryRunnable extends RunnableOnFinish {
-
-	private Database mDb;
-	private PwEntry mEntry;
-	private boolean mDontSave;
-	private Context ctx;
-	
-	public DeleteEntryRunnable(Context ctx, Database db, PwEntry entry, OnFinishRunnable finish) {
-		this(ctx, db, entry, finish, false);
-	}
-	
-	public DeleteEntryRunnable(Context ctx, Database db, PwEntry entry, OnFinishRunnable finish, boolean dontSave) {
-		super(finish);
-		
-		this.mDb = db;
-		this.mEntry = entry;
-		this.mDontSave = dontSave;
-		this.ctx = ctx;
-		
-	}
-	
-	@Override
-	public void run() {
-		PwGroup parent = mEntry.getParent();
-
-		// Remove Entry from parent
-		boolean recycle = mDb.canRecycle(mEntry);
-		if (recycle) {
-			mDb.recycle(mEntry);
-		}
-		else {
-			mDb.deleteEntry(mEntry);
-		}
-		
-		// Save
-		mFinish = new AfterDelete(mFinish, parent, mEntry, recycle);
-		
-		// Commit database
-		SaveDBRunnable save = new SaveDBRunnable(ctx, mDb, mFinish, mDontSave);
-		save.run();
-	}
-
-	private class AfterDelete extends OnFinishRunnable {
-
-		private PwGroup mParent;
-		private PwEntry mEntry;
-		private boolean recycled;
-		
-		AfterDelete(OnFinishRunnable finish, PwGroup parent, PwEntry entry, boolean r) {
-			super(finish);
-			
-			mParent = parent;
-			mEntry = entry;
-			recycled = r;
-		}
-		
-		@Override
-		public void run() {
-			if ( !mSuccess ) {
-				if (recycled) {
-					mDb.undoRecycle(mEntry, mParent);
-				}
-				else {
-					mDb.undoDeleteEntry(mEntry, mParent);
-				}
-			}
-			// TODO Callback after delete entry
-
-			super.run();
-		}
-	}
-}

app/src/main/java/com/kunzisoft/keepass/database/action/DeleteGroupRunnable.java

@@ -1,125 +0,0 @@
-/*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
- *     
- * This file is part of KeePass DX.
- *
- *  KeePass DX is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  KeePass DX is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.kunzisoft.keepass.database.action;
-
-import android.content.Context;
-
-import com.kunzisoft.keepass.app.App;
-import com.kunzisoft.keepass.database.Database;
-import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass.database.PwGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DeleteGroupRunnable extends RunnableOnFinish {
-
-    private Context mContext;
-	private Database mDb;
-	private PwGroup<PwGroup, PwGroup, PwEntry> mGroup;
-	private boolean mDontSave;
-	
-	public DeleteGroupRunnable(Context ctx, Database db, PwGroup<PwGroup, PwGroup, PwEntry> group, OnFinishRunnable finish) {
-		super(finish);
-		setMembers(ctx, db, group, false);
-	}
-
-	public DeleteGroupRunnable(Context ctx, Database db, PwGroup<PwGroup, PwGroup, PwEntry> group, OnFinishRunnable finish, boolean dontSave) {
-		super(finish);
-		setMembers(ctx, db, group, dontSave);
-	}
-
-	private void setMembers(Context ctx, Database db, PwGroup<PwGroup, PwGroup, PwEntry> group, boolean dontSave) {
-		mDb = db;
-		mGroup = group;
-        mContext = ctx;
-		mDontSave = dontSave;
-	}
-	
-	@Override
-	public void run() {
-        PwGroup parent = mGroup.getParent();
-
-        // Remove Group from parent
-        boolean recycle = mDb.canRecycle(mGroup);
-        if (recycle) {
-            mDb.recycle(mGroup);
-        }
-        else {
-            // TODO tests
-            // Remove child entries
-            List<PwEntry> childEnt = new ArrayList<>(mGroup.getChildEntries()); // TODO new Methods
-            for ( int i = 0; i < childEnt.size(); i++ ) {
-                DeleteEntryRunnable task = new DeleteEntryRunnable(mContext, mDb, childEnt.get(i), null, true);
-                task.run();
-            }
-
-            // Remove child groups
-            List<PwGroup> childGrp = new ArrayList<>(mGroup.getChildGroups());
-            for ( int i = 0; i < childGrp.size(); i++ ) {
-                DeleteGroupRunnable task = new DeleteGroupRunnable(mContext, mDb, childGrp.get(i), null, true);
-                task.run();
-            }
-            mDb.deleteGroup(mGroup);
-
-            // Remove from PwDatabaseV3
-            // TODO ENcapsulate
-            mDb.getPwDatabase().getGroups().remove(mGroup);
-        }
-
-        // Save
-        mFinish = new AfterDelete(mFinish, parent, mGroup, recycle);
-		
-		// Commit Database
-		SaveDBRunnable save = new SaveDBRunnable(mContext, mDb, mFinish, mDontSave);
-		save.run();
-	}
-	
-	private class AfterDelete extends OnFinishRunnable {
-
-        private PwGroup mParent;
-        private PwGroup mGroup;
-        private boolean recycled;
-
-		AfterDelete(OnFinishRunnable finish, PwGroup parent, PwGroup mGroup, boolean recycle) {
-			super(finish);
-
-            this.mParent = parent;
-            this.mGroup = mGroup;
-            this.recycled = recycle;
-		}
-
-		public void run() {
-            if ( !mSuccess ) {
-                if (recycled) {
-                    mDb.undoRecycle(mGroup, mParent);
-                }
-                else {
-                    // Let's not bother recovering from a failure to save a deleted tree.  It is too much work.
-                    App.setShutdown();
-                    // TODO TEST pm.undoDeleteGroup(mGroup, mParent);
-                }
-            }
-            // TODO Callback after delete group
-
-			super.run();
-		}
-	}
-}

app/src/main/java/com/kunzisoft/keepass/database/action/FileOnFinishRunnable.java

@@ -24,6 +24,7 @@ import android.net.Uri;
 import java.io.Serializable;
 
 public class FileOnFinishRunnable extends OnFinishRunnable implements Serializable {
+
 	private Uri mFilename = null;
 	protected FileOnFinishRunnable mOnFinish;
 	

app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.java

@@ -42,36 +42,34 @@ import com.kunzisoft.keepass.database.exception.KeyFileEmptyException;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-public class LoadDBRunnable extends RunnableOnFinish {
-    private static final String TAG = LoadDBRunnable.class.getName();
+public class LoadDatabaseRunnable extends RunnableOnFinish {
+    private static final String TAG = LoadDatabaseRunnable.class.getName();
 
+    private Context mContext;
+    private Database mDatabase;
     private Uri mUri;
     private String mPass;
     private Uri mKey;
-    private Database mDb;
-    private Context mCtx;
     private boolean mRememberKeyfile;
 
-    public LoadDBRunnable(Database db, Context ctx, Uri uri, String pass, Uri key, OnFinishRunnable finish) {
+    public LoadDatabaseRunnable(Context context, Database database, Uri uri, String pass, Uri key, OnFinishRunnable finish) {
         super(finish);
 
-        mDb = db;
-        mCtx = ctx;
-        mUri = uri;
-        mPass = pass;
-        mKey = key;
+        this.mContext = context;
+        this.mDatabase = database;
+        this.mUri = uri;
+        this.mPass = pass;
+        this.mKey = key;
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
-        mRememberKeyfile = prefs.getBoolean(ctx.getString(R.string.keyfile_key), ctx.getResources().getBoolean(R.bool.keyfile_default));
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        this.mRememberKeyfile = prefs.getBoolean(context.getString(R.string.keyfile_key), context.getResources().getBoolean(R.bool.keyfile_default));
     }
 
     @Override
     public void run() {
         try {
-            mDb.loadData(mCtx, mUri, mPass, mKey, mStatus);
-
+            mDatabase.loadData(mContext, mUri, mPass, mKey, mStatus);
             saveFileData(mUri, mKey);
-
         } catch (ArcFourException e) {
             catchError(e, R.string.error_arc4);
             return;
@@ -85,8 +83,10 @@ public class LoadDBRunnable extends RunnableOnFinish {
             catchError(e, R.string.file_not_found);
             return;
         } catch (IOException e) {
-            Log.e(TAG, "Database can't be read", e);
-            finish(false, e.getMessage());
+            if (e.getMessage().contains("Hash failed with code"))
+                catchError(e, R.string.error_load_database_KDF_memory, true);
+            else
+                catchError(e, R.string.error_load_database, true);
             return;
         } catch (KeyFileEmptyException e) {
             catchError(e, R.string.keyfile_is_empty);
@@ -107,22 +107,24 @@ public class LoadDBRunnable extends RunnableOnFinish {
             catchError(e, R.string.error_invalid_db);
             return;
         } catch (OutOfMemoryError e) {
-            String errorMessage = mCtx.getString(R.string.error_out_of_memory);
-            Log.e(TAG, errorMessage, e);
-            finish(false, errorMessage);
+            catchError(e, R.string.error_out_of_memory);
             return;
         } catch (Exception e) {
-            Log.e(TAG, "Database can't be load", e);
-            finish(false, e.getMessage());
+            catchError(e, R.string.error_load_database, true);
             return;
         }
-
         finish(true);
     }
 
-    private void catchError(Exception e, @StringRes int messageId) {
-        String errorMessage = mCtx.getString(messageId);
+    private void catchError(Throwable e, @StringRes int messageId) {
+        catchError(e, messageId, false);
+    }
+
+    private void catchError(Throwable e, @StringRes int messageId, boolean addThrowableMessage) {
+        String errorMessage = mContext.getString(messageId);
         Log.e(TAG, errorMessage, e);
+        if (addThrowableMessage)
+            errorMessage = errorMessage + " " + e.getLocalizedMessage();
         finish(false, errorMessage);
     }
 
@@ -134,6 +136,4 @@ public class LoadDBRunnable extends RunnableOnFinish {
         App.getFileHistory().createFile(uri, key);
     }
 
-
-
 }

app/src/main/java/com/kunzisoft/keepass/database/action/OnFinishRunnable.java

@@ -76,11 +76,29 @@ public class OnFinishRunnable implements Runnable {
 		}
 	}
 
-	// TODO Move
+    /**
+     * ONLY to use in UIThread, typically in an Activity, Fragment or a Service
+     * @param ctx Context to show the message
+     */
 	protected void displayMessage(Context ctx) {
 		if ( mMessage != null && mMessage.length() > 0 ) {
 			Toast.makeText(ctx, mMessage, Toast.LENGTH_LONG).show();
 		}
 	}
 
+    public boolean isSuccess() {
+        return mSuccess;
+    }
+
+    public void setSuccess(boolean mSuccess) {
+        this.mSuccess = mSuccess;
+    }
+
+    public String getMessage() {
+        return mMessage;
+    }
+
+    public void setMessage(String mMessage) {
+        this.mMessage = mMessage;
+    }
 }

app/src/main/java/com/kunzisoft/keepass/database/action/SaveDatabaseRunnable.java

@@ -26,21 +26,21 @@ import com.kunzisoft.keepass.database.exception.PwDbOutputException;
 
 import java.io.IOException;
 
-public class SaveDBRunnable extends RunnableOnFinish {
+public class SaveDatabaseRunnable extends RunnableOnFinish {
 
-	private Context mCtx;
-	private Database mDb;
+	private Context mContext;
+	private Database mDatabase;
 	private boolean mDontSave;
 
-	public SaveDBRunnable(Context ctx, Database db, OnFinishRunnable finish, boolean dontSave) {
+	public SaveDatabaseRunnable(Context context, Database database, OnFinishRunnable finish, boolean dontSave) {
 		super(finish);
 
-		this.mDb = db;
+		this.mContext = context;
+		this.mDatabase = database;
 		this.mDontSave = dontSave;
-		this.mCtx = ctx;
 	}
 
-	public SaveDBRunnable(Context ctx, Database db, OnFinishRunnable finish) {
+	public SaveDatabaseRunnable(Context ctx, Database db, OnFinishRunnable finish) {
 		this(ctx, db, finish, false);
 	}
 
@@ -49,7 +49,7 @@ public class SaveDBRunnable extends RunnableOnFinish {
 
 		if ( ! mDontSave ) {
 			try {
-				mDb.saveData(mCtx);
+				mDatabase.saveData(mContext);
 			} catch (IOException e) {
 				finish(false, e.getMessage());
 				return;

app/src/main/java/com/kunzisoft/keepass/database/action/node/ActionNodeDatabaseRunnable.java

@@ -0,0 +1,33 @@
+package com.kunzisoft.keepass.database.action.node;
+
+import android.content.Context;
+
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwNode;
+import com.kunzisoft.keepass.database.action.ActionWithSaveDatabaseRunnable;
+
+abstract class ActionNodeDatabaseRunnable extends ActionWithSaveDatabaseRunnable {
+
+    private AfterActionNodeOnFinish callbackRunnable;
+
+    public ActionNodeDatabaseRunnable(Context context, Database db, AfterActionNodeOnFinish finish, boolean dontSave) {
+        super(context, db, finish, dontSave);
+        this.callbackRunnable = finish;
+    }
+
+    /**
+     * Callback method who return the node(s) modified after an action
+     * - Add : @param oldNode NULL, @param newNode CreatedNode
+     * - Copy : @param oldNode NodeToCopy, @param newNode NodeCopied
+     * - Delete : @param oldNode NodeToDelete, @param NULL
+     * - Move : @param oldNode NULL, @param NodeToMove
+     * - Update : @param oldNode NodeToUpdate, @param NodeUpdated
+     */
+    protected void callbackNodeAction(boolean success, String message, PwNode oldNode, PwNode newNode) {
+        if (callbackRunnable != null) {
+            callbackRunnable.setSuccess(success);
+            callbackRunnable.setMessage(message);
+            callbackRunnable.run(oldNode, newNode);
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/action/node/AddEntryRunnable.java

@@ -17,57 +17,40 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.action;
+package com.kunzisoft.keepass.database.action.node;
 
 import android.content.Context;
 
 import com.kunzisoft.keepass.database.Database;
 import com.kunzisoft.keepass.database.PwEntry;
 
-public class AddEntryRunnable extends RunnableOnFinish {
+public class AddEntryRunnable extends ActionNodeDatabaseRunnable {
 
-	protected Database mDb;
-	private PwEntry mEntry;
-	private Context ctx;
-	private boolean mDontSave;
+	private PwEntry mNewEntry;
 
-	public AddEntryRunnable(Context ctx, Database db, PwEntry entry, OnFinishRunnable finish) {
-		this(ctx, db, entry, finish, false);
+	public AddEntryRunnable(Context ctx, Database db, PwEntry entryToAdd, AfterActionNodeOnFinish finish) {
+		this(ctx, db, entryToAdd, finish, false);
 	}
 
-	public AddEntryRunnable(Context ctx, Database db, PwEntry entry, OnFinishRunnable finish, boolean dontSave) {
-		super(finish);
-		
-		this.mDb = db;
-		this.mEntry = entry;
-		this.ctx = ctx;
-		this.mDontSave = dontSave;
-		
-		this.mFinish = new AfterAdd(mFinish);
+	public AddEntryRunnable(Context ctx, Database db, PwEntry entryToAdd, AfterActionNodeOnFinish finish, boolean dontSave) {
+		super(ctx, db, finish, dontSave);
+
+		this.mNewEntry = entryToAdd;
 	}
 	
 	@Override
 	public void run() {
-		mDb.addEntryTo(mEntry, mEntry.getParent());
+		mDatabase.addEntryTo(mNewEntry, mNewEntry.getParent());
 		
 		// Commit to disk
-		SaveDBRunnable save = new SaveDBRunnable(ctx, mDb, mFinish, mDontSave);
-		save.run();
+		super.run();
 	}
-	
-	private class AfterAdd extends OnFinishRunnable {
 
-		AfterAdd(OnFinishRunnable finish) {
-			super(finish);
-		}
-
-		@Override
-		public void run() {
-			if ( !mSuccess ) {
-                mDb.removeEntryFrom(mEntry, mEntry.getParent());
-			}
-			// TODO if add entry callback
-			super.run();
+	@Override
+	protected void onFinish(boolean success, String message) {
+		if ( !success ) {
+			mDatabase.removeEntryFrom(mNewEntry, mNewEntry.getParent());
 		}
+        callbackNodeAction(success, message, null, mNewEntry);
 	}
 }

app/src/main/java/com/kunzisoft/keepass/database/action/node/AddGroupRunnable.java

@@ -17,63 +17,40 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.action;
+package com.kunzisoft.keepass.database.action.node;
 
 import android.content.Context;
 
 import com.kunzisoft.keepass.database.Database;
 import com.kunzisoft.keepass.database.PwGroup;
 
-public class AddGroupRunnable extends RunnableOnFinish {
+public class AddGroupRunnable extends ActionNodeDatabaseRunnable {
 
-	protected Database mDb;
 	private PwGroup mNewGroup;
-	private Context ctx;
-	private boolean mDontSave;
 
 	public AddGroupRunnable(Context ctx, Database db, PwGroup newGroup, AfterActionNodeOnFinish afterAddNode) {
 		this(ctx, db, newGroup, afterAddNode, false);
 	}
 
-	public AddGroupRunnable(Context ctx, Database db, PwGroup newGroup, AfterActionNodeOnFinish afterAddNode,
-							boolean dontSave) {
-		super(afterAddNode);
+	public AddGroupRunnable(Context ctx, Database db, PwGroup newGroup, AfterActionNodeOnFinish afterAddNode, boolean dontSave) {
+		super(ctx, db, afterAddNode, dontSave);
 
-		this.mDb = db;
         this.mNewGroup = newGroup;
-        this.mDontSave = dontSave;
-		this.ctx = ctx;
-
-        this.mFinish = new AfterAdd(mFinish);
 	}
 	
 	@Override
 	public void run() {
-        mDb.addGroupTo(mNewGroup, mNewGroup.getParent());
+        mDatabase.addGroupTo(mNewGroup, mNewGroup.getParent());
 
 		// Commit to disk
-		SaveDBRunnable save = new SaveDBRunnable(ctx, mDb, mFinish, mDontSave);
-		save.run();
+		super.run();
 	}
-	
-	private class AfterAdd extends OnFinishRunnable {
 
-		AfterAdd(OnFinishRunnable finish) {
-			super(finish);
-		}
-
-		@Override
-		public void run() {
-			if ( !mSuccess ) {
-                mDb.removeGroupFrom(mNewGroup, mNewGroup.getParent());
-			}
-
-            // TODO Better callback
-            AfterActionNodeOnFinish afterAddNode =
-                    (AfterActionNodeOnFinish) super.mOnFinish;
-            afterAddNode.mSuccess = mSuccess;
-            afterAddNode.mMessage = mMessage;
-            afterAddNode.run(null, mNewGroup);
-		}
+	@Override
+	protected void onFinish(boolean success, String message) {
+        if ( !success ) {
+            mDatabase.removeGroupFrom(mNewGroup, mNewGroup.getParent());
+        }
+        callbackNodeAction(success, message, null, mNewGroup);
 	}
 }

app/src/main/java/com/kunzisoft/keepass/database/action/node/AfterActionNodeOnFinish.java

@@ -17,16 +17,20 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.action;
+package com.kunzisoft.keepass.database.action.node;
 
 import android.os.Handler;
 
 import com.kunzisoft.keepass.database.PwNode;
+import com.kunzisoft.keepass.database.action.OnFinishRunnable;
+
+import javax.annotation.Nullable;
 
 public abstract class AfterActionNodeOnFinish extends OnFinishRunnable {
-    public AfterActionNodeOnFinish(Handler handler) {
-        super(handler);
+
+    public AfterActionNodeOnFinish() {
+        super(new Handler());
     }
 
-    public abstract void run(PwNode oldNode, PwNode newNode);
+    public abstract void run(@Nullable PwNode oldNode, @Nullable PwNode newNode);
 }

app/src/main/java/com/kunzisoft/keepass/database/action/node/CopyEntryRunnable.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.node;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.database.PwGroup;
+
+public class CopyEntryRunnable extends ActionNodeDatabaseRunnable {
+
+	private static final String TAG = CopyEntryRunnable.class.getName();
+
+	private PwEntry mEntryToCopy;
+	private PwEntry mEntryCopied;
+	private PwGroup mNewParent;
+
+	public CopyEntryRunnable(Context context, Database db, PwEntry oldE, PwGroup newParent, AfterActionNodeOnFinish afterAddNode) {
+		this(context, db, oldE, newParent, afterAddNode, false);
+	}
+
+	public CopyEntryRunnable(Context context, Database db, PwEntry oldE, PwGroup newParent, AfterActionNodeOnFinish afterAddNode, boolean dontSave) {
+		super(context, db, afterAddNode, dontSave);
+
+		this.mEntryToCopy = oldE;
+		this.mNewParent = newParent;
+	}
+
+	@Override
+	public void run() {
+		// Update entry with new values
+        mEntryCopied = mDatabase.copyEntry(mEntryToCopy, mNewParent);
+
+        if (mEntryCopied != null) {
+            mEntryCopied.touch(true, true);
+
+            // Commit to disk
+            super.run();
+        } else {
+            Log.e(TAG, "Unable to create a copy of the entry");
+        }
+	}
+
+	@Override
+	protected void onFinish(boolean success, String message) {
+		if ( !success ) {
+			// If we fail to save, try to delete the copy
+			try {
+				mDatabase.deleteEntry(mEntryCopied);
+			} catch (Exception e) {
+				Log.i(TAG, "Unable to delete the copied entry");
+			}
+		}
+        callbackNodeAction(success, message, mEntryToCopy, mEntryCopied);
+	}
+}

app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteEntryRunnable.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.node;
+
+import android.content.Context;
+
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.database.PwGroup;
+
+public class DeleteEntryRunnable extends ActionNodeDatabaseRunnable {
+
+	private PwEntry mEntryToDelete;
+	private PwGroup mParent;
+	private boolean mRecycle;
+	
+	public DeleteEntryRunnable(Context ctx, Database db, PwEntry entry, AfterActionNodeOnFinish finish) {
+		this(ctx, db, entry, finish, false);
+	}
+	
+	public DeleteEntryRunnable(Context ctx, Database db, PwEntry entry, AfterActionNodeOnFinish finish, boolean dontSave) {
+		super(ctx, db, finish, dontSave);
+
+		this.mEntryToDelete = entry;
+	}
+	
+	@Override
+	public void run() {
+		mParent = mEntryToDelete.getParent();
+
+		// Remove Entry from parent
+		mRecycle = mDatabase.canRecycle(mEntryToDelete);
+		if (mRecycle) {
+			mDatabase.recycle(mEntryToDelete);
+		}
+		else {
+			mDatabase.deleteEntry(mEntryToDelete);
+		}
+		
+		// Commit database
+		super.run();
+	}
+
+	@Override
+	protected void onFinish(boolean success, String message) {
+		if ( !success ) {
+			if (mRecycle) {
+				mDatabase.undoRecycle(mEntryToDelete, mParent);
+			}
+			else {
+				mDatabase.undoDeleteEntry(mEntryToDelete, mParent);
+			}
+		}
+        callbackNodeAction(success, message, mEntryToDelete, null);
+	}
+}

app/src/main/java/com/kunzisoft/keepass/database/action/node/DeleteGroupRunnable.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.node;
+
+import android.content.Context;
+
+import com.kunzisoft.keepass.app.App;
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.database.PwGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DeleteGroupRunnable extends ActionNodeDatabaseRunnable {
+
+	private PwGroup<PwGroup, PwEntry> mGroupToDelete;
+	private PwGroup mParent;
+	private boolean mRecycle;
+
+	public DeleteGroupRunnable(Context ctx, Database db, PwGroup<PwGroup, PwEntry> group, AfterActionNodeOnFinish finish) {
+		this(ctx, db, group, finish, false);
+	}
+
+	public DeleteGroupRunnable(Context ctx, Database db, PwGroup<PwGroup, PwEntry> group, AfterActionNodeOnFinish finish, boolean dontSave) {
+		super(ctx, db, finish, dontSave);
+        mGroupToDelete = group;
+	}
+	
+	@Override
+	public void run() {
+        mParent = mGroupToDelete.getParent();
+
+        // Remove Group from parent
+        mRecycle = mDatabase.canRecycle(mGroupToDelete);
+        if (mRecycle) {
+            mDatabase.recycle(mGroupToDelete);
+        }
+        else {
+            // TODO tests
+            // Remove child entries
+            List<PwEntry> childEnt = new ArrayList<>(mGroupToDelete.getChildEntries()); // TODO new Methods
+            for ( int i = 0; i < childEnt.size(); i++ ) {
+                DeleteEntryRunnable task = new DeleteEntryRunnable(mContext, mDatabase, childEnt.get(i), null, true);
+                task.run();
+            }
+
+            // Remove child groups
+            List<PwGroup> childGrp = new ArrayList<>(mGroupToDelete.getChildGroups());
+            for ( int i = 0; i < childGrp.size(); i++ ) {
+                DeleteGroupRunnable task = new DeleteGroupRunnable(mContext, mDatabase, childGrp.get(i), null, true);
+                task.run();
+            }
+            mDatabase.deleteGroup(mGroupToDelete);
+
+            // Remove from PwDatabaseV3
+            // TODO ENcapsulate
+            mDatabase.getPwDatabase().getGroups().remove(mGroupToDelete);
+        }
+		
+		// Commit Database
+		super.run();
+	}
+
+    @Override
+    protected void onFinish(boolean success, String message) {
+        if ( !success ) {
+            if (mRecycle) {
+                mDatabase.undoRecycle(mGroupToDelete, mParent);
+            }
+            else {
+                // Let's not bother recovering from a failure to save a deleted tree.  It is too much work.
+                App.setShutdown();
+                // TODO TEST pm.undoDeleteGroup(mGroup, mParent);
+            }
+        }
+        callbackNodeAction(success, message, mGroupToDelete, null);
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveEntryRunnable.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.node;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.database.PwGroup;
+
+public class MoveEntryRunnable extends ActionNodeDatabaseRunnable {
+
+	private static final String TAG = MoveEntryRunnable.class.getName();
+
+	private PwEntry mEntryToMove;
+	private PwGroup mOldParent;
+	private PwGroup mNewParent;
+
+	public MoveEntryRunnable(Context context, Database db, PwEntry oldE, PwGroup newParent, AfterActionNodeOnFinish afterAddNode) {
+		this(context, db, oldE, newParent, afterAddNode, false);
+	}
+
+	public MoveEntryRunnable(Context context, Database db, PwEntry oldE, PwGroup newParent, AfterActionNodeOnFinish afterAddNode, boolean dontSave) {
+		super(context, db, afterAddNode, dontSave);
+
+		this.mEntryToMove = oldE;
+		this.mNewParent = newParent;
+	}
+
+	@Override
+	public void run() {
+		// Move entry in new parent
+
+		mOldParent = mEntryToMove.getParent();
+        mDatabase.moveEntry(mEntryToMove, mNewParent);
+
+        if (mEntryToMove != null) {
+			mEntryToMove.touch(true, true);
+
+            // Commit to disk
+            super.run();
+        } else {
+            Log.e(TAG, "Unable to create a copy of the entry");
+        }
+	}
+
+	@Override
+	protected void onFinish(boolean success, String message) {
+		if ( !success ) {
+			// If we fail to save, try to remove in the first place
+			try {
+				mDatabase.moveEntry(mEntryToMove, mOldParent);
+			} catch (Exception e) {
+				Log.i(TAG, "Unable to replace the entry");
+			}
+		}
+        callbackNodeAction(success, message, null, mEntryToMove);
+	}
+}

app/src/main/java/com/kunzisoft/keepass/database/action/node/MoveGroupRunnable.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
+ *     
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  KeePass DX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.database.action.node;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.database.Database;
+import com.kunzisoft.keepass.database.PwGroup;
+
+public class MoveGroupRunnable extends ActionNodeDatabaseRunnable {
+
+	private static final String TAG = MoveGroupRunnable.class.getName();
+
+	private PwGroup mGroupToMove;
+	private PwGroup mOldParent;
+	private PwGroup mNewParent;
+
+	public MoveGroupRunnable(Context context, Database db, PwGroup groupToMove, PwGroup newParent, AfterActionNodeOnFinish afterAddNode) {
+		this(context, db, groupToMove, newParent, afterAddNode, false);
+	}
+
+	public MoveGroupRunnable(Context context, Database db, PwGroup groupToMove, PwGroup newParent, AfterActionNodeOnFinish afterAddNode, boolean dontSave) {
+		super(context, db, afterAddNode, dontSave);
+
+		this.mGroupToMove = groupToMove;
+		this.mNewParent = newParent;
+	}
+
+	@Override
+	public void run() {
+        mOldParent = mGroupToMove.getParent();
+		// Move group in new parent if not in the current group
+		if (!mGroupToMove.equals(mNewParent)
+				&& !mNewParent.isContainedIn(mGroupToMove)) {
+			mDatabase.moveGroup(mGroupToMove, mNewParent);
+
+			if (mGroupToMove != null) {
+				mGroupToMove.touch(true, true);
+
+				// Commit to disk
+				super.run();
+			} else {
+				Log.e(TAG, "Unable to create a copy of the group");
+			}
+		} else {
+		    // Only finish thread
+            mFinish.setResult(false);
+            String message = mContext.getString(R.string.error_move_folder_in_itself);
+			Log.e(TAG, message);
+			mFinish.setMessage(message);
+            mFinish.run();
+		}
+	}
+
+	@Override
+	protected void onFinish(boolean success, String message) {
+        if ( !success ) {
+            // If we fail to save, try to move in the first place
+            try {
+                mDatabase.moveGroup(mGroupToMove, mOldParent);
+            } catch (Exception e) {
+                Log.i(TAG, "Unable to replace the group");
+            }
+        }
+        callbackNodeAction(success, message, null, mGroupToMove);
+	}
+}

app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateEntryRunnable.java

@@ -17,68 +17,47 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.action;
+package com.kunzisoft.keepass.database.action.node;
 
 import android.content.Context;
 
 import com.kunzisoft.keepass.database.Database;
 import com.kunzisoft.keepass.database.PwEntry;
 
-public class UpdateEntryRunnable extends RunnableOnFinish {
+public class UpdateEntryRunnable extends ActionNodeDatabaseRunnable {
 
-	private Database mDb;
-	private PwEntry mOldE;
-	private PwEntry mNewE;
-	private Context ctx;
-	private boolean mDontSave;
+	private PwEntry mOldEntry;
+	private PwEntry mNewEntry;
+	private PwEntry mBackupEntry;
 
-	public UpdateEntryRunnable(Context ctx, Database db, PwEntry oldE, PwEntry newE, OnFinishRunnable finish) {
+	public UpdateEntryRunnable(Context ctx, Database db, PwEntry oldE, PwEntry newE, AfterActionNodeOnFinish finish) {
 		this(ctx, db, oldE, newE, finish, false);
 	}
 
-	public UpdateEntryRunnable(Context ctx, Database db, PwEntry oldE, PwEntry newE, OnFinishRunnable finish, boolean dontSave) {
-		super(finish);
-		
-		this.mDb = db;
-		this.mOldE = oldE;
-		this.mNewE = newE;
-		this.ctx = ctx;
-		this.mDontSave = dontSave;
-		
+	public UpdateEntryRunnable(Context ctx, Database db, PwEntry oldE, PwEntry newE, AfterActionNodeOnFinish finish, boolean dontSave) {
+		super(ctx, db, finish, dontSave);
+
+		this.mOldEntry = oldE;
+		this.mNewEntry = newE;
 		// Keep backup of original values in case save fails
-		PwEntry backup;
-		backup = mOldE.clone();
-		
-		mFinish = new AfterUpdate(backup, finish);
+        this.mBackupEntry = mOldEntry.clone();
 	}
 
 	@Override
 	public void run() {
 		// Update entry with new values
-        mDb.updateEntry(mOldE, mNewE);
-		mOldE.touch(true, true);
+        mDatabase.updateEntry(mOldEntry, mNewEntry);
+		mOldEntry.touch(true, true);
 
-		// Commit to disk
-		SaveDBRunnable save = new SaveDBRunnable(ctx, mDb, mFinish, mDontSave);
-		save.run();
-	}
-	
-	private class AfterUpdate extends OnFinishRunnable {
-		private PwEntry mBackup;
-		
-		AfterUpdate(PwEntry backup, OnFinishRunnable finish) {
-			super(finish);
-			mBackup = backup;
-		}
-		
-		@Override
-		public void run() {
-			if ( !mSuccess ) {
-				// If we fail to save, back out changes to global structure
-                mDb.updateEntry(mOldE, mBackup);
-			}
-			// TODO Callback for update entry
-			super.run();
-		}
+		super.run();
 	}
+
+	@Override
+	protected void onFinish(boolean success, String message) {
+        if ( !success ) {
+            // If we fail to save, back out changes to global structure
+            mDatabase.updateEntry(mOldEntry, mBackupEntry);
+        }
+        callbackNodeAction(success, message, mOldEntry, mNewEntry);
+    }
 }

app/src/main/java/com/kunzisoft/keepass/database/action/node/UpdateGroupRunnable.java

@@ -17,72 +17,48 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.database.action;
+package com.kunzisoft.keepass.database.action.node;
 
 import android.content.Context;
 
 import com.kunzisoft.keepass.database.Database;
 import com.kunzisoft.keepass.database.PwGroup;
 
-public class UpdateGroupRunnable extends RunnableOnFinish {
+public class UpdateGroupRunnable extends ActionNodeDatabaseRunnable {
 
-	private Database mDb;
 	private PwGroup mOldGroup;
 	private PwGroup mNewGroup;
-	private Context ctx;
-	private boolean mDontSave;
+	private PwGroup mBackupGroup;
 
 	public UpdateGroupRunnable(Context ctx, Database db, PwGroup oldGroup, PwGroup newGroup, AfterActionNodeOnFinish finish) {
 		this(ctx, db, oldGroup, newGroup, finish, false);
 	}
 
 	public UpdateGroupRunnable(Context ctx, Database db, PwGroup oldGroup, PwGroup newGroup, AfterActionNodeOnFinish finish, boolean dontSave) {
-		super(finish);
-		
-		this.mDb = db;
+		super(ctx, db, finish, dontSave);
+
 		this.mOldGroup = oldGroup;
 		this.mNewGroup = newGroup;
-		this.ctx = ctx;
-		this.mDontSave = dontSave;
-		
 		// Keep backup of original values in case save fails
-		PwGroup backup;
-		backup = mOldGroup.clone();
-		
-		this.mFinish = new AfterUpdate(backup, finish);
+		this.mBackupGroup = mOldGroup.clone();
 	}
 
 	@Override
 	public void run() {
 		// Update group with new values
-        mDb.updateGroup(mOldGroup, mNewGroup);
+        mDatabase.updateGroup(mOldGroup, mNewGroup);
 		mOldGroup.touch(true, true);
 
 		// Commit to disk
-		new SaveDBRunnable(ctx, mDb, mFinish, mDontSave).run();
+		super.run();
 	}
-	
-	private class AfterUpdate extends OnFinishRunnable {
-		private PwGroup mBackup;
-		
-		AfterUpdate(PwGroup backup, OnFinishRunnable finish) {
-			super(finish);
-			mBackup = backup;
-		}
-		
-		@Override
-		public void run() {
-			if ( !mSuccess ) {
-				// If we fail to save, back out changes to global structure
-                mDb.updateGroup(mOldGroup, mBackup);
-			}
 
-            // TODO Better callback
-            AfterActionNodeOnFinish afterActionNodeOnFinish =
-                    (AfterActionNodeOnFinish) super.mOnFinish;
-            afterActionNodeOnFinish.mSuccess = mSuccess;
-            afterActionNodeOnFinish.mMessage = mMessage;
-            afterActionNodeOnFinish.run(mOldGroup, mNewGroup);
+	@Override
+	protected void onFinish(boolean success, String message) {
+		if ( !success ) {
+			// If we fail to save, back out changes to global structure
+			mDatabase.updateGroup(mOldGroup, mBackupGroup);
 		}
+		callbackNodeAction(success, message, mOldGroup, mNewGroup);
 	}
 }

app/src/main/java/com/kunzisoft/keepass/database/cursor/EntryCursor.java

@@ -0,0 +1,125 @@
+package com.kunzisoft.keepass.database.cursor;
+
+import android.database.MatrixCursor;
+import android.provider.BaseColumns;
+
+import com.kunzisoft.keepass.database.PwDatabase;
+import com.kunzisoft.keepass.database.PwEntry;
+import com.kunzisoft.keepass.database.PwEntryV3;
+import com.kunzisoft.keepass.database.PwEntryV4;
+import com.kunzisoft.keepass.database.PwIconCustom;
+import com.kunzisoft.keepass.database.PwIconFactory;
+import com.kunzisoft.keepass.database.PwIconStandard;
+
+import java.util.UUID;
+
+public class EntryCursor extends MatrixCursor {
+
+    private long entryId;
+    public static final String _ID = BaseColumns._ID;
+    public static final String COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS = "UUID_most_significant_bits";
+    public static final String COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS = "UUID_least_significant_bits";
+    public static final String COLUMN_INDEX_TITLE = "title";
+    public static final String COLUMN_INDEX_ICON_STANDARD = "icon_standard";
+    public static final String COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS = "icon_custom_UUID_most_significant_bits";
+    public static final String COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS = "icon_custom_UUID_least_significant_bits";
+    public static final String COLUMN_INDEX_USERNAME = "username";
+    public static final String COLUMN_INDEX_PASSWORD = "password";
+    public static final String COLUMN_INDEX_URL = "URL";
+    public static final String COLUMN_INDEX_NOTES = "notes";
+
+    private ExtraFieldCursor extraFieldCursor;
+
+    public EntryCursor() {
+        super(new String[]{ _ID,
+                COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS,
+                COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS,
+                COLUMN_INDEX_TITLE,
+                COLUMN_INDEX_ICON_STANDARD,
+                COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS,
+                COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS,
+                COLUMN_INDEX_USERNAME,
+                COLUMN_INDEX_PASSWORD,
+                COLUMN_INDEX_URL,
+                COLUMN_INDEX_NOTES});
+        entryId = 0;
+        extraFieldCursor = new ExtraFieldCursor();
+    }
+
+    public void addEntry(PwEntryV3 entry) {
+        addRow(new Object[] {entryId,
+                entry.getUUID().getMostSignificantBits(),
+                entry.getUUID().getLeastSignificantBits(),
+                entry.getTitle(),
+                entry.getIconStandard().getIconId(),
+                PwDatabase.UUID_ZERO.getMostSignificantBits(),
+                PwDatabase.UUID_ZERO.getLeastSignificantBits(),
+                entry.getUsername(),
+                entry.getPassword(),
+                entry.getUrl(),
+                entry.getNotes()});
+        entryId++;
+    }
+
+    public void addEntry(PwEntryV4 entry) {
+        addRow(new Object[] {entryId,
+                entry.getUUID().getMostSignificantBits(),
+                entry.getUUID().getLeastSignificantBits(),
+                entry.getTitle(),
+                entry.getIconStandard().getIconId(),
+                entry.getIconCustom().getUUID().getMostSignificantBits(),
+                entry.getIconCustom().getUUID().getLeastSignificantBits(),
+                entry.getUsername(),
+                entry.getPassword(),
+                entry.getUrl(),
+                entry.getNotes()});
+
+        entry.getFields().doActionToAllCustomProtectedField((key, value) -> {
+            extraFieldCursor.addExtraField(entryId, key, value);
+        });
+
+        entryId++;
+    }
+
+    private void populateEntryBaseVersion(PwEntry pwEntry, PwIconFactory iconFactory) {
+        pwEntry.setUUID(
+                new UUID(getLong(getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_MOST_SIGNIFICANT_BITS)),
+                        getLong(getColumnIndex(EntryCursor.COLUMN_INDEX_UUID_LEAST_SIGNIFICANT_BITS))));
+        pwEntry.setTitle(getString(getColumnIndex(EntryCursor.COLUMN_INDEX_TITLE)));
+
+        PwIconStandard iconStandard = iconFactory.getIcon(getInt(getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_STANDARD)));
+        pwEntry.setIconStandard(iconStandard);
+
+        pwEntry.setUsername(getString(getColumnIndex(EntryCursor.COLUMN_INDEX_USERNAME)));
+        pwEntry.setPassword(getString(getColumnIndex(EntryCursor.COLUMN_INDEX_PASSWORD)));
+        pwEntry.setUrl(getString(getColumnIndex(EntryCursor.COLUMN_INDEX_URL)));
+        pwEntry.setNotes(getString(getColumnIndex(EntryCursor.COLUMN_INDEX_NOTES)));
+    }
+
+    public void populateEntry(PwEntryV3 pwEntry, PwIconFactory iconFactory) {
+        populateEntryBaseVersion(pwEntry, iconFactory);
+    }
+
+    public void populateEntry(PwEntryV4 pwEntry, PwIconFactory iconFactory) {
+        populateEntryBaseVersion(pwEntry, iconFactory);
+
+        // Retrieve custom icon
+        PwIconCustom iconCustom = iconFactory.getIcon(
+                new UUID(getLong(getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_MOST_SIGNIFICANT_BITS)),
+                        getLong(getColumnIndex(EntryCursor.COLUMN_INDEX_ICON_CUSTOM_UUID_LEAST_SIGNIFICANT_BITS))));
+        pwEntry.setIconCustom(iconCustom);
+
+        // Retrieve extra fields
+        if (extraFieldCursor.moveToFirst()) {
+            while (!extraFieldCursor.isAfterLast()) {
+                // Add a new extra field only if entryId is the one we want
+                if (extraFieldCursor.getLong(extraFieldCursor.getColumnIndex(ExtraFieldCursor.FOREIGN_KEY_ENTRY_ID))
+                        == getLong(getColumnIndex(EntryCursor._ID))) {
+                    extraFieldCursor.populateExtraFieldInEntry(pwEntry);
+                }
+                extraFieldCursor.moveToNext();
+            }
+        }
+    }
+
+}

app/src/main/java/com/kunzisoft/keepass/database/cursor/ExtraFieldCursor.java

@@ -0,0 +1,43 @@
+package com.kunzisoft.keepass.database.cursor;
+
+import android.database.MatrixCursor;
+import android.provider.BaseColumns;
+
+import com.kunzisoft.keepass.database.PwEntryV4;
+import com.kunzisoft.keepass.database.security.ProtectedString;
+
+public class ExtraFieldCursor extends MatrixCursor {
+
+    private long fieldId;
+    public static final String _ID = BaseColumns._ID;
+    public static final String FOREIGN_KEY_ENTRY_ID = "entry_id";
+    public static final String COLUMN_LABEL = "label";
+    public static final String COLUMN_PROTECTION = "protection";
+    public static final String COLUMN_VALUE = "value";
+
+    public ExtraFieldCursor() {
+        super(new String[]{ _ID,
+                FOREIGN_KEY_ENTRY_ID,
+                COLUMN_LABEL,
+                COLUMN_PROTECTION,
+                COLUMN_VALUE});
+        fieldId = 0;
+    }
+
+    public synchronized void addExtraField(long entryId, String label, ProtectedString value) {
+        addRow(new Object[] {fieldId,
+                entryId,
+                label,
+                (value.isProtected()) ? 1 : 0,
+                value.toString()});
+        fieldId++;
+    }
+
+    public void populateExtraFieldInEntry(PwEntryV4 pwEntry) {
+
+        pwEntry.addExtraField(getString(getColumnIndex(ExtraFieldCursor.COLUMN_LABEL)),
+                new ProtectedString((getInt(getColumnIndex(ExtraFieldCursor.COLUMN_PROTECTION)) > 0),
+                        getString(getColumnIndex(ExtraFieldCursor.COLUMN_VALUE))));
+
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/exception/UnknownKDF.java

@@ -0,0 +1,16 @@
+package com.kunzisoft.keepass.database.exception;
+
+import java.io.IOException;
+
+public class UnknownKDF extends IOException {
+
+    private static String message = "Unknown key derivation function";
+
+    public UnknownKDF() {
+        super(message);
+    }
+
+    public UnknownKDF(Exception e) {
+        super(message, e);
+    }
+}

app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIterator.java

@@ -22,8 +22,8 @@ package com.kunzisoft.keepass.database.iterator;
 import com.kunzisoft.keepass.database.PwEntry;
 import com.kunzisoft.keepass.database.PwEntryV3;
 import com.kunzisoft.keepass.database.PwEntryV4;
-import com.kunzisoft.keepass.database.SearchParameters;
-import com.kunzisoft.keepass.database.SearchParametersV4;
+import com.kunzisoft.keepass.database.search.SearchParameters;
+import com.kunzisoft.keepass.database.search.SearchParametersV4;
 
 import java.util.Iterator;
 

app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV3.java

@@ -20,7 +20,7 @@
 package com.kunzisoft.keepass.database.iterator;
 
 import com.kunzisoft.keepass.database.PwEntryV3;
-import com.kunzisoft.keepass.database.SearchParameters;
+import com.kunzisoft.keepass.database.search.SearchParameters;
 
 import java.util.NoSuchElementException;
 
@@ -76,15 +76,19 @@ public class EntrySearchStringIteratorV3 extends EntrySearchStringIterator {
             switch (current) {
             case title:
                 found = sp.searchInTitles;
+				break;
             
             case url:
             	found = sp.searchInUrls;
+				break;
                     
             case username:
-                found = sp.searchInUserNames;    
+                found = sp.searchInUserNames;
+				break;
             	
             case comment:
             	found = sp.searchInNotes;
+				break;
                     
             default:
             	found = true;

app/src/main/java/com/kunzisoft/keepass/database/iterator/EntrySearchStringIteratorV4.java

@@ -20,7 +20,7 @@
 package com.kunzisoft.keepass.database.iterator;
 
 import com.kunzisoft.keepass.database.PwEntryV4;
-import com.kunzisoft.keepass.database.SearchParametersV4;
+import com.kunzisoft.keepass.database.search.SearchParametersV4;
 import com.kunzisoft.keepass.database.security.ProtectedString;
 
 import java.util.Iterator;
@@ -78,18 +78,19 @@ public class EntrySearchStringIteratorV4 extends EntrySearchStringIterator {
 	}
 	
 	private boolean searchInField(String key) {
-		if (key.equals(PwEntryV4.STR_TITLE)) {
-			return sp.searchInTitles;
-		} else if (key.equals(PwEntryV4.STR_USERNAME)) {
-			return sp.searchInUserNames;
-		} else if (key.equals(PwEntryV4.STR_PASSWORD)) {
-			return sp.searchInPasswords;
-		} else if (key.equals(PwEntryV4.STR_URL)) {
-			return sp.searchInUrls;
-		} else if (key.equals(PwEntryV4.STR_NOTES)) {
-			return sp.searchInNotes;
-		} else {
-			return sp.searchInOther;
+		switch (key) {
+			case PwEntryV4.STR_TITLE:
+				return sp.searchInTitles;
+			case PwEntryV4.STR_USERNAME:
+				return sp.searchInUserNames;
+			case PwEntryV4.STR_PASSWORD:
+				return sp.searchInPasswords;
+			case PwEntryV4.STR_URL:
+				return sp.searchInUrls;
+			case PwEntryV4.STR_NOTES:
+				return sp.searchInNotes;
+			default:
+				return sp.searchInOther;
 		}
 	}
 

app/src/main/java/com/kunzisoft/keepass/database/load/Importer.java

@@ -33,7 +33,7 @@ public abstract class Importer {
 	public abstract PwDatabase openDatabase(InputStream inStream, String password, InputStream keyInputStream)
 		throws IOException, InvalidDBException;
 
-	public abstract PwDatabase openDatabase(InputStream inStream, String password, InputStream keyInputStream, ProgressTaskUpdater updater, long roundsFix)
+	public abstract PwDatabase openDatabase(InputStream inStream, String password, InputStream keyInputStream, ProgressTaskUpdater updater)
 		throws IOException, InvalidDBException;
 
 }

app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java

@@ -126,11 +126,11 @@ public class ImporterV3 extends Importer {
 	@Override
 	public PwDatabaseV3 openDatabase( InputStream inStream, String password, InputStream kfIs)
 	throws IOException, InvalidDBException {
-		return openDatabase(inStream, password, kfIs, null, 0);
+		return openDatabase(inStream, password, kfIs, null);
 	}
 
 	@Override
-	public PwDatabaseV3 openDatabase(InputStream inStream, String password, InputStream kfIs, ProgressTaskUpdater progressTaskUpdater, long roundsFix)
+	public PwDatabaseV3 openDatabase(InputStream inStream, String password, InputStream kfIs, ProgressTaskUpdater progressTaskUpdater)
 	throws IOException, InvalidDBException {
 
 		PwDatabaseV3 databaseToOpen;
@@ -316,7 +316,7 @@ public class ImporterV3 extends Importer {
 			grp.setExpiryTime(new PwDate(buf, offset));
 			break;
 		case 0x0007 :
-			grp.setIcon(db.getIconFactory().getIcon(LEDataInputStream.readInt(buf, offset)));
+			grp.setIconStandard(db.getIconFactory().getIcon(LEDataInputStream.readInt(buf, offset)));
 			break;
 		case 0x0008 :
 			grp.setLevel(LEDataInputStream.readUShort(buf, offset));
@@ -353,7 +353,7 @@ public class ImporterV3 extends Importer {
 				iconId = 0;
 			}
 			
-			ent.setIcon(db.getIconFactory().getIcon(iconId));
+			ent.setIconStandard(db.getIconFactory().getIcon(iconId));
 			break;
 		case 0x0004 :
 			ent.setTitle(Types.readCString(buf, offset));

app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3Debug.java

@@ -35,10 +35,9 @@ public class ImporterV3Debug extends ImporterV3 {
 	
 	@Override
 	public PwDatabaseV3Debug openDatabase(InputStream inStream, String password,
-										  InputStream keyInputStream, ProgressTaskUpdater status, long roundsFix) throws IOException,
+										  InputStream keyInputStream, ProgressTaskUpdater status) throws IOException,
             InvalidDBException {
-		return (PwDatabaseV3Debug) super.openDatabase(inStream, password, keyInputStream, status,
-				roundsFix);
+		return (PwDatabaseV3Debug) super.openDatabase(inStream, password, keyInputStream, status);
 	}
 
 }

app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java

@@ -92,12 +92,12 @@ public class ImporterV4 extends Importer {
 	public PwDatabaseV4 openDatabase(InputStream inStream, String password,
 			InputStream keyInputStream) throws IOException, InvalidDBException {
 
-		return openDatabase(inStream, password, keyInputStream, null, 0);
+		return openDatabase(inStream, password, keyInputStream, null);
 	}
 	
 	@Override
     public PwDatabaseV4 openDatabase(InputStream inStream, String password,
-									 InputStream keyInputStream, ProgressTaskUpdater progressTaskUpdater, long roundsFix) throws IOException,
+									 InputStream keyInputStream, ProgressTaskUpdater progressTaskUpdater) throws IOException,
             InvalidDBException {
 
 		if (progressTaskUpdater != null)
@@ -114,7 +114,7 @@ public class ImporterV4 extends Importer {
 		pbHeader = hh.header;
 
 		db.retrieveMasterKey(password, keyInputStream);
-		db.makeFinalKey(header.masterSeed, roundsFix);
+		db.makeFinalKey(header.masterSeed);
 
 		if (progressTaskUpdater != null)
 			progressTaskUpdater.updateMessage(R.string.decrypting_db);
@@ -125,14 +125,8 @@ public class ImporterV4 extends Importer {
 			db.setDataEngine(engine);
 			db.setEncryptionAlgorithm(engine.getPwEncryptionAlgorithm());
 			cipher = engine.getCipher(Cipher.DECRYPT_MODE, db.getFinalKey(), header.encryptionIV);
-		} catch (NoSuchAlgorithmException e) {
-			throw new IOException("Invalid algorithm.");
-		} catch (NoSuchPaddingException e) {
-			throw new IOException("Invalid algorithm.");
-		} catch (InvalidKeyException e) {
-			throw new IOException("Invalid algorithm.");
-		} catch (InvalidAlgorithmParameterException e) {
-			throw new IOException("Invalid algorithm.");
+		} catch (NoSuchAlgorithmException|NoSuchPaddingException|InvalidKeyException|InvalidAlgorithmParameterException e) {
+			throw new IOException("Invalid algorithm.", e);
 		}
 
 		InputStream isPlain;
@@ -562,9 +556,9 @@ public class ImporterV4 extends Importer {
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemNotes) ) {
 				ctxGroup.setNotes(ReadString(xpp));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemIcon) ) {
-				ctxGroup.setIcon(db.getIconFactory().getIcon((int)ReadUInt(xpp, 0)));
+				ctxGroup.setIconStandard(db.getIconFactory().getIcon((int)ReadUInt(xpp, 0)));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconID) ) {
-				ctxGroup.setCustomIcon(db.getIconFactory().getIcon(ReadUuid(xpp)));
+				ctxGroup.setIconCustom(db.getIconFactory().getIcon(ReadUuid(xpp)));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemTimes) ) {
 				return SwitchContext(ctx, KdbContext.GroupTimes, xpp);
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemIsExpanded) ) {
@@ -617,9 +611,9 @@ public class ImporterV4 extends Importer {
 			if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemUuid) ) {
 				ctxEntry.setUUID(ReadUuid(xpp));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemIcon) ) {
-				ctxEntry.setIcon(db.getIconFactory().getIcon((int)ReadUInt(xpp, 0)));
+				ctxEntry.setIconStandard(db.getIconFactory().getIcon((int)ReadUInt(xpp, 0)));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomIconID) ) {
-				ctxEntry.setCustomIcon(db.getIconFactory().getIcon(ReadUuid(xpp)));
+				ctxEntry.setIconCustom(db.getIconFactory().getIcon(ReadUuid(xpp)));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemFgColor) ) {
 				ctxEntry.setForegroundColor(ReadString(xpp));
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemBgColor) ) {
@@ -963,7 +957,7 @@ public class ImporterV4 extends Importer {
 			ReadUnknown(xpp);
 		}
 		
-		assert(xpp.getName() == unknownName);
+		assert(xpp.getName().equals(unknownName));
 		
 	}
 	

app/src/main/java/com/kunzisoft/keepass/database/save/PwDbHeaderOutputV4.java

@@ -100,7 +100,6 @@ public class PwDbHeaderOutputV4 extends PwDbHeaderOutput {
 			writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.TransformRounds, LEDataOutputStream.writeLongBuf(db.getNumberKeyEncryptionRounds()));
 		} else {
             writeHeaderField(PwDbHeaderV4.PwDbHeaderV4Fields.KdfParameters, KdfParameters.serialize(db.getKdfParameters()));
-            // TODO verify serialize in all cases
 		}
 
 		if (header.encryptionIV.length > 0) {

app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV3Output.java

@@ -63,7 +63,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 			mPM.makeFinalKey(h3.masterSeed, h3.transformSeed, mPM.getNumberKeyEncryptionRounds());
 			return mPM.getFinalKey();
 		} catch (IOException e) {
-			throw new PwDbOutputException("Key creation failed: " + e.getMessage());
+			throw new PwDbOutputException("Key creation failed.", e);
 		}
 	}
 	
@@ -85,7 +85,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 				throw new Exception();
 			}
 		} catch (Exception e) {
-			throw new PwDbOutputException("Algorithm not supported.");
+			throw new PwDbOutputException("Algorithm not supported.", e);
 		}
 
 		try {
@@ -97,11 +97,11 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 			bos.close();
 
 		} catch (InvalidKeyException e) {
-			throw new PwDbOutputException("Invalid key");
+			throw new PwDbOutputException("Invalid key", e);
 		} catch (InvalidAlgorithmParameterException e) {
-			throw new PwDbOutputException("Invalid algorithm parameter.");
+			throw new PwDbOutputException("Invalid algorithm parameter.", e);
 		} catch (IOException e) {
-			throw new PwDbOutputException("Failed to output final encrypted part.");
+			throw new PwDbOutputException("Failed to output final encrypted part.", e);
 		}
 	}
 	
@@ -145,7 +145,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 		try {
 			md = MessageDigest.getInstance("SHA-256");
 		} catch (NoSuchAlgorithmException e) {
-			throw new PwDbOutputException("SHA-256 not implemented here.");
+			throw new PwDbOutputException("SHA-256 not implemented here.", e);
 		}
 		
 		// Header checksum
@@ -153,7 +153,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 		try {
 			headerDigest = MessageDigest.getInstance("SHA-256");
 		} catch (NoSuchAlgorithmException e) {
-			throw new PwDbOutputException("SHA-256 not implemented here.");
+			throw new PwDbOutputException("SHA-256 not implemented here.", e);
 		}
 		NullOutputStream nos;
 		nos = new NullOutputStream();
@@ -180,7 +180,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 			bos.flush();
 			bos.close();
 		} catch (IOException e) {
-			throw new PwDbOutputException("Failed to generate checksum.");
+			throw new PwDbOutputException("Failed to generate checksum.", e);
 		}
 
 		header.contentsHash = md.digest();
@@ -210,7 +210,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 			    los.writeInt(headerHashBlock.length);
 			    los.write(headerHashBlock);
 		    } catch (IOException e) {
-			    throw new PwDbOutputException("Failed to output header hash: " + e.getMessage());
+			    throw new PwDbOutputException("Failed to output header hash.", e);
 		    }
 		}
 		
@@ -222,7 +222,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 			try {
 				pgo.output();
 			} catch (IOException e) {
-				throw new PwDbOutputException("Failed to output a tree: " + e.getMessage());
+				throw new PwDbOutputException("Failed to output a tree", e);
 			}
 		}
 		
@@ -233,7 +233,7 @@ public class PwDbV3Output extends PwDbOutput<PwDbHeaderV3> {
 			try {
 				peo.output();
 			} catch (IOException e) {
-				throw new PwDbOutputException("Failed to output an entry.");
+				throw new PwDbOutputException("Failed to output an entry.", e);
 			}
 		}
 	}

app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java

@@ -19,6 +19,7 @@
  */
 package com.kunzisoft.keepass.database.save;
 
+import android.util.Log;
 import android.util.Xml;
 
 import com.kunzisoft.keepass.crypto.CipherFactory;
@@ -42,6 +43,7 @@ import com.kunzisoft.keepass.database.PwEntryV4;
 import com.kunzisoft.keepass.database.PwGroupV4;
 import com.kunzisoft.keepass.database.PwIconCustom;
 import com.kunzisoft.keepass.database.exception.PwDbOutputException;
+import com.kunzisoft.keepass.database.exception.UnknownKDF;
 import com.kunzisoft.keepass.database.security.ProtectedBinary;
 import com.kunzisoft.keepass.database.security.ProtectedString;
 import com.kunzisoft.keepass.stream.HashedBlockOutputStream;
@@ -74,6 +76,7 @@ import javax.crypto.CipherOutputStream;
 import biz.source_code.base64Coder.Base64Coder;
 
 public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
+    private static final String TAG = PwDbV4Output.class.getName();
 
 	private PwDatabaseV4 mPM;
 	private StreamCipher randomStream;
@@ -276,10 +279,8 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		} catch (Exception e) {
 			throw new PwDbOutputException("Invalid algorithm.", e);
 		}
-		
-		CipherOutputStream cos = new CipherOutputStream(os, cipher);
-		
-		return cos;
+
+        return new CipherOutputStream(os, cipher);
 	}
 
 	@Override
@@ -293,8 +294,16 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		}
 		random.nextBytes(header.encryptionIV);
 
-		KdfEngine kdf = KdfFactory.get(mPM.getKdfParameters());
-		kdf.randomize(mPM.getKdfParameters());
+		if (mPM.getKdfParameters() == null) {
+			mPM.setKdfParameters(KdfFactory.aesKdf.getDefaultParameters());
+		}
+
+		try {
+			KdfEngine kdf = KdfFactory.getEngineV4(mPM.getKdfParameters());
+			kdf.randomize(mPM.getKdfParameters());
+		} catch (UnknownKDF unknownKDF) {
+            Log.e(TAG, "Unable to retrieve header", unknownKDF);
+		}
 
 		if (header.getVersion() < PwDbHeaderV4.FILE_VERSION_32_4) {
 			header.innerRandomStream = CrsAlgorithm.Salsa20;
@@ -341,10 +350,10 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		writeObject(PwDatabaseV4XML.ElemUuid, group.getUUID());
 		writeObject(PwDatabaseV4XML.ElemName, group.getName());
 		writeObject(PwDatabaseV4XML.ElemNotes, group.getNotes());
-		writeObject(PwDatabaseV4XML.ElemIcon, group.getIconStandard().iconId);
+		writeObject(PwDatabaseV4XML.ElemIcon, group.getIconStandard().getIconId());
 		
-		if (!group.getCustomIcon().equals(PwIconCustom.ZERO)) {
-			writeObject(PwDatabaseV4XML.ElemCustomIconID, group.getCustomIcon().uuid);
+		if (!group.getIconCustom().equals(PwIconCustom.ZERO)) {
+			writeObject(PwDatabaseV4XML.ElemCustomIconID, group.getIconCustom().getUUID());
 		}
 		
 		writeList(PwDatabaseV4XML.ElemTimes, group);
@@ -366,10 +375,10 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		xml.startTag(null, PwDatabaseV4XML.ElemEntry);
 		
 		writeObject(PwDatabaseV4XML.ElemUuid, entry.getUUID());
-		writeObject(PwDatabaseV4XML.ElemIcon, entry.getIconStandard().iconId);
+		writeObject(PwDatabaseV4XML.ElemIcon, entry.getIconStandard().getIconId());
 		
-		if (!entry.getCustomIcon().equals(PwIconCustom.ZERO)) {
-			writeObject(PwDatabaseV4XML.ElemCustomIconID, entry.getCustomIcon().uuid);
+		if (!entry.getIconCustom().equals(PwIconCustom.ZERO)) {
+			writeObject(PwDatabaseV4XML.ElemCustomIconID, entry.getIconCustom().getUUID());
 		}
 		
 		writeObject(PwDatabaseV4XML.ElemFgColor, entry.getForegroundColor());
@@ -692,8 +701,8 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		for (PwIconCustom icon : customIcons) {
 			xml.startTag(null, PwDatabaseV4XML.ElemCustomIconItem);
 			
-			writeObject(PwDatabaseV4XML.ElemCustomIconItemID, icon.uuid);
-			writeObject(PwDatabaseV4XML.ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.imageData)));
+			writeObject(PwDatabaseV4XML.ElemCustomIconItemID, icon.getUUID());
+			writeObject(PwDatabaseV4XML.ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.getImageData())));
 			
 			xml.endTag(null, PwDatabaseV4XML.ElemCustomIconItem);
 		}

app/src/main/java/com/kunzisoft/keepass/database/save/PwEntryOutputV3.java

@@ -79,12 +79,12 @@ public class PwEntryOutputV3 {
 		// Group ID
 		mOS.write(GROUPID_FIELD_TYPE);
 		mOS.write(LONG_FOUR);
-		mOS.write(LEDataOutputStream.writeIntBuf(mPE.getGroupId()));
+		mOS.write(LEDataOutputStream.writeIntBuf(mPE.getParent().getGroupId()));
 		
 		// Image ID
 		mOS.write(IMAGEID_FIELD_TYPE);
 		mOS.write(LONG_FOUR);
-		mOS.write(LEDataOutputStream.writeIntBuf(mPE.getIconStandard().iconId));
+		mOS.write(LEDataOutputStream.writeIntBuf(mPE.getIconStandard().getIconId()));
 
 		// Title
 		//byte[] title = mPE.title.getBytes("UTF-8");