Merge pull request #896 from eiriksm/play_services_java_fixes

Call the lua callback from the java side, add default (required) variables for google play services.
moai · Apr 16, 2014 · 1d013d4 · 1d013d4
2 parents 51258e4 + 52e23de
commit 1d013d4
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 2 deletions.
diff --git a/ant/host-source/d.run-host.sh b/ant/host-source/d.run-host.sh
@@ -96,6 +96,7 @@
 	}
 
 	fr $out_dir/project/res/values/strings.xml @NAME@ "$app_name"
+	fr $out_dir/project/res/values/strings.xml @APP_ID@ "$app_id"
 
 	cp -f host-source/project/.project $out_dir/project/.project 
 	fr $out_dir/project/.project @NAME@ "$project_name"

diff --git a/ant/host-source/d.settings-global.sh b/ant/host-source/d.settings-global.sh
@@ -13,6 +13,9 @@
 	project_name="untitled"
 	app_name="untitled"
 
+	# If you are using google play services, change this value.
+	app_id="000"
+
 #----------------------------------------------------------------#
 # version numbers
 #----------------------------------------------------------------#

diff --git a/ant/host-source/source/project/AndroidManifest.xml b/ant/host-source/source/project/AndroidManifest.xml
@@ -45,6 +45,9 @@
 		</activity>
 
 		<receiver android:name="com.ziplinegames.moai.MoaiLocalNotificationReceiver"></receiver>
+		<!-- Used for google play services. You MUST set your app id in res/values/strings.xml -->
+		<meta-data android:name="com.google.android.gms.games.APP_ID"
+			android:value="@string/app_id" />
 
 		<!-- EXTERNAL DECLARATIONS: Placeholder (DO NOT MOVE OR REMOVE) -->
 
@@ -67,4 +70,4 @@
 
 	<uses-feature android:name="android.hardware.screen.landscape" android:required="true" />
 	<uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="true" />
-</manifest>   
+</manifest>
diff --git a/ant/host-source/source/project/res/values/strings.xml b/ant/host-source/source/project/res/values/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">@NAME@</string>
+    <string name="app_id">@APP_ID@</string>
 </resources>
diff --git a/ant/host-source/source/project/src/moai/google-play-services/MoaiGooglePlayServices.java b/ant/host-source/source/project/src/moai/google-play-services/MoaiGooglePlayServices.java
@@ -41,6 +41,8 @@ public class MoaiGooglePlayServices {
 	private static int							sServicesStatus;
 	private static String						sToken = null;
 
+	protected static native void	AKUNotifyConnectionComplete ();
+
 	public static final int 					ALERT_DIALOG_REQUEST_CODE = 7007;
 	public static final int 					ACCOUNT_PICKER_REQUEST_CODE = 7117;
 	public static final int 					AUTH_REQUEST_CODE = 7227;
@@ -106,6 +108,12 @@ public static void onStop () {
 		sGameClient.disconnect ();
 	}
 
+	public static void connectionComplete() {
+		synchronized ( Moai.sAkuLock ) {
+			AKUNotifyConnectionComplete ( );
+		}
+	}
+
 	//================================================================//
 	// MoaiGooglePlayServices private functions
 	//================================================================//
@@ -242,4 +250,4 @@ public static void unlockAchievement ( String achID ) {
 			sGameClient.unlockAchievement ( achID );
 		}
 	}
-}
+}
diff --git a/ant/host-source/source/project/src/moai/google-play-services/MoaiPlayServicesCallbacks.java b/ant/host-source/source/project/src/moai/google-play-services/MoaiPlayServicesCallbacks.java
@@ -6,6 +6,7 @@
 
 package com.ziplinegames.moai;
 
+import com.ziplinegames.moai.MoaiGooglePlayServices;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
@@ -25,6 +26,7 @@ public class MoaiPlayServicesCallbacks implements ConnectionCallbacks, OnConnect
 	public void onConnected ( Bundle connectionHint ) {
 
 		MoaiLog.i ( "MoaiPlayServicesCallbacks onConnected" );
+		MoaiGooglePlayServices.connectionComplete();
 	}
 
 	//----------------------------------------------------------------//

diff --git a/ant/libmoai/build.sh b/ant/libmoai/build.sh
@@ -234,3 +234,4 @@ echo "$facebook_flags" >> libs/package.txt
 echo "$push_flags" >> libs/package.txt
 echo "$tapjoy_flags" >> libs/package.txt
 echo "$twitter_flags" >> libs/package.txt
+echo "$playservices_flags" >> libs/package.txt