android.activity: fix unbind and activity result bind()

tito · tito · commit bc638da46cc5 · 2013-06-24T15:55:16.000+02:00
diff --git a/recipes/android/src/android/activity.py b/recipes/android/src/android/activity.py
@@ -1,4 +1,6 @@
-from jnius import PythonJavaClass, java_method
+from jnius import PythonJavaClass, java_method, autoclass
+
+_activity = autoclass('org.renpy.android.PythonActivity').mActivity
 
 _callbacks = {
     'on_new_intent': [],
@@ -36,10 +38,12 @@ def bind(**kwargs):
             raise Exception('Unknown {!r} event'.format(event))
         elif event == 'on_new_intent':
             listener = NewIntentListener(callback)
+            _activity.registerNewIntentListener(listener)
             _callbacks[event].append(listener)
         elif event == 'on_activity_result':
             listener = ActivityResultListener(callback)
-            _callbacks[event].append(callback)
+            _activity.registerActivityResultListener(listener)
+            _callbacks[event].append(listener)
 
 def unbind(**kwargs):
     for event, callback in kwargs.items():
@@ -49,4 +53,8 @@ def unbind(**kwargs):
             for listener in _callbacks[event][:]:
                 if listener.callback is callback:
                     _callbacks[event].remove(listener)
+                    if event == 'on_new_intent':
+                        _activity.unregisterNewIntentListener(listener)
+                    elif event == 'on_activity_result':
+                        _activity.unregisterActivityResultListener(listener)
 
diff --git a/recipes/kivy/recipe.sh b/recipes/kivy/recipe.sh
@@ -13,8 +13,7 @@ function prebuild_kivy() {
 
 function build_kivy() {
 	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/kivy" ]; then
-		#return
-		true
+		return
 	fi
 
 	cd $BUILD_kivy
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -430,6 +430,8 @@ public void unregisterActivityResultListener(ActivityResultListener listener) {
 	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
 		if ( this.activityResultListeners == null )
 			return;
+		if ( this.mView != null )
+			this.mView.onResume();
 		for ( ActivityResultListener listener : this.activityResultListeners )
 			listener.onActivityResult(requestCode, resultCode, intent);
 	}

Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,8 @@ public void unregisterActivityResultListener(ActivityResultListener listener) {`
`430`	`430`	`protected void onActivityResult(int requestCode, int resultCode, Intent intent) {`
`431`	`431`	`if ( this.activityResultListeners == null )`
`432`	`432`	`return;`
	`433`	`+ if ( this.mView != null )`
	`434`	`+ this.mView.onResume();`
`433`	`435`	`for ( ActivityResultListener listener : this.activityResultListeners )`
`434`	`436`	`listener.onActivityResult(requestCode, resultCode, intent);`
`435`	`437`	`}`