diff --git a/.travis.yml b/.travis.yml
index 4f866d279..8073ade28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: required
language: android
jdk: oraclejdk8
diff --git a/CHANGELOG b/CHANGELOG
index 6a41f827d..e4eee59a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 0.6.1 (2016-10-03)
+--------------------------
+Ensure mobile_context only contains accepted enum values (#232)
+Do not include geolocation permissions in tracker manifest (#229)
+Bump Gradle Version to 2.2.0 (#230)
+
Version 0.6.0 (2016-08-29)
--------------------------
Added network type and technology to mobile context (#180)
diff --git a/README.md b/README.md
index 1ce581fc1..eb1071022 100644
--- a/README.md
+++ b/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.6.0-blue.svg?style=flat
+[release-image]: http://img.shields.io/badge/release-0.6.1-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
diff --git a/VERSION b/VERSION
index 09a3acfa1..7ceb04048 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.0
\ No newline at end of file
+0.6.1
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b3ea08c1c..d86897057 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,16 +6,16 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.2'
+ classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
}
subprojects {
group = 'com.snowplowanalytics'
- version = '0.6.0'
+ version = '0.6.1'
repositories {
maven {
url "http://maven.snplow.com/releases"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c19ebe775..a956b57f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 17 17:06:26 CEST 2016
+#Tue Sep 27 12:45:32 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/snowplow-demo-app/src/main/AndroidManifest.xml b/snowplow-demo-app/src/main/AndroidManifest.xml
index 56dea5353..564a75e80 100644
--- a/snowplow-demo-app/src/main/AndroidManifest.xml
+++ b/snowplow-demo-app/src/main/AndroidManifest.xml
@@ -3,6 +3,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.snowplowanalytics.snowplowtrackerdemo" >
+
+
+
+
+
+
+
requests) throws Excepti
assertEquals("mob", query.get("p"));
assertEquals("myAppId", query.get("aid"));
assertEquals("myNamespace", query.get("tna"));
- assertEquals("andr-0.6.0", query.get("tv"));
+ assertEquals("andr-0.6.1", query.get("tv"));
assertEquals("English", query.get("lang"));
assertTrue(query.has("dtm"));
assertTrue(query.has("stm"));
@@ -241,7 +241,7 @@ public void checkPostRequest(LinkedList requests) throws Except
assertEquals("mob", json.getString("p"));
assertEquals("myAppId", json.getString("aid"));
assertEquals("myNamespace", json.getString("tna"));
- assertEquals("andr-0.6.0", json.getString("tv"));
+ assertEquals("andr-0.6.1", json.getString("tv"));
assertEquals("English", json.getString("lang"));
assertTrue(json.has("dtm"));
assertTrue(json.has("stm"));
diff --git a/snowplow-tracker/src/main/AndroidManifest.xml b/snowplow-tracker/src/main/AndroidManifest.xml
index 2854f6c1a..f25ae6865 100755
--- a/snowplow-tracker/src/main/AndroidManifest.xml
+++ b/snowplow-tracker/src/main/AndroidManifest.xml
@@ -1,10 +1 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/tracker/utils/Util.java b/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/tracker/utils/Util.java
index b21a4d00c..b57072592 100755
--- a/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/tracker/utils/Util.java
+++ b/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/tracker/utils/Util.java
@@ -432,7 +432,15 @@ public static String getAndroidIdfa(Context context) {
public static String getNetworkType(NetworkInfo networkInfo) {
String networkType = null;
if (networkInfo != null) {
- networkType = networkInfo.getTypeName().toLowerCase();
+ String maybeNetworkType = networkInfo.getTypeName().toLowerCase();
+ switch (maybeNetworkType) {
+ case "mobile":
+ case "wifi":
+ case "offline":
+ networkType = maybeNetworkType;
+ break;
+ default: break;
+ }
}
return networkType;
}