[TIMOB-26161] Allow activity events on UI thread

tidev · Jun 27, 2018 · 21ab9e8 · 21ab9e8
1 parent 37f0558
commit 21ab9e8
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -1177,13 +1177,16 @@ private void dispatchCallback(final String name, KrollDict data)
 		data.put("source", activityProxy);
 
 		final KrollDict d = data;
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run()
-			{
-				activityProxy.callPropertySync(name, new Object[] { d });
-			}
-		});
+		if (TiApplication.isUIThread()) {
+			activityProxy.callPropertyAsync(name, new Object[]{d});
+		} else {
+			runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					activityProxy.callPropertySync(name, new Object[] { d });
+				}
+			});
+		}
 	}
 
 	private void releaseDialogs(boolean finish)