From c1abafc72c0024fffebab66d23d6f7dbb5191f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <loic.blot@unix-experience.fr>
Date: Tue, 22 Aug 2017 16:49:55 +0200
Subject: [PATCH] SmsDataProvider: factorize field names

---
 .../providers/SmsDataProvider.java            | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java b/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
index c882350..dffd6b2 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
@@ -29,6 +29,17 @@ import fr.unix_experience.owncloud_sms.enums.MailboxID;
 import fr.unix_experience.owncloud_sms.prefs.OCSMSSharedPrefs;
 
 public class SmsDataProvider extends ContentProvider {
+	static String messageFields[] = {
+		"read",
+		"date",
+		"address",
+		"seen",
+		"body",
+		"_id",
+		"type",
+		//"length(address)" // For debug purposes
+	};
+
     // WARNING: mandatory
     public SmsDataProvider() {}
     public SmsDataProvider (Context ct) {
@@ -52,16 +63,7 @@ public class SmsDataProvider extends ContentProvider {
 	public Cursor queryNonExistingMessages(String mailBox, String existingIds) {
         Log.i(SmsDataProvider.TAG, "queryNonExistingMessages !");
 		if (!existingIds.isEmpty()) {
-            return query(Uri.parse(mailBox),
-                    new String[] {
-                        "read",
-                        "date",
-                        "address",
-                        "seen",
-                        "body",
-                        "_id",
-                        "type",
-                    },
+            return query(Uri.parse(mailBox), SmsDataProvider.messageFields,
                     "_id NOT IN (" + existingIds + ")", null, null
             );
 		}
@@ -70,17 +72,7 @@ public class SmsDataProvider extends ContentProvider {
 	}
 
     public Cursor queryMessagesSinceDate(String mailBox, Long sinceDate) {
-        return query(Uri.parse(mailBox),
-                new String[] {
-                    "read",
-                    "date",
-                    "address",
-                    "seen",
-                    "body",
-                    "_id",
-                    "type",
-                    //"length(address)" // For debug purposes
-                },
+        return query(Uri.parse(mailBox), SmsDataProvider.messageFields,
                 "date > ?", new String[] { sinceDate.toString() }, null
         );
     }