From 68ab6ab1583f9894ed8c83439661189c00a9e7b4 Mon Sep 17 00:00:00 2001
From: Jo Grimstad <jo@literacyapp.org>
Date: Wed, 7 Jun 2017 22:24:18 +0200
Subject: [PATCH] #55 Release 1.2.0

---
 app/build.gradle                                              | 4 ++--
 .../main/java/org/literacyapp/analytics/dao/DaoMaster.java    | 4 ++--
 .../service/UploadApplicationOpenedEventsAsyncTask.java       | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2ca25ae..9ba414e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "org.literacyapp.analytics"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1001000
-        versionName "1.1.0"
+        versionCode 1002000
+        versionName "1.2.0"
     }
 
     buildTypes {
diff --git a/app/src/main/java/org/literacyapp/analytics/dao/DaoMaster.java b/app/src/main/java/org/literacyapp/analytics/dao/DaoMaster.java
index cb4902d..8af0244 100644
--- a/app/src/main/java/org/literacyapp/analytics/dao/DaoMaster.java
+++ b/app/src/main/java/org/literacyapp/analytics/dao/DaoMaster.java
@@ -14,10 +14,10 @@
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 1001000): knows all DAOs.
+ * Master of DAO (schema version 1002000): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 1001000;
+    public static final int SCHEMA_VERSION = 1002000;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
diff --git a/app/src/main/java/org/literacyapp/analytics/service/UploadApplicationOpenedEventsAsyncTask.java b/app/src/main/java/org/literacyapp/analytics/service/UploadApplicationOpenedEventsAsyncTask.java
index d9f8a27..1c57b66 100644
--- a/app/src/main/java/org/literacyapp/analytics/service/UploadApplicationOpenedEventsAsyncTask.java
+++ b/app/src/main/java/org/literacyapp/analytics/service/UploadApplicationOpenedEventsAsyncTask.java
@@ -25,6 +25,7 @@ protected Void doInBackground(File... files) {
 
         File file = files[0];
         Log.i(getClass().getName(), "file: " + file);
+        Log.i(getClass().getName(), "file.getName(): " + file.getName());
 
         try {
             // See https://stackoverflow.com/a/11826317
@@ -44,7 +45,7 @@ protected Void doInBackground(File... files) {
             DataOutputStream request = new DataOutputStream(connection.getOutputStream());
 
             request.writeBytes("--*****\r\n");
-            request.writeBytes("Content-Disposition: form-data; name=\"multipartFile\";filename=\"application_opened_events_2017-06-07.log\"\r\n");
+            request.writeBytes("Content-Disposition: form-data; name=\"multipartFile\";filename=\"" + file.getName() + "\"\r\n");
             request.writeBytes("\r\n");
 
             byte[] fileBytes = FileUtils.readFileToByteArray(file);