Merge pull request YousicianGit#12 from YousicianGit/fix/deadlock

Oskari Leppäaho · web-flow · commit c5e5bb57f4e6 · 2016-11-23T14:22:28.000+02:00
Fix deadlock
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
@@ -78,32 +78,6 @@ public void run() {
                         RelativeLayout.LayoutParams.MATCH_PARENT);
                 topViewGroup.addView(mainLayout, rlp);
                 SetInitialized();
-
-                rootView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                    @Override
-                    public void onGlobalLayout() {
-
-                        Rect r = new Rect();
-                        rootView.getWindowVisibleDisplayFrame(r);
-                        int screenHeight = rootView.getRootView().getHeight();
-
-                        // r.bottom is the position above soft keypad or device button.
-                        // if keypad is shown, the r.bottom is smaller than that before.
-                        keyboardHeight = screenHeight - r.bottom;
-                        boolean bKeyOpen = (keyboardHeight > screenHeight * 0.15);
-
-                        float fKeyHeight = (float) keyboardHeight / (float) screenHeight;
-
-                        JSONObject json = new JSONObject();
-                        try {
-                            json.put("msg", MSG_SHOW_KEYBOARD);
-                            json.put("show", bKeyOpen);
-                            json.put("keyheight", fKeyHeight);
-                        } catch (JSONException e) {
-                        }
-                        SendUnityMessage(json);
-                    }
-                });
                 Log.i(LOG_TAG, "InitEditBoxPlugin okay");
             }
         });
@@ -123,33 +97,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`	`{`