Merge pull request #60 from jogrimst/master

#58 NullPointerException when not device folder
elimu-ai · Jun 17, 2017 · 37ea90c · 37ea90c
2 parents e185626 + c7b59fd
commit 37ea90c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "org.literacyapp.analytics"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1002001
-        versionName "1.2.1"
+        versionCode 1002002
+        versionName "1.2.2"
     }
 
     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
@@ -14,10 +14,10 @@
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 1002001): knows all DAOs.
+ * Master of DAO (schema version 1002002): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 1002001;
+    public static final int SCHEMA_VERSION = 1002002;
 
     /** 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/ServerSynchronizationJobService.java b/app/src/main/java/org/literacyapp/analytics/service/ServerSynchronizationJobService.java
@@ -41,6 +41,10 @@ public boolean onStartJob(JobParameters jobParameters) {
                 File deviceDir = deviceDirs[i];
                 Log.i(getClass().getName(), "deviceDir: " + deviceDir);
 
+                if (!deviceDir.getName().startsWith("device_")) {
+                    continue;
+                }
+
                 File[] eventFiles = deviceDir.listFiles();
                 for (File eventFile : eventFiles) {
                     Log.i(getClass().getName(), "eventFile: " + eventFile);