Merge pull request #92 from marcuspridham/master

Handle getKeyTypes and getPrincipals
infil00p · Jun 23, 2016 · a29c236 · a29c236
2 parents e1bb40d + 8f0521f
commit a29c236
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/platforms/android/src/org/crosswalk/engine/XWalkCordovaClientCertRequest.java b/platforms/android/src/org/crosswalk/engine/XWalkCordovaClientCertRequest.java
@@ -52,7 +52,7 @@ public String getHost() {
      * Returns the acceptable types of asymmetric keys (can be null).
      */
     public String[] getKeyTypes() {
-        return null;
+        return request.getKeyTypes();
     }
 
     /*
@@ -67,7 +67,7 @@ public int getPort() {
      * key (can be null).
      */
     public Principal[] getPrincipals() {
-        return null;
+        return request.getPrincipals();
     }
 
     /*

diff --git a/plugin.xml b/plugin.xml
@@ -21,7 +21,7 @@
     <platform name="android">
         <config-file target="res/xml/config.xml" parent="/*">
             <preference name="webView" value="org.crosswalk.engine.XWalkWebViewEngine"/>
-            <preference name="xwalkVersion" default="18+"/>
+            <preference name="xwalkVersion" default="19+"/>
             <preference name="xwalkLiteVersion" default="xwalk_core_library_canary:17+"/>
             <preference name="xwalkCommandLine" default="--disable-pull-to-refresh-effect"/>
             <preference name="xwalkMode" default="embedded" />