fixes few race-condition with runnable, and race-condition with lists in onNewIntent and onActivityResult. This changes are synchronized with latest pyjnius changes.

tito · tito · commit b8e723db541d · 2013-06-25T11:52:27.000+02:00
diff --git a/recipes/android/src/android/activity.py b/recipes/android/src/android/activity.py
@@ -1,4 +1,4 @@
-from jnius import PythonJavaClass, java_method, autoclass
+from jnius import PythonJavaClass, java_method, autoclass, cast
 
 _activity = autoclass('org.renpy.android.PythonActivity').mActivity
 
@@ -10,14 +10,22 @@ class NewIntentListener(PythonJavaClass):
     __javainterfaces__ = ['org/renpy/android/PythonActivity$NewIntentListener']
     __javacontext__ = 'app'
 
-    def __init__(self, callback):
-        super(NewIntentListener, self).__init__()
+    def __init__(self, callback, **kwargs):
+        super(NewIntentListener, self).__init__(**kwargs)
         self.callback = callback
 
     @java_method('(Landroid/content/Intent;)V')
     def onNewIntent(self, intent):
         self.callback(intent)
 
+    @java_method('(Ljava/lang/Object;)Z')
+    def equals(self, obj):
+        return obj.hashCode() == self.hashCode()
+
+    @java_method('()I')
+    def hashCode(self):
+        return id(self)
+
 
 class ActivityResultListener(PythonJavaClass):
     __javainterfaces__ = ['org/renpy/android/PythonActivity$ActivityResultListener']
@@ -31,6 +39,14 @@ def __init__(self, callback):
     def onActivityResult(self, requestCode, resultCode, intent):
         self.callback(requestCode, resultCode, intent)
 
+    @java_method('(Ljava/lang/Object;)Z')
+    def equals(self, obj):
+        return obj.hashCode() == self.hashCode()
+
+    @java_method('()I')
+    def hashCode(self):
+        return id(self)
+
 
 def bind(**kwargs):
     for event, callback in kwargs.items():
@@ -51,7 +67,7 @@ def unbind(**kwargs):
             raise Exception('Unknown {!r} event'.format(event))
         else:
             for listener in _callbacks[event][:]:
-                if listener.callback is callback:
+                if listener.callback == callback:
                     _callbacks[event].remove(listener)
                     if event == 'on_new_intent':
                         _activity.unregisterNewIntentListener(listener)
diff --git a/recipes/android/src/android/runnable.py b/recipes/android/src/android/runnable.py
@@ -25,8 +25,8 @@ def __init__(self, func):
     def __call__(self, args, kwargs):
         self.args = args
         self.kwargs = kwargs
-        _PythonActivity.mActivity.runOnUiThread(self)
         Runnable.__runnables__.append(self)
+        _PythonActivity.mActivity.runOnUiThread(self)
 
     @java_method('()V')
     def run(self):
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -21,7 +21,8 @@
 import java.io.FileWriter;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
 
 import java.util.zip.GZIPInputStream;
 
@@ -380,11 +381,11 @@ public interface NewIntentListener {
 		void onNewIntent(Intent intent);
 	}
 
-	private ArrayList<NewIntentListener> newIntentListeners = null;
+	private List<NewIntentListener> newIntentListeners = null;
 
 	public void registerNewIntentListener(NewIntentListener listener) {
 		if ( this.newIntentListeners == null )
-			this.newIntentListeners = new ArrayList<NewIntentListener>();
+			this.newIntentListeners = Collections.synchronizedList(new ArrayList<NewIntentListener>());
 		this.newIntentListeners.add(listener);
 	}
 
@@ -400,8 +401,12 @@ protected void onNewIntent(Intent intent) {
 			return;
 		if ( this.mView != null )
 			this.mView.onResume();
-		for ( NewIntentListener listener : this.newIntentListeners )
-			listener.onNewIntent(intent);
+		synchronized ( this.newIntentListeners ) {
+			Iterator<NewIntentListener> iterator = this.newIntentListeners.iterator();
+			while ( iterator.hasNext() ) {
+				(iterator.next()).onNewIntent(intent);
+			}
+		}
 	}
 
 	//----------------------------------------------------------------------------
@@ -412,11 +417,11 @@ public interface ActivityResultListener {
 		void onActivityResult(int requestCode, int resultCode, Intent data);
 	}
 
-	private ArrayList<ActivityResultListener> activityResultListeners = null;
+	private List<ActivityResultListener> activityResultListeners = null;
 
 	public void registerActivityResultListener(ActivityResultListener listener) {
 		if ( this.activityResultListeners == null )
-			this.activityResultListeners = new ArrayList<ActivityResultListener>();
+			this.activityResultListeners = Collections.synchronizedList(new ArrayList<ActivityResultListener>());
 		this.activityResultListeners.add(listener);
 	}
 
@@ -432,8 +437,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
 			return;
 		if ( this.mView != null )
 			this.mView.onResume();
-		for ( ActivityResultListener listener : this.activityResultListeners )
-			listener.onActivityResult(requestCode, resultCode, intent);
+		synchronized ( this.activityResultListeners ) {
+			Iterator<ActivityResultListener> iterator = this.activityResultListeners.iterator();
+			while ( iterator.hasNext() )
+				(iterator.next()).onActivityResult(requestCode, resultCode, intent);
+		}
 	}
 
 	//----------------------------------------------------------------------------
