From 08b54f8aa094dee1ca82bb2f2414e0c67c9670a0 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Mon, 29 Aug 2016 00:16:17 +0200
Subject: [PATCH] Fix null cursor on lastmessage and prevent a double cursor
 close in same func

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

diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
index ca6e383..2173c1f 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
@@ -70,7 +70,7 @@ public class SmsFetcher {
 
 				try {
                     String colName;
-					for(int idx=0;idx<c.getColumnCount();idx++) {
+					for(int idx = 0; idx < c.getColumnCount(); idx++) {
 						colName = c.getColumnName(idx);
 
 						// Id column is must be an integer
@@ -126,12 +126,15 @@ public class SmsFetcher {
 		
 		// Fetch Sent SMS Message from Built-in Content Provider
 		Cursor c = (new SmsDataProvider(_context)).query(mbURI);
+        if (c == null) {
+            return null;
+        }
 		
 		c.moveToNext();
 		
 		// We create a list of strings to store results
 		JSONArray results = new JSONArray();
-		
+
 		JSONObject entry = new JSONObject();
 
 		try {
@@ -139,7 +142,7 @@ public class SmsFetcher {
             String colName;
 			for(int idx = 0;idx < c.getColumnCount(); idx++) {
 				colName = c.getColumnName(idx);
-				
+
 				// Id column is must be an integer
                 switch (colName) {
                     case "_id":
@@ -159,18 +162,17 @@ public class SmsFetcher {
                         break;
                 }
 			}
-			
+
 			/*
 			* Mailbox ID is required by server
-			* mboxId is greater than server mboxId by 1 because types 
+			* 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) {
 			Log.e(SmsFetcher.TAG, "JSON Exception when reading SMS Mailbox", e);
-			c.close();
 		}
 		
 		c.close();