Updates Wikitude Cordova plugin;

This version includes the Wikitude SDK 5.3.1. Additionally an Android keyboard fix as well as an iOS pause/resume fix are included. Signed-off-by: Andreas Schacherbauer <[email protected]>
Wikitude · Nov 24, 2016 · 731672c · 731672c
1 parent faa7e91
commit 731672c
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Cordova Plugin Release Notes
 
+## Cordova Plugin 5.3.1-3.3.1
+Release Date: 24.11.2016
+
+#### New
+- Includes Wikitude SDK 5.3.1: detailed changelog for <a href="http://www.wikitude.com/external/doc/documentation/latest/android/changelog.html" target="_top">Android</a> and <a href="http://www.wikitude.com/external/doc/documentation/latest/ios/changelog.html" target="_top">iOS</a>
+
+#### Fixed
+- Fixes an issue for Android where the keyboard was not showing up again after entering and returning from an ARView
+
+
 ## Cordova Plugin 5.3.0-3.3.1
 Release Date: 13.09.2016
 

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.wikitude.phonegap.WikitudePlugin"
-    version="5.3.0">
+    version="5.3.1">
 
     <name>Augmented Reality - Wikitude SDK Plugin</name>
 

diff --git a/src/android/WikitudePlugin.java b/src/android/WikitudePlugin.java
@@ -11,6 +11,7 @@
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.PluginResult;
+import org.apache.cordova.engine.SystemWebView;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -622,6 +623,8 @@ private boolean removeArchitectView() {
 			this.architectView = null;
 
 			WikitudePlugin.handleResumeInCordovaWebView(cordova.getActivity().getWindow().getDecorView().findViewById(android.R.id.content));
+			WikitudePlugin.releaseFocusInCordovaWebView(cordova.getActivity().getWindow().getDecorView().findViewById(android.R.id.content));
+
 			return true;
 		}
 		return false;
@@ -812,8 +815,8 @@ public void onLocationChanged( final Location location ) {
 
 
 	private static void releaseFocusInCordovaWebView(View rootView) {
-		if (rootView instanceof CordovaWebView) {
-        ((CordovaWebView)rootView).getView().clearFocus();
+		if (rootView instanceof SystemWebView) {
+			((SystemWebView) rootView).getCordovaWebView().getView().clearFocus();
 		} else if (rootView instanceof ViewGroup) {
 			final int childCount = ((ViewGroup)rootView).getChildCount();
 			for (int i=0; i< childCount; i++) {
@@ -827,8 +830,8 @@ private static void releaseFocusInCordovaWebView(View rootView) {
 	 * @param rootView the root view to search recursively for a CordovaWebView
 	 */
 	private static void handleResumeInCordovaWebView(final View rootView) {
-		if (rootView instanceof CordovaWebView) {
-			((CordovaWebView)rootView).handleResume(true);
+		if (rootView instanceof SystemWebView) {
+			((SystemWebView) rootView).getCordovaWebView().handleResume(true);
 		}
 		else if (rootView instanceof ViewGroup) {
 			final int childCount = ((ViewGroup)rootView).getChildCount();