Merge pull request #36 from hansemannn/update-play-services

feat(android): update firebase to latest

Author: hansemannn

android/.project

@@ -6,17 +6,22 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>com.appcelerator.titanium.core.builder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>com.appcelerator.titanium.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -25,5 +30,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>com.appcelerator.titanium.mobile.module.nature</nature>
 		<nature>com.aptana.projects.webnature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>

android/build.gradle

@@ -7,8 +7,9 @@ repositories {
 }
 
 dependencies {
-compile 'com.google.firebase:firebase-iid:15.0.0'
-compile 'com.google.firebase:firebase-common:15.0.0'
+	compile 'com.google.firebase:firebase-core:16.0.8'
+	compile 'com.google.firebase:firebase-iid:17.1.1'
+	compile 'com.google.firebase:firebase-common:16.1.0'
 }
 
 configurations.all {

android/lib/firebase-common-11.0.4.aar

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.0.2
+version: 4.0.0
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: titanium-firebase-core

android/lib/firebase-common-16.1.0.aar

@@ -8,10 +8,14 @@
  */
 package firebase.core;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.os.AsyncTask;
+import android.os.Build;
 
 import org.appcelerator.kroll.KrollModule;
 import org.appcelerator.kroll.KrollFunction;
+import org.appcelerator.kroll.KrollObject;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.kroll.common.Log;
@@ -152,6 +156,7 @@ public boolean configure(@Kroll.argument(optional = true) KrollDict param)
 		}
 	}
 
+	@TargetApi(Build.VERSION_CODES.CUPCAKE)
 	@Kroll.method
 	public void deleteInstanceId(final KrollFunction callback)
 	{
@@ -181,36 +186,14 @@ protected void onPostExecute(IOException error)
 			.execute();
 	}
 
+	@TargetApi(Build.VERSION_CODES.CUPCAKE)
 	@Kroll.method
 	public void deleteToken(final String authorizedEntity, final String scope, final KrollFunction callback)
 	{
-		new AsyncTask<Void, Void, IOException>() {
-			protected IOException doInBackground(Void... v)
-			{
-				try {
-					FirebaseInstanceId.getInstance().deleteToken(authorizedEntity, scope);
-					return null;
-				} catch (IOException e) {
-					e.printStackTrace();
-					return e;
-				}
-			}
-			protected void onPostExecute(IOException error)
-			{
-				if (callback != null) {
-					HashMap args = new HashMap<>();
-					args.put("success", error == null);
-					if (error != null) {
-						args.put("error", error.getLocalizedMessage());
-					}
-					callback.call(getKrollObject(), args);
-				}
-			}
-		}
-			.execute();
+		new TiBackgroundTask (authorizedEntity, scope, callback, getKrollObject()).execute();
 	}
 
-	public String loadJSONFromAsset(String filename)
+	private String loadJSONFromAsset(String filename)
 	{
 		String json = null;
 
@@ -227,4 +210,42 @@ public String loadJSONFromAsset(String filename)
 		}
 		return json;
 	}
+
+    @TargetApi(Build.VERSION_CODES.CUPCAKE)
+    private static class TiBackgroundTask extends AsyncTask<Void, Void, IOException>
+    {
+        private final String authorizedEntity;
+        private final String scope;
+        private final KrollFunction callback;
+        private final KrollObject krollObject;
+
+        public TiBackgroundTask (final String authorizedEntity, final String scope, final KrollFunction callback, final KrollObject krollObject) {
+            this.authorizedEntity = authorizedEntity;
+            this.scope = scope;
+            this.callback = callback;
+            this.krollObject = krollObject;
+        }
+
+        protected IOException doInBackground(Void... v)
+        {
+            try {
+                FirebaseInstanceId.getInstance().deleteToken(authorizedEntity, scope);
+                return null;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return e;
+            }
+        }
+        protected void onPostExecute(IOException error)
+        {
+            if (callback != null) {
+                HashMap args = new HashMap<>();
+                args.put("success", error == null);
+                if (error != null) {
+                    args.put("error", error.getLocalizedMessage());
+                }
+                callback.call(krollObject, args);
+            }
+        }
+    }
 }