From e536b19f3b05229b7dce64c449815e580bd9764d Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Tue, 9 Jun 2015 07:49:32 +0900 Subject: [PATCH 1/3] Fix issue when messages received from server is empty. --- .../smssync/messages/ProcessMessage.java | 2 +- .../java/org/addhen/smssync/util/Util.java | 31 +++++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/smssync/src/main/java/org/addhen/smssync/messages/ProcessMessage.java b/smssync/src/main/java/org/addhen/smssync/messages/ProcessMessage.java index dac5b1a4f..3aa7b8ba3 100644 --- a/smssync/src/main/java/org/addhen/smssync/messages/ProcessMessage.java +++ b/smssync/src/main/java/org/addhen/smssync/messages/ProcessMessage.java @@ -216,7 +216,7 @@ public void smsServerResponse(SmssyncResponse response) { } if (response != null && response.getPayload() != null - && response.getPayload().getMessages().size() > 0) { + && (!Util.isEmpty(response.getPayload().getMessages()))) { for (Message msg : response.getPayload().getMessages()) { sendTaskSms(msg); } diff --git a/smssync/src/main/java/org/addhen/smssync/util/Util.java b/smssync/src/main/java/org/addhen/smssync/util/Util.java index 87a6bff74..4ae034602 100644 --- a/smssync/src/main/java/org/addhen/smssync/util/Util.java +++ b/smssync/src/main/java/org/addhen/smssync/util/Util.java @@ -17,6 +17,16 @@ package org.addhen.smssync.util; +import org.addhen.smssync.App; +import org.addhen.smssync.BuildConfig; +import org.addhen.smssync.R; +import org.addhen.smssync.activities.MainActivity; +import org.addhen.smssync.prefs.Prefs; +import org.addhen.smssync.receivers.ConnectivityChangedReceiver; +import org.addhen.smssync.state.LogEvent; +import org.json.JSONException; +import org.json.JSONObject; + import android.annotation.TargetApi; import android.app.NotificationManager; import android.app.PendingIntent; @@ -39,16 +49,6 @@ import android.util.Log; import android.widget.Toast; -import org.addhen.smssync.App; -import org.addhen.smssync.BuildConfig; -import org.addhen.smssync.R; -import org.addhen.smssync.activities.MainActivity; -import org.addhen.smssync.prefs.Prefs; -import org.addhen.smssync.receivers.ConnectivityChangedReceiver; -import org.addhen.smssync.state.LogEvent; -import org.json.JSONException; -import org.json.JSONObject; - import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; @@ -57,6 +57,7 @@ import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.regex.Matcher; @@ -171,7 +172,7 @@ public static String limitString(String value, int length) { * @return String */ public static String formatDate(String dateFormat, String date, - String toFormat) { + String toFormat) { String formatted = ""; @@ -280,7 +281,7 @@ public static void showNotification(Context context) { * @param notificationTitle notification title */ public static void showFailNotification(Context context, String message, - String notificationTitle) { + String notificationTitle) { Intent baseIntent = new Intent(context, MainActivity.class); baseIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -304,7 +305,7 @@ public static void showFailNotification(Context context, String message, * @param ongoing True if you don't want the user to clear the notification */ public static void buildNotification(Context context, int drawable, - String message, String title, PendingIntent intent, boolean ongoing) { + String message, String title, PendingIntent intent, boolean ongoing) { NotificationManager notificationManager = (NotificationManager) context .getSystemService(Context.NOTIFICATION_SERVICE); @@ -628,4 +629,8 @@ public void log(String format, Object... args) { public void log(String message, Exception ex) { Logger.log(getClass().getName(), message, ex); } + + public static boolean isEmpty(Collection collection) { + return collection == null || collection.isEmpty(); + } } From 6b6bfa4bbead1529271e89ebb2e53c0fac04e2f4 Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Tue, 9 Jun 2015 07:50:50 +0900 Subject: [PATCH 2/3] Update changelog --- changelog.json | 3 ++- smssync/src/main/play/en-US/whatsnew | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.json b/changelog.json index 138a492be..4ba998f7e 100644 --- a/changelog.json +++ b/changelog.json @@ -4,7 +4,8 @@ "date": "9th June, 2015", "features": [], "bugs": [ - "Upgrade otto to v1.3.7 to fix synthetic bridge methods created by JDK 8" + "Upgrade otto to v1.3.7 to fix synthetic bridge methods created by JDK 8", + "Fix issue when messages received from server is empty." ] }, { diff --git a/smssync/src/main/play/en-US/whatsnew b/smssync/src/main/play/en-US/whatsnew index 44b319e61..27ae0b88f 100644 --- a/smssync/src/main/play/en-US/whatsnew +++ b/smssync/src/main/play/en-US/whatsnew @@ -1 +1,2 @@ -- Upgrade otto to v1.3.7 to fix synthetic bridge methods created by JDK 8. \ No newline at end of file +- Upgrade otto to v1.3.7 to fix synthetic bridge methods created by JDK 8. +- Fix issue when messages received from server is empty. \ No newline at end of file From ee86cffcfc17a204f34202fdd205fd47a06147a3 Mon Sep 17 00:00:00 2001 From: Henry Addo Date: Tue, 9 Jun 2015 07:51:35 +0900 Subject: [PATCH 3/3] Update changelog --- smssync/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smssync/build.gradle b/smssync/build.gradle index c00803d89..1a963afd9 100644 --- a/smssync/build.gradle +++ b/smssync/build.gradle @@ -112,7 +112,7 @@ android { } defaultConfig { - versionCode 34 + versionCode 35 versionName "2.8.2" minSdkVersion 8 targetSdkVersion 22