Merge pull request #441 from intercom/conor/4.1.1

Release 4.1.1
intercom · Oct 25, 2017 · 7315225 · 7315225
2 parents 1ec7dd0 + 1a972ee
commit 7315225
Show file tree

Hide file tree

Showing 11 changed files with 364 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+# Version 4.1.1
+
+25-10-2017
+
+* Add `equals()`, `hashCode()` and `toString()` implementations to `UserAttributes`, `Company` and `Registration`
+* Minor fixes
+
 # Version 4.1.0
 
 10-10-2017

diff --git a/aar/intercom-sdk-base-4.1.0.aar → aar/intercom-sdk-base-4.1.1.aar b/aar/intercom-sdk-base-4.1.0.aar → aar/intercom-sdk-base-4.1.1.aar
diff --git a/aar/intercom-sdk-fcm-4.1.0.aar → aar/intercom-sdk-fcm-4.1.1.aar b/aar/intercom-sdk-fcm-4.1.0.aar → aar/intercom-sdk-fcm-4.1.1.aar
diff --git a/aar/intercom-sdk-gcm-4.1.0.aar → aar/intercom-sdk-gcm-4.1.1.aar b/aar/intercom-sdk-gcm-4.1.0.aar → aar/intercom-sdk-gcm-4.1.1.aar
diff --git a/docs/index-all.html b/docs/index-all.html
@@ -180,6 +180,16 @@ <h2 class="title">D</h2>
 </a>
 <h2 class="title">E</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Company.Builder.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Company.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/Company.html" title="class in io.intercom.android.sdk">Company</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/identity/Registration.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class io.intercom.android.sdk.identity.<a href="io/intercom/android/sdk/identity/Registration.html" title="class in io.intercom.android.sdk.identity">Registration</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.Builder.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.Builder.html" title="class in io.intercom.android.sdk">UserAttributes.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.html" title="class in io.intercom.android.sdk">UserAttributes</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Intercom.LogLevel.html#ERROR">ERROR</a></span> - Static variable in annotation type io.intercom.android.sdk.<a href="io/intercom/android/sdk/Intercom.LogLevel.html" title="annotation in io.intercom.android.sdk">Intercom.LogLevel</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -238,6 +248,16 @@ <h2 class="title">H</h2>
 <dd>
 <div class="block">Handles the opening of an Intercom push message.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Company.Builder.html#hashCode--">hashCode()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Company.html#hashCode--">hashCode()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/Company.html" title="class in io.intercom.android.sdk">Company</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/identity/Registration.html#hashCode--">hashCode()</a></span> - Method in class io.intercom.android.sdk.identity.<a href="io/intercom/android/sdk/identity/Registration.html" title="class in io.intercom.android.sdk.identity">Registration</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.Builder.html#hashCode--">hashCode()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.Builder.html" title="class in io.intercom.android.sdk">UserAttributes.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.html#hashCode--">hashCode()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.html" title="class in io.intercom.android.sdk">UserAttributes</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="io/intercom/android/sdk/experimental/Intercom.html#hideMessenger--">hideMessenger()</a></span> - Method in class io.intercom.android.sdk.experimental.<a href="io/intercom/android/sdk/experimental/Intercom.html" title="class in io.intercom.android.sdk.experimental">Intercom</a></dt>
 <dd>
 <div class="block">Dismisses the Intercom Messenger if it is on screen.</div>
@@ -446,6 +466,16 @@ <h2 class="title">T</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.html#toMap--">toMap()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.html" title="class in io.intercom.android.sdk">UserAttributes</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Company.Builder.html#toString--">toString()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/Company.html#toString--">toString()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/Company.html" title="class in io.intercom.android.sdk">Company</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/identity/Registration.html#toString--">toString()</a></span> - Method in class io.intercom.android.sdk.identity.<a href="io/intercom/android/sdk/identity/Registration.html" title="class in io.intercom.android.sdk.identity">Registration</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.Builder.html#toString--">toString()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.Builder.html" title="class in io.intercom.android.sdk">UserAttributes.Builder</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="io/intercom/android/sdk/UserAttributes.html#toString--">toString()</a></span> - Method in class io.intercom.android.sdk.<a href="io/intercom/android/sdk/UserAttributes.html" title="class in io.intercom.android.sdk">UserAttributes</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:U">
 <!--   -->

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

diff --git a/docs/io/intercom/android/sdk/Company.Builder.html b/docs/io/intercom/android/sdk/Company.Builder.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -155,43 +155,55 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withCompanyId-java.lang.String-">withCompanyId</a></span>(java.lang.String&nbsp;companyId)</code>
 <div class="block">Set the ID on the company.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withCreatedAt-java.lang.Long-">withCreatedAt</a></span>(java.lang.Long&nbsp;createdAt)</code>
 <div class="block">Set the date the company was created at.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withCustomAttribute-java.lang.String-java.lang.Object-">withCustomAttribute</a></span>(java.lang.String&nbsp;key,
                    java.lang.Object&nbsp;attribute)</code>
 <div class="block">Set a custom attribute to the company.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withCustomAttributes-java.util.Map-">withCustomAttributes</a></span>(java.util.Map&lt;java.lang.String,?&gt;&nbsp;attributes)</code>
 <div class="block">Set several custom attributes on the company at once.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withMonthlySpend-java.lang.Integer-">withMonthlySpend</a></span>(java.lang.Integer&nbsp;monthlySpend)</code>
 <div class="block">Set the monthly spend of this company.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withName-java.lang.String-">withName</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Set the name of the company.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.Builder.html#withPlan-java.lang.String-">withPlan</a></span>(java.lang.String&nbsp;plan)</code>
 <div class="block">Set the companies plan.</div>
@@ -203,7 +215,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, finalize, getClass, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -362,7 +374,7 @@ <h4>withCustomAttribute</h4>
 <a name="withCustomAttributes-java.util.Map-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>withCustomAttributes</h4>
 <pre>public&nbsp;<a href="../../../../io/intercom/android/sdk/Company.Builder.html" title="class in io.intercom.android.sdk">Company.Builder</a>&nbsp;withCustomAttributes(@NonNull
@@ -380,6 +392,45 @@ <h4>withCustomAttributes</h4>
 </dl>
 </li>
 </ul>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="hashCode--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hashCode</h4>
+<pre>public&nbsp;int&nbsp;hashCode()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>hashCode</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>

diff --git a/docs/io/intercom/android/sdk/Company.html b/docs/io/intercom/android/sdk/Company.html
@@ -17,6 +17,12 @@
     catch(err) {
     }
 //-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -69,13 +75,13 @@
 <li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -157,12 +163,84 @@ <h3>Nested Class Summary</h3>
 <!--   -->
 </a>
 <h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.html#equals-java.lang.Object-">equals</a></span>(java.lang.Object&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../io/intercom/android/sdk/Company.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, finalize, getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;equals(java.lang.Object&nbsp;o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="hashCode--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hashCode</h4>
+<pre>public&nbsp;int&nbsp;hashCode()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>hashCode</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
 </ul>
 </li>
 </ul>
@@ -219,13 +297,13 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
 <li>Constr&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">