From efa0efccf792bf3d0cd1b2a085934079ef4a24ef Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 27 Sep 2016 09:49:32 +0200 Subject: [PATCH 1/5] Do not include geolocation permissions in tracker manifest (fixes #229) --- .travis.yml | 1 + snowplow-demo-app/src/main/AndroidManifest.xml | 7 +++++++ .../tracker/integration/EventSendingTest.java | 2 +- snowplow-tracker/src/main/AndroidManifest.xml | 11 +---------- 4 files changed, 10 insertions(+), 11 deletions(-) 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/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" > + + + + + + + - - - - - - - - + From 8cbde4aca75bfc0f4f521f5cd40a56d98079a81b Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 27 Sep 2016 13:37:08 +0200 Subject: [PATCH 2/5] Bump Gradle Version to 2.2.0 (closes #230) --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b3ea08c1c..b748ac5fe 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,10 @@ 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' } } 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 From 419ae6df98f9ca2081becd5945b090f5a19cffb7 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 27 Sep 2016 09:58:17 +0200 Subject: [PATCH 3/5] Bumped VERSION --- README.md | 2 +- VERSION | 2 +- build.gradle | 2 +- .../com/snowplowanalytics/snowplow/tracker/TrackerTest.java | 2 +- .../snowplow/tracker/integration/EventSendingTest.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) 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 b748ac5fe..d86897057 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { subprojects { group = 'com.snowplowanalytics' - version = '0.6.0' + version = '0.6.1' repositories { maven { url "http://maven.snplow.com/releases" diff --git a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java index 54b52bfee..4f27377c1 100755 --- a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java +++ b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java @@ -92,7 +92,7 @@ public void testSetValues() { assertEquals(false, tracker.getBase64Encoded()); assertNotNull(tracker.getEmitter()); assertNotNull(tracker.getSubject()); - assertEquals("andr-0.6.0", tracker.getTrackerVersion()); + assertEquals("andr-0.6.1", tracker.getTrackerVersion()); assertEquals(LogLevel.VERBOSE, tracker.getLogLevel()); assertEquals(2, tracker.getThreadCount()); assertEquals(false, tracker.getApplicationCrash()); diff --git a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java index 8a35ed7e6..1769c8747 100644 --- a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java +++ b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java @@ -200,7 +200,7 @@ public void checkGetRequest(LinkedList 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")); From d24eb736f8cdb1b82a693baeb9ec0a9881023c26 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 3 Oct 2016 16:39:46 +0200 Subject: [PATCH 4/5] Ensure mobile_context only contains accepted enum values (fixes #232) --- .../snowplowanalytics/snowplow/tracker/utils/Util.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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; } From f56c6ec397756be4dac0668e3cf29cda6fd59db3 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 27 Sep 2016 10:01:11 +0200 Subject: [PATCH 5/5] Updated CHANGELOG --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) 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)