Merge pull request #227 from matomo-org/pr-fix226

#226
matomo-org · Nov 12, 2018 · dca3369 · dca3369
2 parents 2638439 + 95bd2de
commit dca3369
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ jdk: oraclejdk8
 android:
   components:
     - tools
-    - build-tools-27.0.3
+    - build-tools-28.0.3
     - android-27
     - extra-android-support
     - extra-android-m2repository

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
     repositories {
-        jcenter()
+        google()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
-        google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0x'
@@ -16,17 +16,17 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
         maven {
-            url 'https://maven.google.com/'
-            name 'Google'
+            url "https://plugins.gradle.org/m2/"
         }
+        jcenter()
     }
     ext {
         globalMinSdkVersion = 14
         globalTargetSdkVersion = 27
         globalCompileSdkVersion = 27
-        globalBuildToolsVersion = '27.0.3'
+        globalBuildToolsVersion = '28.0.3'
         supportLibVersion = '27.1.1'
         timberVersion = '4.6.1'
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 26 18:53:24 CEST 2018
+#Mon Nov 12 14:05:39 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/piwik-sdk/build.gradle b/piwik-sdk/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 def versionMajor = 3
 def versionMinor = 0
-def versionPatch = 3
+def versionPatch = 4
 def myVersionCode = versionMajor * 10000 + versionMinor * 100 + versionPatch
 def myVersionName = "${versionMajor}.${versionMinor}.${versionPatch}"
 

diff --git a/piwik-sdk/src/main/java/org/piwik/sdk/dispatcher/DefaultPacketSender.java b/piwik-sdk/src/main/java/org/piwik/sdk/dispatcher/DefaultPacketSender.java
@@ -6,6 +6,7 @@
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -93,7 +94,18 @@ public boolean send(Packet packet) {
             final boolean successful = checkResponseCode(statusCode);
 
             if (successful) {
-                Timber.tag(LOGGER_TAG).v("Transmission succesful (code=%d).", statusCode);
+                Timber.tag(LOGGER_TAG).v("Transmission successful (code=%d).", statusCode);
+
+                // https://github.com/matomo-org/piwik-sdk-android/issues/226
+                InputStream is = urlConnection.getInputStream();
+                if (is != null) {
+                    try {
+                        is.close();
+                    } catch (IOException e) {
+                        Timber.tag(LOGGER_TAG).d(e, "Failed to close the error stream.");
+                    }
+                }
+
             } else {
                 // Consume the error stream (or at least close it) if the statuscode was non-OK (not 2XX)
                 final StringBuilder errorReason = new StringBuilder();