Merge pull request #233 from snowplow/hotfix/0.6.1

Hotfix/0.6.1

.travis.yml

@@ -1,3 +1,4 @@
+sudo: required
 language: android
 jdk: oraclejdk8
 

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)

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

VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

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"

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

snowplow-demo-app/src/main/AndroidManifest.xml

@@ -3,6 +3,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.snowplowanalytics.snowplowtrackerdemo" >
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+    <!--Enable the permissions below for getting users geographical location.-->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher_snowplow"

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());

snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/integration/EventSendingTest.java

@@ -132,7 +132,7 @@ public Tracker getTracker(String uri, HttpMethod method) {
                     .level(LogLevel.DEBUG)
                     .sessionContext(true)
                     .mobileContext(true)
-                    .geoLocationContext(true)
+                    .geoLocationContext(false)
                     .build()
         );
         return Tracker.instance();
@@ -200,7 +200,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.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<RecordedRequest> 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"));

snowplow-tracker/src/main/AndroidManifest.xml

@@ -1,10 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.snowplowanalytics.snowplow.tracker">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
-    <!--Enable the permissions below for getting users geographical location.-->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-</manifest>
+<manifest package="com.snowplowanalytics.snowplow.tracker"/>

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;
     }