Upgrade to latest Intercom SDK and resolve GCM crashing with custom hook

Author: jerodfritz

.classpath

@@ -5,13 +5,16 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/Applications/Android/platforms/android-23/android.jar"/>
 	<classpathentry kind="lib" path="/Applications/Android/add-ons/addon-google_apis-google-23/libs/maps.jar"/>
-	<classpathentry kind="lib" path="/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.1.1.GA/android/titanium.jar"/>
-	<classpathentry kind="lib" path="/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.1.1.GA/android/kroll-common.jar"/>
-	<classpathentry kind="lib" path="/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.1.1.GA/android/kroll-apt.jar"/>
+	<classpathentry kind="lib" path="/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.2.2.GA/android/titanium.jar"/>
+	<classpathentry kind="lib" path="/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.2.2.GA/android/kroll-common.jar"/>
+	<classpathentry kind="lib" path="/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.2.2.GA/android/kroll-apt.jar"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="android/lib/intercom-sdk-base-classes.jar"/>
+	<classpathentry kind="lib" path="android/lib/repackaged_dependencies.jar"/>
+	<classpathentry kind="lib" path="android/lib/intercom-sdk-gcm-classes.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGELOG.txt

@@ -1,4 +1,4 @@
-# Intercom android module for Intercom Android SDK version 1.1.11
+### Intercom android module for Intercom Android SDK version 1.1.21
 
 Integrate Intercom.io with Appcelerator.  iOS module available here https://github.com/markive/TiIntercom . Tested with 5.1.1GA SDK
 
@@ -47,7 +47,7 @@ exports.setDeviceToken = function(token, appicon /* 'device-token', Ti.App.Andro
 
 ```
 
-### tiapp.xml changes for Android GCM support
+### IMPORTANT : tiapp.xml changes for Android GCM support
 ```
     <android xmlns:android="http://schemas.android.com/apk/res/android">
         <manifest>
@@ -78,6 +78,53 @@ exports.setDeviceToken = function(token, appicon /* 'device-token', Ti.App.Andro
     </android>
 ```
 
+### IMPORTANT : create hooks folder and intercom.js file in the module for Android GCM support
+You need to create a hooks folder with a .js file inside the module directory with the following contents.  This makes sure the additional R values are added for intercom during compile.  If someone can tell me how to update the ant build script to create this automatically in the compiled dist please let me know otherwise you need to do this manually after compile.
+
+Create the following file:
+
+FILE: /modules/android/ti.intercom.android/1.0.4/hooks/intercom.js
+```
+exports.cliVersion = '>=3.X';
+
+exports.init = function(logger, config, cli, appc) {
+  cli.on('build.android.aapt', {
+    pre : function(data, next) {
+      var args = data.args[1];
+      if (args.indexOf('--auto-add-overlay') < 0) {
+        args.push('--auto-add-overlay');
+      }
+
+      var externalLibraries = [{
+        javaClass : 'io.intercom.android.sdk.gcm',
+        resPath : '/Users/jerodfritz/Appcelerator/Prspctr/modules/android/ti.intercom.android/1.0.4/platform/android/gcm-res'
+      }];
+      console.log("Add Intercom GCM External Libraries", JSON.stringify(externalLibraries));
+
+      // --extra-packages can be defined just once
+      if (args.indexOf('--extra-packages') < 0) {
+        args.push('--extra-packages');
+        args.push('');
+      }
+      var namespaceIndex = args.indexOf('--extra-packages') + 1;
+
+      externalLibraries.forEach(function(lib) {
+        if (args[namespaceIndex].indexOf(lib.javaClass) < 0) {
+          args[namespaceIndex].length && (args[namespaceIndex] += ':');
+          args[namespaceIndex] += lib.javaClass;
+        }
+        if (args.indexOf(lib.resPath) < 0) {
+          args.push('-S');
+          args.push(lib.resPath);
+        }
+      });
+      next(null, data);
+    }
+  });
+};
+```
+
+
 #### Author
 Jerod
 ([email protected])

README.md

@@ -1,3 +1,4 @@
-titanium.platform=/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.1.1.GA/android
+titanium.platform=/Users/jerodfritz/Library/Application Support/Titanium/mobilesdk/osx/5.3.0.GA/android
 android.platform=/Applications/Android/platforms/android-23
 google.apis=/Applications/Android/add-ons/addon-google_apis-google-23
+android.ndk=/Applications/Android/ndk

android/LICENSE

@@ -24,33 +24,6 @@
 		</condition>
 	</fail>
 
-	<!-- Copy documentation subdirectories -->
-	<mkdir dir="${basedir}/documentation"/>
-	<copy todir="${basedir}/documentation">
-		<fileset dir="${basedir}/../documentation"/>
-	</copy>
-
-	<!-- Copy example subdirectories -->
-	<mkdir dir="${basedir}/example"/>
-	<copy todir="${basedir}/example">
-		<fileset dir="${basedir}/../example"/>
-	</copy>
-
-	<!-- Copy assets subdirectories -->
-	<mkdir dir="${basedir}/assets"/>
-	<copy todir="${basedir}/assets">
-		<fileset dir="${basedir}/../assets"/>
-	</copy>
-
-	<!-- Copy license -->
-	<copy todir="${basedir}" file="${basedir}/../LICENSE"/>
-
-	<target name="cleancopy" description="Delete old copies">
-		<delete dir="${basedir}/documentation"/>
-		<delete dir="${basedir}/example"/>
-		<delete dir="${basedir}/assets"/>
-		<delete file="${basedir}/LICENSE"/>
-	</target>
 
 	<import file="${titanium.platform}/../module/android/build.xml"/>
 </project>