updating samples

Author: DaleCantwell

samples/.DS_Store

@@ -5,8 +5,7 @@ This contains sample apps of ways to integrate and test the integration of the A
 ## Android Studio sample app
 ### Setting Up
 This is a sample application to help with Intercom integration in Android Studio apps
-You will need to visit https://developers.google.com/cloud-messaging/android/client to download your configuration file. Use the following 'io.intercom.gcmsample' as the package name and then copy the file into gcmsample directory.
-You will need to add your Api Key, App Id in the SampleApplication file
+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
 ### Usage

samples/README.md

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "io.intercom.androidstudiosample"
         minSdkVersion 15
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -27,9 +27,7 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:23.2.0'
 
-    compile('io.intercom.android:intercom-sdk:1.1.1@aar') {
-        transitive = true
-    }
+    compile('io.intercom.android:intercom-sdk-base:1.1.16@aar')
 }

samples/intercom-androidstudio-sample/.idea/compiler.xml

@@ -21,7 +21,6 @@ public IBinder onBind(Intent arg0) {
 
     @Override public void onCreate() {
         super.onCreate();
-        Intercom.client().registerIdentifiedUser(new Registration().withEmail("[email protected]"));
         Log.d("SERVICE", "onCreate called");
     }
 
@@ -30,4 +29,4 @@ public void onDestroy() {
         super.onDestroy();
         Log.d("SERVICE", "onDestroy called");
     }
-}
+}

samples/intercom-androidstudio-sample/.idea/gradle.xml

@@ -69,14 +69,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
     @Override public void onClick(View v) {
-        //if you have provided a user id register user with it, otherwise we will use email
+        Registration registration = Registration.create();
         if (!TextUtils.isEmpty(YOUR_USER_ID)) {
-            Intercom.client().registerIdentifiedUser(new Registration().withUserId(YOUR_USER_ID));
-        } else if (!TextUtils.isEmpty(YOUR_EMAIL)) {
-            Intercom.client().registerIdentifiedUser(new Registration().withEmail(YOUR_EMAIL));
-        } else {
-            Log.d("REGISTRATION_ERROR", "No email or user id");
+            registration.withUserId(YOUR_USER_ID);
         }
+        if (!TextUtils.isEmpty(YOUR_EMAIL)) {
+            registration.withEmail(YOUR_EMAIL);
+        }
+        Intercom.client().registerIdentifiedUser(registration);
 
         registerButton.setEnabled(false);
     }

samples/intercom-androidstudio-sample/.idea/misc.xml

@@ -10,8 +10,8 @@
  */
 public class SampleApplication extends Application {
     //CHANGE THESE VALUES
-    private final String YOUR_API_KEY = "<YOUR_API_KEY>";
-    private final String YOUR_APP_ID = "<YOUR_APP_ID>";
+    private static final String YOUR_API_KEY = "<INTERCOM_API_KEY>";
+    private static final String YOUR_APP_ID = "<INTERCOM_APP_ID>";
 
     @Override public void onCreate() {
         super.onCreate();