Added check to PSTObject so that when getDescriptorNodeId is called on embedded attachments no NPE is raised.

Added class PSTConversationIndex  that decoded the byte array into a usable form

Author: nickbuller

src/main/java/com/pff/PSTConversationIndex.java

@@ -0,0 +1,113 @@
+package com.pff;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Class to hold decoded PidTagConversationIndex
+ *
+ * @author Nick Buller
+ */
+public class PSTConversationIndex {
+	private static final int HUNDRED_NS_TO_MS = 1000;
+	private static final int MINIMUM_HEADER_SIZE = 22;
+	private static final int RESPONSE_LEVEL_SIZE = 5;
+
+	private Date deliveryTime;
+	private UUID guid;
+	private List<ResponseLevel> responseLevels = new ArrayList<ResponseLevel>();
+
+	public Date getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public UUID getGuid() {
+		return guid;
+	}
+
+	public List<ResponseLevel> getResponseLevels() {
+		return responseLevels;
+	}
+
+	public String toString() {
+		return guid + "@" + deliveryTime + " " + responseLevels.size() + " ResponseLevels";
+	}
+
+	public class ResponseLevel {
+		short deltaCode;
+		long timeDelta;
+		short random;
+
+		public ResponseLevel(short deltaCode, long timeDelta, short random) {
+			this.deltaCode = deltaCode;
+			this.timeDelta = timeDelta;
+			this.random = random;
+		}
+
+		public short getDeltaCode() {
+			return deltaCode;
+		}
+
+		public long getTimeDelta() {
+			return timeDelta;
+		}
+
+		public short getRandom() {
+			return random;
+		}
+
+		public Date withOffset(Date anchorDate) {
+			return new Date(anchorDate.getTime() + timeDelta);
+		}
+	}
+
+	protected PSTConversationIndex(byte[] rawConversationIndex) {
+		if (rawConversationIndex != null && rawConversationIndex.length >= MINIMUM_HEADER_SIZE) {
+			decodeHeader(rawConversationIndex);
+			if (rawConversationIndex.length >= MINIMUM_HEADER_SIZE + RESPONSE_LEVEL_SIZE) {
+				decodeResponseLevel(rawConversationIndex);
+			}
+		}
+	}
+
+	private void decodeHeader(byte[] rawConversationIndex) {
+		// According to the Spec the first byte is not included, but I believe the spec is incorrect!
+		//int reservedheaderMarker = (int) PSTObject.convertBigEndianBytesToLong(rawConversationIndex, 0, 1);
+
+		long deliveryTimeHigh = PSTObject.convertBigEndianBytesToLong(rawConversationIndex, 0, 4);
+		long deliveryTimeLow = PSTObject.convertBigEndianBytesToLong(rawConversationIndex, 4, 6) << 16;
+		deliveryTime = PSTObject.filetimeToDate((int) deliveryTimeHigh, (int) deliveryTimeLow);
+
+		long guidHigh = PSTObject.convertBigEndianBytesToLong(rawConversationIndex, 6, 14);
+		long guidLow = PSTObject.convertBigEndianBytesToLong(rawConversationIndex, 14, 22);
+
+		guid = new UUID(guidHigh, guidLow);
+	}
+
+	private void decodeResponseLevel(byte[] rawConversationIndex) {
+		int responseLevelCount = (rawConversationIndex.length - MINIMUM_HEADER_SIZE) / RESPONSE_LEVEL_SIZE;
+		responseLevels = new ArrayList<ResponseLevel>(responseLevelCount);
+
+		for (int responseLevelIndex = 0, position = 22; responseLevelIndex < responseLevelCount; responseLevelIndex++, position += RESPONSE_LEVEL_SIZE) {
+
+			long responseLevelValue = PSTObject.convertBigEndianBytesToLong(rawConversationIndex, position, position + 5);
+			short deltaCode = (short) (responseLevelValue >> 39);
+			short random = (short) (responseLevelValue & 0xFF);
+
+			// shift by 1 byte (remove the random) and mask off the deltaCode
+			long deltaTime = (responseLevelValue >> 8) & 0x7FFFFFFF;
+
+			if (deltaCode == 0) {
+				deltaTime <<= 18;
+			} else {
+				deltaTime <<= 23;
+			}
+
+			deltaTime /= HUNDRED_NS_TO_MS;
+
+			responseLevels.add(responseLevelIndex, new ResponseLevel(deltaCode, deltaTime, random));
+		}
+	}
+}

