Fix a deadlock, GetNativeText no longer works

Oskari Leppa&#776;aho · Oskari Leppa&#776;aho · commit 76568b1b8a38 · 2016-11-23T11:11:03.000+02:00
We used to get a deadlock when Unity was listening to the
NativeEditBox.returnPressed event and called SetFocusNative on another
NativeEditBox on that event, which resulted in a TextEndEdit message to
be sent to Unity (which never arrived on Unity side). Not 100 % sure why
that was the case, but removing the waiting for EditBox.processRecvJsonMsg
results in SendUnityMsgToPlugin seems to solve the issue.

As we don&rsquo;t wait for the result anymore, we can&rsquo;t return a message to Unity.
Fortunately that was only used for the NativeEditBox.GetTextNative() method,
which isn&rsquo;t necessary because we update the Unity InputField text when the
native text is changed.
diff --git a/release/NativeEditPlugin/Plugins/Android/nativeeditplugin.jar b/release/NativeEditPlugin/Plugins/Android/nativeeditplugin.jar
diff --git a/release/NativeEditPlugin/scripts/NativeEditBox.cs b/release/NativeEditPlugin/scripts/NativeEditBox.cs
@@ -295,6 +295,10 @@ public void SetTextNative(string newText)
 		this.SendPluginMsg(jsonMsg);
 	}
 
+	// GetTextNative won't work on Android, because of threading issues. It should not be needed though,
+	// as the Unity InputField's text property is updated as the native text changes, so it should match
+	// the native text.
+	#if !UNITY_ANDROID
 	public string GetTextNative()
 	{
 		JsonObject jsonMsg = new JsonObject();
@@ -308,6 +312,7 @@ public string GetTextNative()
 		Debug.Log(string.Format("GetTextNative {0}", jsonRet.GetString("text")));
 		return jsonRet.GetString("text");
 	}
+	#endif
 
 	private void RemoveNative()
 	{
diff --git a/src/androidProj/nativeeditplugin/src/main/java/com/bkmin/android/EditBox.java b/src/androidProj/nativeeditplugin/src/main/java/com/bkmin/android/EditBox.java
@@ -43,7 +43,6 @@ public class EditBox {
     private static String MSG_CREATE = "CreateEdit";
     private static String MSG_REMOVE = "RemoveEdit";
     private static String MSG_SET_TEXT = "SetText";
-    private static String MSG_GET_TEXT = "GetText";
     private static String MSG_SET_RECT = "SetRect";
     private static String MSG_SET_FOCUS = "SetFocus";
     private static String MSG_SET_VISIBLE = "SetVisible";
@@ -138,11 +137,6 @@ else if (msg.equals(MSG_SET_TEXT))
                 String text = jsonMsg.getString("text");
                 this.SetText(text);
             }
-            else if (msg.equals(MSG_GET_TEXT))
-            {
-                String text = this.GetText();
-                jsonRet.put("text", text);
-            }
             else if (msg.equals(MSG_SET_RECT))
             {
                 this.SetRect(jsonMsg);
diff --git a/src/androidProj/nativeeditplugin/src/main/java/com/bkmin/android/NativeEditPlugin.java b/src/androidProj/nativeeditplugin/src/main/java/com/bkmin/android/NativeEditPlugin.java
@@ -123,33 +123,13 @@ public static void SendUnityMessage(JSONObject jsonMsg)
         UnityPlayer.UnitySendMessage(unityName, "OnMsgFromPlugin", jsonMsg.toString());
     }
 
-    static JSONObject jsonStaticRet = null;
     public static String SendUnityMsgToPlugin(final int nSenderId, final String jsonMsg) {
         final Runnable task = new Runnable() {
             public void run() {
-                jsonStaticRet = EditBox.processRecvJsonMsg(nSenderId, jsonMsg);
-                synchronized (this) {
-                    this.notify();
-                }
+                EditBox.processRecvJsonMsg(nSenderId, jsonMsg);
             }
         };
-        synchronized (task) {
-            unityActivity.runOnUiThread(task);
-            try
-            {
-                task.wait();
-            }
-            catch ( InterruptedException e )
-            {
-                e.printStackTrace();
-            }
-        }
-
-        if (jsonStaticRet != null) {
-            return jsonStaticRet.toString();
-        }
-        else {
-            return "";
-        }
+        unityActivity.runOnUiThread(task);
+        return new JSONObject().toString();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,10 @@ public void SetTextNative(string newText)`
`295`	`295`	`this.SendPluginMsg(jsonMsg);`
`296`	`296`	`}`
`297`	`297`
	`298`	`+ // GetTextNative won't work on Android, because of threading issues. It should not be needed though,`
	`299`	`+ // as the Unity InputField's text property is updated as the native text changes, so it should match`
	`300`	`+ // the native text.`
	`301`	`+ #if !UNITY_ANDROID`
`298`	`302`	`public string GetTextNative()`
`299`	`303`	`{`
`300`	`304`	`JsonObject jsonMsg = new JsonObject();`
`@@ -308,6 +312,7 @@ public string GetTextNative()`
`308`	`312`	`Debug.Log(string.Format("GetTextNative {0}", jsonRet.GetString("text")));`
`309`	`313`	`return jsonRet.GetString("text");`
`310`	`314`	`}`
	`315`	`+ #endif`
`311`	`316`
`312`	`317`	`private void RemoveNative()`
`313`	`318`	`{`