apiKey - The Android-SDK API key found on the Intercom API Key settings page.
-
appId - The App ID of your Intercom app.
+
apiKey - The Android SDK API key found on the Intercom for Android settings page.
+
appId - The app ID of your Intercom app.
Since:
1.0.0
@@ -470,12 +486,7 @@
registerIdentifiedUser
In order to keep track of a specific user, you must identify it with a unique user identifier, an email
address, or both. By supplying information like this Intercom provides richer user profiles for your users.
This is a userId, supplied by you (e.g. from an existing web service for your product) to represent your
- user in Intercom, once set it cannot be changed.
-
-
If you are putting the Intercom SDK into an app that has persisted an authentication token or equivalent
- so your users don't have to log in repeatedly (like most apps) then we advise putting the user registration
- call in the `didBecomeActive:` method in your application delegate. This won't have any negative impact if
- you also add it to your authentication success method elsewhere in your app.
+ user in Intercom, once set it cannot be changed.
Secure Mode helps to make sure that conversations between you and your users are kept private and that one
user can't impersonate another.
- In Secure Mode the Android SDK will sign all requests going to the Intercom servers with tokens.
+ In Secure Mode the SDK will sign all requests going to the Intercom servers with tokens.
It requires your mobile application to have its own server which authenticates the app's users
and which can store a secret. More information on secure mode can be found here.
diff --git a/docs/io/intercom/android/sdk/identity/Registration.html b/docs/io/intercom/android/sdk/identity/Registration.html
index c1782ede..d6ab6c32 100644
--- a/docs/io/intercom/android/sdk/identity/Registration.html
+++ b/docs/io/intercom/android/sdk/identity/Registration.html
@@ -2,9 +2,9 @@
-
+
Registration (intercom-sdk-base API)
-
+
diff --git a/docs/io/intercom/android/sdk/identity/package-frame.html b/docs/io/intercom/android/sdk/identity/package-frame.html
index 0526c599..17fcd2fb 100644
--- a/docs/io/intercom/android/sdk/identity/package-frame.html
+++ b/docs/io/intercom/android/sdk/identity/package-frame.html
@@ -2,9 +2,9 @@
-
+
io.intercom.android.sdk.identity (intercom-sdk-base API)
-
+
diff --git a/docs/io/intercom/android/sdk/identity/package-summary.html b/docs/io/intercom/android/sdk/identity/package-summary.html
index f94a1dbe..3e956f78 100644
--- a/docs/io/intercom/android/sdk/identity/package-summary.html
+++ b/docs/io/intercom/android/sdk/identity/package-summary.html
@@ -2,9 +2,9 @@
-
+
io.intercom.android.sdk.identity (intercom-sdk-base API)
-
+
diff --git a/docs/io/intercom/android/sdk/identity/package-tree.html b/docs/io/intercom/android/sdk/identity/package-tree.html
index d7fc9cdd..828345bb 100644
--- a/docs/io/intercom/android/sdk/identity/package-tree.html
+++ b/docs/io/intercom/android/sdk/identity/package-tree.html
@@ -2,9 +2,9 @@
-
+
io.intercom.android.sdk.identity Class Hierarchy (intercom-sdk-base API)
-
+
diff --git a/docs/io/intercom/android/sdk/package-frame.html b/docs/io/intercom/android/sdk/package-frame.html
index 4e6a2ee6..bade4864 100644
--- a/docs/io/intercom/android/sdk/package-frame.html
+++ b/docs/io/intercom/android/sdk/package-frame.html
@@ -2,9 +2,9 @@
-
+
io.intercom.android.sdk (intercom-sdk-base API)
-
+
diff --git a/docs/io/intercom/android/sdk/package-summary.html b/docs/io/intercom/android/sdk/package-summary.html
index cba53740..0f9513ed 100644
--- a/docs/io/intercom/android/sdk/package-summary.html
+++ b/docs/io/intercom/android/sdk/package-summary.html
@@ -2,9 +2,9 @@
-
+
io.intercom.android.sdk (intercom-sdk-base API)
-
+
diff --git a/docs/io/intercom/android/sdk/package-tree.html b/docs/io/intercom/android/sdk/package-tree.html
index fcefc39e..4cf525b1 100644
--- a/docs/io/intercom/android/sdk/package-tree.html
+++ b/docs/io/intercom/android/sdk/package-tree.html
@@ -2,9 +2,9 @@
-
+
io.intercom.android.sdk Class Hierarchy (intercom-sdk-base API)
-
+
diff --git a/docs/overview-frame.html b/docs/overview-frame.html
index fd3a72f6..81e1243a 100644
--- a/docs/overview-frame.html
+++ b/docs/overview-frame.html
@@ -2,9 +2,9 @@
-
+
Overview List (intercom-sdk-base API)
-
+
diff --git a/docs/overview-summary.html b/docs/overview-summary.html
index 806a8f24..27fd2aa0 100644
--- a/docs/overview-summary.html
+++ b/docs/overview-summary.html
@@ -2,9 +2,9 @@
-
+
Overview (intercom-sdk-base API)
-
+
diff --git a/docs/overview-tree.html b/docs/overview-tree.html
index 8c9d91cd..ad8b7b68 100644
--- a/docs/overview-tree.html
+++ b/docs/overview-tree.html
@@ -2,9 +2,9 @@
-
+
Class Hierarchy (intercom-sdk-base API)
-
+
diff --git a/samples/README.md b/samples/README.md
index 7911fccc..0c297d03 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -4,19 +4,48 @@
### Setting Up
This is a sample application to demonstrate how to integrate Intercom in a simple app.
-You will need to add your Api Key and App Id to the SampleApplication
-You will also need to add either an email or user id (THIS USER WILL BE REGISTERED IN YOUR APP)
-If you have enabled secure mode you will need to provide hmac and data
+You will need to add your API key and app ID to the SampleApplication
+If you have enabled secure mode you will need to provide HMAC and data
+
If you want to enable GCM in the test app simply provide your sender_id (project number in google-services.json)
in the strings.xml file inside the tag intercom_gcm_sender_id
### Usage
1. Open the app
-2. Tap the register button
-3. Tap the chat with us button to open the messenger
-4. Send a new message to that user to see the unread badge update on the custom launcher and the in app arrive
+2. Go to your https://app.intercom.io/a/apps/[YOUR_INTERCOM_APP_ID]/users/segments/active
+3. Find user 123456 and send them a message.
+4. You will see the unread badge update on the custom launcher and the in app arrive
+5. Tap the chat with us button to open the messenger
+
+### Error checking
+- Check logcat for any errors, make sure you have no filters turned on. It can help to switch
+ logcat to Verbose.
+- Report any issue on Intercom or on our Github repo
+
+## Intercom FCM Sample
+
+### Setting Up
+This is a sample application to demonstrate how to integrate Intercom in a simple app.
+You will need to add your API key and app ID to the SampleApplication
+If you have enabled secure mode you will need to provide HMAC and data
+
+This sample is indented to be used to test FCM integrations. To set up FCM in Intercom you need to:
+1. Go to https://firebase.google.com/docs/android/setup#add_firebase_to_your_app follow the steps
+ and download the google-services.json file
+2. Copy the google-services.json file into the directory [PATH_TO_SAMPLES]/android-sdk-samples/intercom-sample-fcm/app
+3 Go to https://console.firebase.google.com/project/[YOUR_GOOGLE_APP]/settings/cloudmessaging
+ and copy the Server key.
+4. Go to https://app.intercom.io/a/apps/[YOUR_INTERCOM_APP_ID]/settings/android and Enable GCM by adding the
+ server key from the previous step.
+
+### Usage
+1. Run the FCM sample application.
+2. Background the app.
+3. Go to your https://app.intercom.io/a/apps/[YOUR_INTERCOM_APP_ID]/users/segments/active
+4. Find user 123456 and send them a message.
+5. You should receive a push notification to your device.
### Error checking
- Check logcat for any errors, make sure you have no filters turned on. It can help to switch
logcat to Verbose.
-- Report any issue on Intercom or on our Github repo
\ No newline at end of file
+- Report any issue on Intercom or on our Github repo
diff --git a/samples/intercom-sample-fcm/.gitignore b/samples/intercom-sample-fcm/.gitignore
new file mode 100644
index 00000000..1406630a
--- /dev/null
+++ b/samples/intercom-sample-fcm/.gitignore
@@ -0,0 +1,6 @@
+.gradle
+local.properties
+.idea
+.DS_Store
+build
+*.iml
diff --git a/samples/intercom-sample-fcm/app/build.gradle b/samples/intercom-sample-fcm/app/build.gradle
new file mode 100644
index 00000000..f3c61d8b
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 24
+ buildToolsVersion "24.0.1"
+
+ defaultConfig {
+ applicationId "io.intercom.sample"
+ minSdkVersion 15
+ targetSdkVersion 24
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+repositories {
+ maven {
+ url 'https://dl.bintray.com/intercom/intercom-maven'
+ }
+}
+
+dependencies {
+ compile 'io.intercom.android:intercom-sdk-base:3.0.3'
+ compile 'io.intercom.android:intercom-sdk-fcm:3.0.3'
+}
diff --git a/samples/intercom-sample-fcm/app/proguard-rules.pro b/samples/intercom-sample-fcm/app/proguard-rules.pro
new file mode 100644
index 00000000..83f4de79
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/dalecantwell/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/samples/intercom-sample-fcm/app/src/main/AndroidManifest.xml b/samples/intercom-sample-fcm/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..932cdfa8
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/intercom-sample-fcm/app/src/main/java/io/intercom/sample/MainActivity.java b/samples/intercom-sample-fcm/app/src/main/java/io/intercom/sample/MainActivity.java
new file mode 100644
index 00000000..c9411a55
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/java/io/intercom/sample/MainActivity.java
@@ -0,0 +1,95 @@
+package io.intercom.sample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import io.intercom.android.sdk.Intercom;
+import io.intercom.android.sdk.UnreadConversationCountListener;
+import io.intercom.android.sdk.identity.Registration;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+ //----------------------------------------------------------------------------------------------
+ //Make sure you go to SampleApplication.java to set your app ID and API key
+ //----------------------------------------------------------------------------------------------
+ private static final String USER_ID = "123456";
+
+ //----------------------------------------------------------------------------------------------
+ //If you use secure mode you will need to include HMAC and data
+ //We suggest taking these values from your app. You may need to change USER_ID above
+ //to match your HMAC values
+ //----------------------------------------------------------------------------------------------
+ private static final String YOUR_HMAC = "";
+ private static final String YOUR_DATA = "";
+
+ private TextView unreadCountView;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ if (TextUtils.isEmpty(SampleApplication.YOUR_APP_ID)
+ || TextUtils.isEmpty(SampleApplication.YOUR_API_KEY)) {
+ findViewById(R.id.not_initialized).setVisibility(View.VISIBLE);
+ } else {
+ //if you have provided a HMAC and data try begin secure session
+ if (!TextUtils.isEmpty(YOUR_HMAC) && !TextUtils.isEmpty(YOUR_DATA)) {
+ Intercom.client().setSecureMode(YOUR_HMAC, YOUR_DATA);
+ }
+
+ //Enable default launcher
+ Intercom.client().setLauncherVisibility(Intercom.Visibility.VISIBLE);
+ //Register a user with Intercom
+ Intercom.client().registerIdentifiedUser(Registration.create().withUserId(USER_ID));
+ //Custom launcher
+ Button messengerButton = (Button) findViewById(R.id.messenger_button);
+ messengerButton.setOnClickListener(this);
+
+ //set the unread count
+ unreadCountView = (TextView) findViewById(R.id.unread_counter);
+ int unreadCount = Intercom.client().getUnreadConversationCount();
+ unreadCountView.setText(String.valueOf(unreadCount));
+ setBadgeVisibility(unreadCount, unreadCountView);
+ }
+ }
+
+ @Override
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.messenger_button:
+ Intercom.client().displayConversationsList();
+ break;
+ }
+ }
+
+ private final UnreadConversationCountListener unreadConversationCountListener = new UnreadConversationCountListener() {
+ @Override public void onCountUpdate(int unreadCount) {
+ setBadgeVisibility(unreadCount, unreadCountView);
+ unreadCountView.setText(String.valueOf(unreadCount));
+ }
+ };
+
+ private void setBadgeVisibility(int unreadCount, TextView unreadCountView) {
+ int visibility = unreadCount == 0 ? View.INVISIBLE : View.VISIBLE;
+ unreadCountView.setVisibility(visibility);
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+
+ Intercom.client().removeUnreadConversationCountListener(unreadConversationCountListener);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+
+ Intercom.client().addUnreadConversationCountListener(unreadConversationCountListener);
+ Intercom.client().handlePushMessage();
+ }
+}
diff --git a/samples/intercom-sample-fcm/app/src/main/java/io/intercom/sample/SampleApplication.java b/samples/intercom-sample-fcm/app/src/main/java/io/intercom/sample/SampleApplication.java
new file mode 100644
index 00000000..d02e212c
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/java/io/intercom/sample/SampleApplication.java
@@ -0,0 +1,19 @@
+package io.intercom.sample;
+
+import android.app.Application;
+
+import io.intercom.android.sdk.Intercom;
+
+public class SampleApplication extends Application {
+ //----------------------------------------------------------------------------------------------
+ // You need to enter your API key and app ID here to use Intercom for Android
+ // To get these keys go to https://app.intercom.io/a/apps/_/settings/android and follow the step-up guide
+ //----------------------------------------------------------------------------------------------
+ static final String YOUR_API_KEY = "";
+ static final String YOUR_APP_ID = "";
+
+ @Override public void onCreate() {
+ super.onCreate();
+ Intercom.initialize(this, YOUR_API_KEY, YOUR_APP_ID);
+ }
+}
diff --git a/samples/intercom-sample-fcm/app/src/main/res/drawable-xxhdpi/ic_chat.png b/samples/intercom-sample-fcm/app/src/main/res/drawable-xxhdpi/ic_chat.png
new file mode 100644
index 00000000..d8f16330
Binary files /dev/null and b/samples/intercom-sample-fcm/app/src/main/res/drawable-xxhdpi/ic_chat.png differ
diff --git a/samples/intercom-sample-fcm/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/samples/intercom-sample-fcm/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100755
index 00000000..49bca7ce
Binary files /dev/null and b/samples/intercom-sample-fcm/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/samples/intercom-sample-fcm/app/src/main/res/drawable/rounded_badge.xml b/samples/intercom-sample-fcm/app/src/main/res/drawable/rounded_badge.xml
new file mode 100644
index 00000000..0a90b6f2
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/drawable/rounded_badge.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/drawable/rounded_button.xml b/samples/intercom-sample-fcm/app/src/main/res/drawable/rounded_button.xml
new file mode 100644
index 00000000..c8148435
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/drawable/rounded_button.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/layout/activity_main.xml b/samples/intercom-sample-fcm/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000..457e8d22
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/values-w820dp/dimens.xml b/samples/intercom-sample-fcm/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..63fc8164
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 64dp
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/values/color.xml b/samples/intercom-sample-fcm/app/src/main/res/values/color.xml
new file mode 100644
index 00000000..33076838
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/values/color.xml
@@ -0,0 +1,6 @@
+
+
+ #0288d1
+ #0066c0
+ #aaaaaa
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/values/dimens.xml b/samples/intercom-sample-fcm/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..4d65327a
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/values/dimens.xml
@@ -0,0 +1,7 @@
+
+
+ 16dp
+ 16dp
+ 6dp
+ 16sp
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/values/strings.xml b/samples/intercom-sample-fcm/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000..4ae9d2c9
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+
+ IntercomFCM
+ Intercom FCM Sample
+ Chat with us!
+ Error\nYou need to add your
+ API key and App ID in SampleApplication.java
+
+
diff --git a/samples/intercom-sample-fcm/app/src/main/res/values/styles.xml b/samples/intercom-sample-fcm/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000..4c08f54d
--- /dev/null
+++ b/samples/intercom-sample-fcm/app/src/main/res/values/styles.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
diff --git a/samples/intercom-sample-fcm/build.gradle b/samples/intercom-sample-fcm/build.gradle
new file mode 100644
index 00000000..38802784
--- /dev/null
+++ b/samples/intercom-sample-fcm/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.1.2'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task wrapper(type: Wrapper) {
+ gradleVersion = '2.13'
+ distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
+}
diff --git a/samples/intercom-sample-fcm/gradle.properties b/samples/intercom-sample-fcm/gradle.properties
new file mode 100644
index 00000000..1d3591c8
--- /dev/null
+++ b/samples/intercom-sample-fcm/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/samples/intercom-sample-fcm/gradle/wrapper/gradle-wrapper.jar b/samples/intercom-sample-fcm/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..ca78035e
Binary files /dev/null and b/samples/intercom-sample-fcm/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/intercom-sample-fcm/gradle/wrapper/gradle-wrapper.properties b/samples/intercom-sample-fcm/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..946dd35c
--- /dev/null
+++ b/samples/intercom-sample-fcm/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed May 04 11:28:47 IST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
diff --git a/samples/intercom-sample-fcm/gradlew b/samples/intercom-sample-fcm/gradlew
new file mode 100755
index 00000000..27309d92
--- /dev/null
+++ b/samples/intercom-sample-fcm/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/samples/intercom-sample-fcm/gradlew.bat b/samples/intercom-sample-fcm/gradlew.bat
new file mode 100644
index 00000000..f6d5974e
--- /dev/null
+++ b/samples/intercom-sample-fcm/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/intercom-sample-fcm/settings.gradle b/samples/intercom-sample-fcm/settings.gradle
new file mode 100644
index 00000000..9d495b34
--- /dev/null
+++ b/samples/intercom-sample-fcm/settings.gradle
@@ -0,0 +1 @@
+include ':app'
\ No newline at end of file
diff --git a/samples/intercom-sample/app/build.gradle b/samples/intercom-sample/app/build.gradle
index d7bc8b30..02a411c3 100644
--- a/samples/intercom-sample/app/build.gradle
+++ b/samples/intercom-sample/app/build.gradle
@@ -26,5 +26,5 @@ repositories {
}
dependencies {
- compile 'io.intercom.android:intercom-sdk:3.0.2'
+ compile 'io.intercom.android:intercom-sdk:3.0.3'
}
diff --git a/samples/intercom-sample/app/src/main/java/io/intercom/sample/MainActivity.java b/samples/intercom-sample/app/src/main/java/io/intercom/sample/MainActivity.java
index eafe5b0e..a39d9d79 100644
--- a/samples/intercom-sample/app/src/main/java/io/intercom/sample/MainActivity.java
+++ b/samples/intercom-sample/app/src/main/java/io/intercom/sample/MainActivity.java
@@ -11,37 +11,9 @@
import io.intercom.android.sdk.UnreadConversationCountListener;
import io.intercom.android.sdk.identity.Registration;
-/**
- * ------------------------------------------------------------------------------------------------
- * ------------------------------------------------------------------------------------------------
- * Setting Up
- * ------------------------------------------------------------------------------------------------
- * This is a sample application to demonstrate how to integrate Intercom in a simple app.
- * You will need to add your Api Key and App Id to the SampleApplication
- * You will also need to add either an email or user id (THIS USER WILL BE REGISTERED IN YOUR APP)
- * If you have enabled secure mode you will need to provide hmac and data
- *
- * If you want to enable GCM in the test app simply provide your sender_id (project number in google-services.json)
- * in the strings.xml file inside the tag intercom_gcm_sender_id
- * ------------------------------------------------------------------------------------------------
- * Usage
- * ------------------------------------------------------------------------------------------------
- * 1. Open the app
- * 2. Tap the register button
- * 3. Tap the chat with us button to open the messenger
- * 4. Send a new message to that user to see the unread badge update on the custom launcher and the in app arrive
- * ------------------------------------------------------------------------------------------------
- * Error checking
- * ------------------------------------------------------------------------------------------------
- * Check logcat for any errors, make sure you have no filters turned on. It can help to switch
- * logcat to Verbose.
- * Report any issue on Intercom or on our Github repo
- * ------------------------------------------------------------------------------------------------
- * ------------------------------------------------------------------------------------------------
- */
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
//----------------------------------------------------------------------------------------------
- //Make sure you go to SampleApplication.java to set your App Id and API Key
+ //Make sure you go to SampleApplication.java to set your app ID and API key
//----------------------------------------------------------------------------------------------
private static final String USER_ID = "123456";
@@ -64,20 +36,20 @@ protected void onCreate(Bundle savedInstanceState) {
|| TextUtils.isEmpty(SampleApplication.YOUR_API_KEY)) {
findViewById(R.id.not_initialized).setVisibility(View.VISIBLE);
} else {
- //if you have provided a hmac and data try begin secure session
+ //If you have provided a HMAC and data try begin secure session
if (!TextUtils.isEmpty(YOUR_HMAC) && !TextUtils.isEmpty(YOUR_DATA)) {
Intercom.client().setSecureMode(YOUR_HMAC, YOUR_DATA);
}
- //enable default launcher
+ //Enable default launcher
Intercom.client().setLauncherVisibility(Intercom.Visibility.VISIBLE);
- //register a user with intercom
+ //Register a user with Intercom
Intercom.client().registerIdentifiedUser(Registration.create().withUserId(USER_ID));
//Custom launcher
Button messengerButton = (Button) findViewById(R.id.messenger_button);
messengerButton.setOnClickListener(this);
- //set the unread count
+ //Set the unread count
unreadCountView = (TextView) findViewById(R.id.unread_counter);
int unreadCount = Intercom.client().getUnreadConversationCount();
unreadCountView.setText(String.valueOf(unreadCount));
@@ -118,6 +90,6 @@ public void onResume() {
super.onResume();
Intercom.client().addUnreadConversationCountListener(unreadConversationCountListener);
- Intercom.client().openGcmMessage();
+ Intercom.client().handlePushMessage();
}
}
diff --git a/samples/intercom-sample/app/src/main/java/io/intercom/sample/SampleApplication.java b/samples/intercom-sample/app/src/main/java/io/intercom/sample/SampleApplication.java
index 307db557..d02e212c 100644
--- a/samples/intercom-sample/app/src/main/java/io/intercom/sample/SampleApplication.java
+++ b/samples/intercom-sample/app/src/main/java/io/intercom/sample/SampleApplication.java
@@ -6,7 +6,7 @@
public class SampleApplication extends Application {
//----------------------------------------------------------------------------------------------
- // You need to enter your api key and app id here to use Intercom for Android
+ // You need to enter your API key and app ID here to use Intercom for Android
// To get these keys go to https://app.intercom.io/a/apps/_/settings/android and follow the step-up guide
//----------------------------------------------------------------------------------------------
static final String YOUR_API_KEY = "";
diff --git a/samples/intercom-sample/app/src/main/res/values/strings.xml b/samples/intercom-sample/app/src/main/res/values/strings.xml
index 24927b00..8f59c218 100644
--- a/samples/intercom-sample/app/src/main/res/values/strings.xml
+++ b/samples/intercom-sample/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
- Intercom Custom Launcher Sample
- Intercom Custom Launcher Sample
+ IntercomSample
+ Intercom SampleChat with us!Error\nYou need to add your
API key and App ID in SampleApplication.java