src/main/java/com/pff/PSTMessage.java

@@ -588,6 +588,9 @@ public Date getMessageDeliveryTime() {
 	/**
 	 * Message content properties
 	 */
+	public int getNativeBodyType() {
+		return this.getIntItem(0x1016);
+	}
 
 	/**
 	 * Plain text e-mail body
@@ -991,7 +994,6 @@ public PSTRecipient getRecipient(int recipientNumber)
 		return null;
 	}
 
-	
 	public String getRecipientsString() {
 		if ( recipientTable != null ) {
 			return recipientTable.getItemsString();
@@ -1004,51 +1006,13 @@ public byte[] getConversationId() {
 		return getBinaryItem(0x3013);
 	}
 
-	public byte[] getConversationIndex() {
-		byte[] conversationIndex = getBinaryItem(0x0071);
-		return conversationIndex;
-	}
-
-	public String getConversationIndexAsString() {
-		byte[] conversationId = getConversationIndex();
-
-		if(conversationId != null && conversationId.length >= 22) {
-			// Header 22 Bytes
-			int reservedheaderMarker = (int) PSTObject.convertBigEndianBytesToLong(conversationId, 0, 1);
-			// According to the Spec the first byte is not included, but I believe the spec is incorrect!
-			long deliveryTimeHigh = PSTObject.convertBigEndianBytesToLong(conversationId, 0, 4);
-			long deliveryTimeLow = PSTObject.convertBigEndianBytesToLong(conversationId, 4, 6) << 16;
-			Date deliveryTime = PSTObject.filetimeToDate((int)deliveryTimeHigh, (int)deliveryTimeLow);
-
-
-			byte[] guidData = new byte[16];
-			System.arraycopy(conversationId, 6, guidData, 0, guidData.length);
-			String guid = guidToString(guidData);
-
-			return deliveryTime.toString() + " " + guid;
-		}
-		return null;
-	}
-
-	public String guidToString(byte[] guidData) {
-
-
-		if(guidData.length == 16) {
-			int data1 = (int)PSTObject.convertBigEndianBytesToLong(guidData, 0, 4);
-			int data2 = (int)PSTObject.convertBigEndianBytesToLong(guidData, 4, 6);
-			int data3 = (int)PSTObject.convertBigEndianBytesToLong(guidData, 6, 8);
-			int data41 = (int)PSTObject.convertBigEndianBytesToLong(guidData, 8, 10);
-			long data42 = PSTObject.convertBigEndianBytesToLong(guidData, 10, 16);
-			String guidString = String.format("%08X-%04X-%04X-%04X-%012X", data1, data2, data3, data41, data42);
-			return guidString;
-		}
-		return "";
+	public PSTConversationIndex getConversationIndex() {
+		return new PSTConversationIndex(getBinaryItem(0x0071));
 	}
 
 	public boolean isConversationIndexTracking() {
 		return getBooleanItem(0x3016, false);
 	}
-	
 
 	/**
 	 * string representation of this email

src/main/java/com/pff/PSTObject.java

@@ -129,7 +129,10 @@ public DescriptorIndexNode getDescriptorNode() {
 	 * @return item's descriptor node identifier
 	 */
 	public long getDescriptorNodeId() {
-		return this.descriptorIndexNode.descriptorIdentifier;
+		if (this.descriptorIndexNode != null) { // Prevent null pointer exceptions for embedded messages
+			return this.descriptorIndexNode.descriptorIdentifier;
+		}
+		return 0;
 	}
 
 	public int getNodeType() {