Merge branch 'release/2.1.2.1'

akvo · Feb 24, 2015 · 943a982 · 943a982
2 parents ba86892 + 3bbb9d5
commit 943a982
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,13 @@
 Akvo FLOW app release notes
 ===========================
 
+#ver 2.1.2.1
+Date: 24 February 2015
+
+New and noteworthy
+------------------
+* This hotfix release fixes a monitoring survey sync issue that arises when no SIM card is present [#270]
+
 #ver 2.1.2
 Date: 20 February 2015
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.akvo.flow"
     android:versionCode="1"
-    android:versionName="2.1.2" >
+    android:versionName="2.1.2.1" >
 
     <uses-sdk
         android:minSdkVersion="10"

diff --git a/app/src/main/java/org/akvo/flow/api/FlowApi.java b/app/src/main/java/org/akvo/flow/api/FlowApi.java
@@ -65,9 +65,9 @@ public class FlowApi {
 
     public List<SurveyedLocale> getSurveyedLocales(long surveyGroup, String timestamp)
             throws IOException, HttpException {
-        final String query = Param.IMEI + IMEI
+        final String query = Param.IMEI + URLEncode(IMEI)
                 + "&" + Param.LAST_UPDATED + (!TextUtils.isEmpty(timestamp)? timestamp : "0")
-                + "&" + Param.PHONE_NUMBER + PHONE_NUMBER
+                + "&" + Param.PHONE_NUMBER + URLEncode(PHONE_NUMBER)
                 + "&" + Param.SURVEY_GROUP + surveyGroup
                 + "&" + Param.TIMESTAMP + getTimestamp();
 
@@ -137,9 +137,9 @@ private String getTimestamp() {
 
     public static String getDeviceParams() {
         Context context = FlowApp.getApp();
-        return Param.PHONE_NUMBER + URLEncode(StatusUtil.getPhoneNumber(context))
+        return Param.PHONE_NUMBER + URLEncode(PHONE_NUMBER)
                 + "&" + Param.ANDROID_ID + URLEncode(PlatformUtil.getAndroidID(context))
-                + "&" + Param.IMEI + URLEncode(StatusUtil.getImei(context))
+                + "&" + Param.IMEI + URLEncode(IMEI)
                 + "&" + Param.VERSION + URLEncode(PlatformUtil.getVersionName(context))
                 + "&" + Param.DEVICE_ID + URLEncode(StatusUtil.getDeviceId(context));
     }