Merge pull request #446 from intercom/conor/bump

Release 4.1.4
intercom · Nov 15, 2017 · eccab63 · eccab63
2 parents c2d0322 + 6b64d29
commit eccab63
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+# Version 4.1.4
+
+15-11-2017
+
+* Fix OOM error https://github.com/intercom/intercom-android/issues/422
+* Updated Gson to 2.8.2
+
 # Version 4.1.3
 
 08-11-2017

diff --git a/aar/intercom-sdk-base-4.1.3.aar b/aar/intercom-sdk-base-4.1.3.aar
diff --git a/aar/intercom-sdk-base-4.1.4.aar b/aar/intercom-sdk-base-4.1.4.aar
diff --git a/aar/intercom-sdk-fcm-4.1.3.aar → aar/intercom-sdk-fcm-4.1.4.aar b/aar/intercom-sdk-fcm-4.1.3.aar → aar/intercom-sdk-fcm-4.1.4.aar
diff --git a/aar/intercom-sdk-gcm-4.1.3.aar → aar/intercom-sdk-gcm-4.1.4.aar b/aar/intercom-sdk-gcm-4.1.3.aar → aar/intercom-sdk-gcm-4.1.4.aar
diff --git a/docs/index.html b/docs/index.html
@@ -5,11 +5,12 @@
 <!-- Generated by javadoc -->
 <title>intercom-sdk-base API</title>
 <script type="text/javascript">
-    targetPage = "" + window.location.search;
-    if (targetPage != "" && targetPage != "undefined")
-        targetPage = targetPage.substring(1);
-    if (targetPage.indexOf(":") != -1 || (targetPage != "" && !validURL(targetPage)))
-        targetPage = "undefined";
+    tmpTargetPage = "" + window.location.search;
+    if (tmpTargetPage != "" && tmpTargetPage != "undefined")
+        tmpTargetPage = tmpTargetPage.substring(1);
+    if (tmpTargetPage.indexOf(":") != -1 || (tmpTargetPage != "" && !validURL(tmpTargetPage)))
+        tmpTargetPage = "undefined";
+    targetPage = tmpTargetPage;
     function validURL(url) {
         try {
             url = decodeURIComponent(url);