From 73fa4e8ad952b277802b737e730c1595c1ba28d0 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Mon, 16 Feb 2015 15:13:14 +0100
Subject: [PATCH] Fix https://github.com/nerzhul/ocsms/issues/39 problem

---
 .../owncloud_sms/engine/SmsFetcher.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java b/src/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
index b71040c..77f9661 100644
--- a/src/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
+++ b/src/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
@@ -142,30 +142,34 @@ public class SmsFetcher {
 		JSONObject entry = new JSONObject();
 
 		try {
-			for(int idx=0;idx<c.getColumnCount();idx++) {
+			Integer mboxId = -1;
+			for(int idx = 0;idx < c.getColumnCount(); idx++) {
 				String colName = c.getColumnName(idx);
 				
 				// Id column is must be an integer
 				if (colName.equals(new String("_id")) ||
 					colName.equals(new String("type"))) {
 					entry.put(colName, c.getInt(idx));
-					
-					// bufferize Id for future use
-					if (colName.equals(new String("_id"))) {
-					}
 				}
 				// Seen and read must be pseudo boolean
 				else if (colName.equals(new String("read")) ||
 						colName.equals(new String("seen"))) {
 					entry.put(colName, c.getInt(idx) > 0 ? "true" : "false");
 				}
+				else if (colName.equals(new String("type"))) {
+					mboxId = c.getInt(idx);
+				}
 				else {
 					entry.put(colName, c.getString(idx));
 				}
 			}
 			
-			// Mailbox ID is required by server
-			entry.put("mbox", mbID.ordinal());
+			/*
+			* Mailbox ID is required by server
+			* mboxId is greater than server mboxId by 1 because types 
+			* aren't indexed in the same mean
+			*/
+			entry.put("mbox", (mboxId - 1));
 			
 			results.put(entry);
 		} catch (JSONException e) {