Merge pull request #604 from BranchMetrics/Staging

Aaron Lopez · web-flow · commit dbb8d8efa7a7 · 2018-08-27T09:37:41.000-07:00
RC 2.19.3
diff --git a/Branch-2.19.3.jar b/Branch-2.19.3.jar
diff --git a/Branch-2.19.3_core.jar b/Branch-2.19.3_core.jar
diff --git a/Branch-SDK/resources/fabric/io.branch.sdk.android.library.properties b/Branch-SDK/resources/fabric/io.branch.sdk.android.library.properties
@@ -1,3 +1,3 @@
 fabric-identifier=io.branch.sdk.android.library
-fabric-version=2.19.2
+fabric-version=2.19.3
 fabric-build-type=source
diff --git a/Branch-SDK/src/io/branch/referral/network/BranchRemoteInterfaceUrlConnection.java b/Branch-SDK/src/io/branch/referral/network/BranchRemoteInterfaceUrlConnection.java
@@ -137,6 +137,7 @@ private BranchResponse doRestfulPost(String url, JSONObject payload, int retryNu
 
             outputStreamWriter.write(payload.toString());
             outputStreamWriter.flush();
+            outputStreamWriter.close();
 
             int responseCode = connection.getResponseCode();
             if (responseCode >= HttpsURLConnection.HTTP_INTERNAL_ERROR
@@ -149,16 +150,26 @@ private BranchResponse doRestfulPost(String url, JSONObject payload, int retryNu
                 retryNumber++;
                 return doRestfulPost(url, payload, retryNumber);
             } else {
+                InputStream inputStream = null;
                 try {
                     if (responseCode != HttpsURLConnection.HTTP_OK && connection.getErrorStream() != null) {
-                        return new BranchResponse(getResponseString(connection.getErrorStream()), responseCode);
+                        inputStream = connection.getErrorStream();
                     } else {
-                        return new BranchResponse(getResponseString(connection.getInputStream()), responseCode);
+                        inputStream = connection.getInputStream();
                     }
+                    return new BranchResponse(getResponseString(inputStream), responseCode);
                 } catch (FileNotFoundException ex) {
                     // In case of Resource conflict getInputStream will throw FileNotFoundException. Handle it here in order to send the right status code
                     PrefHelper.Debug("BranchSDK", "A resource conflict occurred with this request " + url);
                     return new BranchResponse(null, responseCode);
+                } finally {
+                    try {
+                        if (inputStream != null) {
+                            inputStream.close();
+                        }
+                    } catch(IOException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
 
diff --git a/Branch-SDK/src/io/branch/referral/util/BranchEvent.java b/Branch-SDK/src/io/branch/referral/util/BranchEvent.java
@@ -45,8 +45,9 @@ private BranchEvent(String eventName, boolean isStandardEvent) {
         this.eventName = eventName;
 
         for (BRANCH_STANDARD_EVENT event : BRANCH_STANDARD_EVENT.values()) {
-            if (eventName == event.getName()) {
+            if (eventName.equals(event.getName())) {
                 isStandardEvent = true;
+                break;
             }
         }
 
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,10 @@
 Branch Android SDK change log
 
+- v2.19.3
+  * _*Master Release*_ - August 22, 2018
+  * Changed post request logic to close streams. [#600](https://github.com/BranchMetrics/android-branch-deep-linking/issues/600)
+  * Added check for if `BranchEvent` is same name as `BRANCH_STANDARD_EVENT` name, send with `v2/event/standard` request. DEVEX-751
+
 - v2.19.2
   * _*Master Release*_ - August 10, 2018
   * Added notify network API to process requests when network is available. DEVEX-711
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.19.2
+VERSION_NAME=2.19.3
 VERSION_CODE=1
 GROUP=io.branch.sdk.android
 

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,9 @@ private BranchEvent(String eventName, boolean isStandardEvent) {`
`45`	`45`	`this.eventName = eventName;`
`46`	`46`
`47`	`47`	`for (BRANCH_STANDARD_EVENT event : BRANCH_STANDARD_EVENT.values()) {`
`48`		`- if (eventName == event.getName()) {`
	`48`	`+ if (eventName.equals(event.getName())) {`
`49`	`49`	`isStandardEvent = true;`
	`50`	`+ break;`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION_NAME=2.19.2`
	`1`	`+VERSION_NAME=2.19.3`
`2`	`2`	`VERSION_CODE=1`
`3`	`3`	`GROUP=io.branch.sdk.android`
`4`	`4`