Merge branch 'hotfix/1823-optional-phoneNumber-param'

Author: muloem

GAE/src/com/gallatinsystems/diagnostics/app/web/RemoteExceptionRestServlet.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2016 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -65,6 +65,7 @@ protected RestResponse handleRequest(RestRequest req) throws Exception {
             trace.setDeviceIdentifier(exReq.getDeviceIdent());
             trace.setPhoneNumber(exReq.getPhoneNumber());
             trace.setStackTrace(new Text(exReq.getStackTrace()));
+            trace.setAndroidId(exReq.getAndroidId());
             stacktraceDao.save(trace);
         } else {
             throw new RestException(new RestError(RestError.BAD_DATATYPE_CODE,

GAE/src/com/gallatinsystems/diagnostics/app/web/dto/RemoteExceptionRequest.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2016 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -19,6 +19,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -37,7 +38,7 @@ public class RemoteExceptionRequest extends RestRequest {
     private static final ThreadLocal<DateFormat> DATE_FMT = new ThreadLocal<DateFormat>() {
         @Override
         protected DateFormat initialValue() {
-            return new SimpleDateFormat(FORMAT_STRING);
+            return new SimpleDateFormat(FORMAT_STRING, Locale.US); // Always specify a locale for M2M formatting
         };
     };
 
@@ -48,12 +49,14 @@ protected DateFormat initialValue() {
     public static final String VERSION_PARAM = "version";
     public static final String DATE_PARAM = "date";
     public static final String TRACE_PARAM = "trace";
+    public static final String ANDROID_ID_PARAM = "androidId";
 
     private String phoneNumber;
     private String deviceIdent;
     private String version;
     private Date date;
     private String stackTrace;
+    private String androidId;
 
     public String getStackTrace() {
         return stackTrace;
@@ -95,13 +98,16 @@ public void setDate(Date date) {
         this.date = date;
     }
 
+    public String getAndroidId() {
+        return androidId;
+    }
+
+    public void setAndroidId(String androidId) {
+        this.androidId = androidId;
+    }
+
     @Override
     protected void populateErrors() {
-        if (phoneNumber == null || phoneNumber.trim().length() == 0) {
-            addError(new RestError(RestError.MISSING_PARAM_ERROR_CODE,
-                    RestError.MISSING_PARAM_ERROR_MESSAGE, PHONE_PARAM
-                            + " is required"));
-        }
         if (date == null) {
             addError(new RestError(RestError.MISSING_PARAM_ERROR_CODE,
                     RestError.MISSING_PARAM_ERROR_MESSAGE, DATE_PARAM
@@ -115,6 +121,7 @@ protected void populateFields(HttpServletRequest req) throws Exception {
         deviceIdent = req.getParameter(DEV_ID_PARAM);
         version = req.getParameter(VERSION_PARAM);
         stackTrace = req.getParameter(TRACE_PARAM);
+        androidId = req.getParameter(ANDROID_ID_PARAM);
         if (req.getParameter(DATE_PARAM) != null
                 && req.getParameter(DATE_PARAM).trim().length() > 0) {
             try {

GAE/src/com/gallatinsystems/diagnostics/domain/RemoteStacktrace.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2010-2012 Stichting Akvo (Akvo Foundation)
+ *  Copyright (C) 2010-2016 Stichting Akvo (Akvo Foundation)
  *
  *  This file is part of Akvo FLOW.
  *
@@ -38,6 +38,16 @@ public class RemoteStacktrace extends BaseDomain {
     private String softwareVersion;
     private Boolean acknowleged = new Boolean(false);
     private Date errorDate;
+    private String androidId;
+    private String ood;
+
+    public String getOod() {
+        return ood;
+    }
+
+    public void setOod(String ood) {
+        this.ood = ood;
+    }
 
     public Boolean getAcknowleged() {
         return acknowleged;
@@ -87,4 +97,12 @@ public void setErrorDate(Date errorDate) {
         this.errorDate = errorDate;
     }
 
+    public String getAndroidId() {
+        return androidId;
+    }
+
+    public void setAndroidId(String androidId) {
+        this.androidId = androidId;
+    }
+
 }

RELEASE_NOTES.md

@@ -5,6 +5,12 @@ Read more about the [Akvo Platform](http://www.akvo.org/blog/?p=4822).
 
 Akvo FLOW Dashboard release notes
 ----
+#1.9.11.1 Jubilant Jaguar Hotfix
+Date: 7 December 2016
+
+# Resolved issues
+* **RemoteException calls failing** [#1823] - The backend has been failing to process error messages from devices with more recent versions of Android because their `phoneNumber` attribute was missing.  The consequence is that devices have been constantly resubmitting these error messages, and using up unnecessary resources on the backend
+
 #1.9.11 Jubilant Jaguar
 Date: 7 November 2016