Merge branch 'hotfix/0.5.4'

CHANGELOG

@@ -1,3 +1,8 @@
+Version 0.5.4 (2016-03-02)
+--------------------------
+Core: fixed input string \"null\" is not a valid UUID with previousSessionId on Android Versions lower than KitKat (#185)
+Add speed optimisations to Vagrantfile (#188)
+
 Version 0.5.3 (2015-11-22)
 --------------------------
 Core: fixed session context fails on first session (#176)

README.md

@@ -91,7 +91,7 @@ limitations under the License.
 [travis]: https://travis-ci.org/snowplow/snowplow-android-tracker
 [travis-image]: https://travis-ci.org/snowplow/snowplow-android-tracker.svg?branch=master
 
-[release-image]: http://img.shields.io/badge/release-0.5.3-blue.svg?style=flat
+[release-image]: http://img.shields.io/badge/release-0.5.4-blue.svg?style=flat
 [releases]: https://github.com/snowplow/snowplow-android-tracker/releases
 
 [license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat

Vagrantfile

@@ -2,6 +2,12 @@ Vagrant.configure("2") do |config|
 
   config.vm.box = "ubuntu/trusty64"
   config.vm.hostname = "snowplow-android-tracker"
+
+  # Required for NFS to work, pick any local IP
+  # Use NFS for shared folders for better performance
+  # config.vm.network :private_network, ip: '192.168.50.50' # Uncomment to use NFS
+  # config.vm.synced_folder '.', '/vagrant', nfs: true # Uncomment to use NFS
+
   config.vm.network "forwarded_port", guest: 4040, host: 4040
   config.vm.network "forwarded_port", guest: 2525, host: 2525
   config.ssh.forward_agent = true
@@ -11,7 +17,8 @@ Vagrant.configure("2") do |config|
     vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
     vb.customize [ "guestproperty", "set", :id, "--timesync-threshold", 10000 ]
     # Need a bit of memory for Android
-    vb.memory = 3072
+    vb.memory = 5120
+    vb.cpus = 4
   end
 
   config.vm.provision :shell do |sh|

build.gradle

@@ -13,7 +13,7 @@ buildscript {
 
 subprojects {
     group = 'com.snowplowanalytics'
-    version = '0.5.3'
+    version = '0.5.4'
     repositories {
         maven {
             url "http://maven.snplow.com/releases"

snowplow-android-core/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java

@@ -90,7 +90,7 @@ public void testSubjectSet() {
 
     public void testVersionSet() {
         Tracker tracker = getTracker();
-        assertEquals("andr-0.5.3", tracker.getTrackerVersion());
+        assertEquals("andr-0.5.4", tracker.getTrackerVersion());
     }
 
     public void testLogLevelSet() {

snowplow-android-core/src/main/java/com/snowplowanalytics/snowplow/tracker/utils/Util.java

@@ -114,14 +114,7 @@ private static Object getJsonSafeObject(Object o) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             return o;
         } else if (o == null) {
-            return new Object() {
-                @Override
-                public boolean equals(Object o) { return o == this || o == null;  }
-                @Override
-                public String toString() {
-                    return "null";
-                }
-            };
+            return JSONObject.NULL;
         } else if (o instanceof JSONObject || o instanceof JSONArray) {
             return o;
         } else if (o instanceof Collection) {

snowplow-android-tracker-classic/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/classic/SnowplowClassicTestCase.java

@@ -180,7 +180,7 @@ public void checkGetRequest(LinkedList<RecordedRequest> requests) throws Excepti
             assertEquals("mob", query.get("p"));
             assertEquals("myAppId", query.get("aid"));
             assertEquals("myNamespace", query.get("tna"));
-            assertEquals("andr-0.5.3", query.get("tv"));
+            assertEquals("andr-0.5.4", query.get("tv"));
             assertEquals("English", query.get("lang"));
             assertTrue(query.has("dtm"));
             assertTrue(query.has("stm"));
@@ -221,7 +221,7 @@ public void checkPostRequest(LinkedList<RecordedRequest> requests) throws Except
                 assertEquals("mob", json.getString("p"));
                 assertEquals("myAppId", json.getString("aid"));
                 assertEquals("myNamespace", json.getString("tna"));
-                assertEquals("andr-0.5.3", json.getString("tv"));
+                assertEquals("andr-0.5.4", json.getString("tv"));
                 assertEquals("English", json.getString("lang"));
                 assertTrue(json.has("dtm"));
                 assertTrue(json.has("stm"));

snowplow-android-tracker-rx/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/rx/SnowplowRxTestCase.java

@@ -177,7 +177,7 @@ public void checkGetRequest(LinkedList<RecordedRequest> requests) throws Excepti
             assertEquals("mob", query.get("p"));
             assertEquals("myAppId", query.get("aid"));
             assertEquals("myNamespace", query.get("tna"));
-            assertEquals("andr-0.5.3", query.get("tv"));
+            assertEquals("andr-0.5.4", query.get("tv"));
             assertEquals("English", query.get("lang"));
             assertTrue(query.has("dtm"));
             assertTrue(query.has("stm"));
@@ -218,7 +218,7 @@ public void checkPostRequest(LinkedList<RecordedRequest> requests) throws Except
                 assertEquals("mob", json.getString("p"));
                 assertEquals("myAppId", json.getString("aid"));
                 assertEquals("myNamespace", json.getString("tna"));
-                assertEquals("andr-0.5.3", json.getString("tv"));
+                assertEquals("andr-0.5.4", json.getString("tv"));
                 assertEquals("English", json.getString("lang"));
                 assertTrue(json.has("dtm"));
                 assertTrue(json.has("stm"));