From 7bf18efe39ebceb1ea28b759ba613f89cd415d6d Mon Sep 17 00:00:00 2001
From: Brian Pellin <bpellin@gmail.com>
Date: Sat, 18 Feb 2012 13:04:33 -0700
Subject: [PATCH] Go back to explicitly storing blank fields in the database

Works around bug in keepassx
---
 CHANGELOG                                     |   3 +
 assets/test1.kdb                              | Bin 2092 -> 2204 bytes
 .../database/save/PwEntryOutputV3.java        |  91 ++++++------------
 .../database/save/PwGroupOutputV3.java        |  53 ++++------
 4 files changed, 51 insertions(+), 96 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c7ad2505d..c7bba6b94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+ * Go back to explicitly storing blank fields in the database
+   (works around bug in keepassx)
+
 KeePassdroid (1.9.8)
  * Fix crashes related to saving missing entries
  * Fix issues with setting wrong expiry date
diff --git a/assets/test1.kdb b/assets/test1.kdb
index 856649da6fc3683c644a4b07a666046617a75718..390ca3255dea330624dc12154f31bc75be0ac197 100644
GIT binary patch
literal 2204
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

literal 2092
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
Zo}y2a!Q_o!wr794kg<Dy!t}LqQvgnw3`YO}

diff --git a/src/com/keepassdroid/database/save/PwEntryOutputV3.java b/src/com/keepassdroid/database/save/PwEntryOutputV3.java
index eb72862a0..44143db10 100644
--- a/src/com/keepassdroid/database/save/PwEntryOutputV3.java
+++ b/src/com/keepassdroid/database/save/PwEntryOutputV3.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import com.keepassdroid.database.PwEntryV3;
-import com.keepassdroid.utils.EmptyUtils;
 import com.keepassdroid.utils.Types;
 
 public class PwEntryOutputV3 {
@@ -52,7 +51,7 @@ public class PwEntryOutputV3 {
 	public static final byte[] ZERO_FIELD_SIZE =    Types.writeInt(0);
 	public static final byte[] ZERO_FIVE       =   {0x00, 0x00, 0x00, 0x00, 0x00};
 	public static final byte[] TEST = {0x33, 0x33, 0x33, 0x33};
-	
+
 	private OutputStream mOS;
 	private PwEntryV3 mPE;
 	private long outputBytes = 0;
@@ -82,89 +81,59 @@ public class PwEntryOutputV3 {
 		mOS.write(Types.writeInt(mPE.groupId));
 		
 		// Image ID
-		if (mPE.icon != null) {
-			mOS.write(IMAGEID_FIELD_TYPE);
-			mOS.write(LONG_FOUR);
-			mOS.write(Types.writeInt(mPE.icon.iconId));
-		}
+		mOS.write(IMAGEID_FIELD_TYPE);
+		mOS.write(LONG_FOUR);
+		mOS.write(Types.writeInt(mPE.icon.iconId));
 
 		// Title
 		//byte[] title = mPE.title.getBytes("UTF-8");
-		if (!EmptyUtils.isNullOrEmpty(mPE.title)) {
-			mOS.write(TITLE_FIELD_TYPE);
-			int titleLen = Types.writeCString(mPE.title, mOS);
-			outputBytes += titleLen;
-		}
+		mOS.write(TITLE_FIELD_TYPE);
+		int titleLen = Types.writeCString(mPE.title, mOS);
+		outputBytes += titleLen;
 
 		// URL
-		if (!EmptyUtils.isNullOrEmpty(mPE.url)) {
-			mOS.write(URL_FIELD_TYPE);
-			int urlLen = Types.writeCString(mPE.url, mOS);
-			outputBytes += urlLen;
-		}
+		mOS.write(URL_FIELD_TYPE);
+		int urlLen = Types.writeCString(mPE.url, mOS);
+		outputBytes += urlLen;
 		
 		// Username
-		if (!EmptyUtils.isNullOrEmpty(mPE.username)) {
-			mOS.write(USERNAME_FIELD_TYPE);
-			int userLen = Types.writeCString(mPE.username, mOS);
-			outputBytes += userLen;
-		}
+		mOS.write(USERNAME_FIELD_TYPE);
+		int userLen = Types.writeCString(mPE.username, mOS);
+		outputBytes += userLen;
 		
 		// Password
 		byte[] password = mPE.getPasswordBytes();
-		if (!EmptyUtils.isNullOrEmpty(password)) {
-			mOS.write(PASSWORD_FIELD_TYPE);
-			mOS.write(Types.writeInt(password.length+1));
-			mOS.write(password);
-			mOS.write(0);
-			outputBytes += password.length + 1;
-		}
+		mOS.write(PASSWORD_FIELD_TYPE);
+		mOS.write(Types.writeInt(password.length+1));
+		mOS.write(password);
+		mOS.write(0);
+		outputBytes += password.length + 1;
 
 		// Additional
-		if (!EmptyUtils.isNullOrEmpty(mPE.additional)) {
-			mOS.write(ADDITIONAL_FIELD_TYPE);
-			int addlLen = Types.writeCString(mPE.additional, mOS);
-			outputBytes += addlLen;
-		}
+		mOS.write(ADDITIONAL_FIELD_TYPE);
+		int addlLen = Types.writeCString(mPE.additional, mOS);
+		outputBytes += addlLen;
 
 		// Create date
-		if (!EmptyUtils.isNullOrEmpty(mPE.tCreation)) {
-			writeDate(CREATE_FIELD_TYPE, mPE.tCreation.getCDate());
-		}
+		writeDate(CREATE_FIELD_TYPE, mPE.tCreation.getCDate());
 		
 		// Modification date
-		if (!EmptyUtils.isNullOrEmpty(mPE.tLastMod)) {
-			writeDate(MOD_FIELD_TYPE, mPE.tLastMod.getCDate());
-		}
+		writeDate(MOD_FIELD_TYPE, mPE.tLastMod.getCDate());
 
 		// Access date
-		if (!EmptyUtils.isNullOrEmpty(mPE.tLastAccess)) {
-			writeDate(ACCESS_FIELD_TYPE, mPE.tLastAccess.getCDate());
-		}
+		writeDate(ACCESS_FIELD_TYPE, mPE.tLastAccess.getCDate());
 
 		// Expiration date
-		if (mPE.tExpire != null) {
-			// Correct previously saved wrong expiry dates
-			if (mPE.tExpire.equals(PwEntryV3.PW_NEVER_EXPIRE_BUG)) {
-				mPE.tExpire = PwEntryV3.PW_NEVER_EXPIRE;
-			}
-			
-			writeDate(EXPIRE_FIELD_TYPE, mPE.tExpire.getCDate());
-		}
+		writeDate(EXPIRE_FIELD_TYPE, mPE.tExpire.getCDate());
 	
 		// Binary desc
-		if (!EmptyUtils.isNullOrEmpty(mPE.binaryDesc)) {
-			mOS.write(BINARY_DESC_FIELD_TYPE);
-			int descLen = Types.writeCString(mPE.binaryDesc, mOS);
-			outputBytes += descLen;
-		}
+		mOS.write(BINARY_DESC_FIELD_TYPE);
+		int descLen = Types.writeCString(mPE.binaryDesc, mOS);
+		outputBytes += descLen;
 	
 		// Binary data
-		byte[] binaryData = mPE.getBinaryData();
-		if (!EmptyUtils.isNullOrEmpty(binaryData)) {
-			int dataLen = writeByteArray(binaryData);
-			outputBytes += dataLen;
-		}
+		int dataLen = writeByteArray(mPE.getBinaryData());
+		outputBytes += dataLen;
 
 		// End
 		mOS.write(END_FIELD_TYPE);
diff --git a/src/com/keepassdroid/database/save/PwGroupOutputV3.java b/src/com/keepassdroid/database/save/PwGroupOutputV3.java
index 6f6409c1f..f6129a560 100644
--- a/src/com/keepassdroid/database/save/PwGroupOutputV3.java
+++ b/src/com/keepassdroid/database/save/PwGroupOutputV3.java
@@ -22,9 +22,8 @@ package com.keepassdroid.database.save;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.keepassdroid.database.PwEntryV3;
+
 import com.keepassdroid.database.PwGroupV3;
-import com.keepassdroid.utils.EmptyUtils;
 import com.keepassdroid.utils.Types;
 
 public class PwGroupOutputV3 {
@@ -68,49 +67,33 @@ public class PwGroupOutputV3 {
 		mOS.write(Types.writeInt(mPG.groupId));
 		
 		// Name
-		if (!EmptyUtils.isNullOrEmpty(mPG.name)) {
-			mOS.write(NAME_FIELD_TYPE);
-			Types.writeCString(mPG.name, mOS);
-		}
+		mOS.write(NAME_FIELD_TYPE);
+		Types.writeCString(mPG.name, mOS);
 
 		// Create date
-		if (!EmptyUtils.isNullOrEmpty(mPG.tCreation)) {
-			mOS.write(CREATE_FIELD_TYPE);
-			mOS.write(DATE_FIELD_SIZE);
-			mOS.write(mPG.tCreation.getCDate());
-		}
+		mOS.write(CREATE_FIELD_TYPE);
+		mOS.write(DATE_FIELD_SIZE);
+		mOS.write(mPG.tCreation.getCDate());
 		
 		// Modification date
-		if (!EmptyUtils.isNullOrEmpty(mPG.tLastMod)) {
-			mOS.write(MOD_FIELD_TYPE);
-			mOS.write(DATE_FIELD_SIZE);
-			mOS.write(mPG.tLastMod.getCDate());
-		}
+		mOS.write(MOD_FIELD_TYPE);
+		mOS.write(DATE_FIELD_SIZE);
+		mOS.write(mPG.tLastMod.getCDate());
 		
 		// Access date
-		if (!EmptyUtils.isNullOrEmpty(mPG.tLastAccess)) {
-			mOS.write(ACCESS_FIELD_TYPE);
-			mOS.write(DATE_FIELD_SIZE);
-			mOS.write(mPG.tLastAccess.getCDate());
-		}
+		mOS.write(ACCESS_FIELD_TYPE);
+		mOS.write(DATE_FIELD_SIZE);
+		mOS.write(mPG.tLastAccess.getCDate());
 		
 		// Expiration date
-		if (!EmptyUtils.isNullOrEmpty(mPG.tExpire)) {
-			// Correct previously saved wrong expiry dates
-			if (mPG.tExpire.equals(PwEntryV3.PW_NEVER_EXPIRE_BUG)) {
-				mPG.tExpire = PwEntryV3.PW_NEVER_EXPIRE;
-			}
-			mOS.write(EXPIRE_FIELD_TYPE);
-			mOS.write(DATE_FIELD_SIZE);
-			mOS.write(mPG.tExpire.getCDate());
-		}
+		mOS.write(EXPIRE_FIELD_TYPE);
+		mOS.write(DATE_FIELD_SIZE);
+		mOS.write(mPG.tExpire.getCDate());
 		
 		// Image ID
-		if (mPG.icon != null) { 
-			mOS.write(IMAGEID_FIELD_TYPE);
-			mOS.write(IMAGEID_FIELD_SIZE);
-			mOS.write(Types.writeInt(mPG.icon.iconId));
-		}
+		mOS.write(IMAGEID_FIELD_TYPE);
+		mOS.write(IMAGEID_FIELD_SIZE);
+		mOS.write(Types.writeInt(mPG.icon.iconId));
 		
 		// Level
 		mOS.write(LEVEL_FIELD_TYPE);