Merge branch 'develop'

akvo · Oct 20, 2014 · 475fbdf · 475fbdf
2 parents bfc2d58 + 028825e
commit 475fbdf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
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.0.4" >
+    android:versionName="2.0.4.1" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/app/src/main/java/org/akvo/flow/api/S3Api.java b/app/src/main/java/org/akvo/flow/api/S3Api.java
@@ -25,6 +25,7 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import javax.crypto.Mac;
@@ -140,7 +141,7 @@ public boolean put(String objectKey, File file, String type, boolean isPublic) t
     }
 
     private String getDate() {
-        final DateFormat df = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ");
+        final DateFormat df = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ", Locale.US);
         df.setTimeZone(TimeZone.getTimeZone("GMT"));
         return df.format(new Date()) + "GMT";
     }

diff --git a/app/src/main/java/org/akvo/flow/service/SurveyDownloadService.java b/app/src/main/java/org/akvo/flow/service/SurveyDownloadService.java
@@ -159,7 +159,7 @@ private void checkAndDownload(String surveyId) {
                             downloadHelp(survey);
                             updateCount++;
                         } catch (Exception e) {
-                            Log.e(TAG, "Error downloading survey: " + survey.getFileName(), e);
+                            Log.e(TAG, "Error downloading survey: " + survey.getId(), e);
                             fireNotification(getString(R.string.cannotupdate), FAIL_ID);
                             PersistentUncaughtExceptionHandler
                                     .recordException(new TransferException(survey.getId(), null, e));