- some cleanup

- deprecate "setSSLCertMode" in favor of "setServerTrustMode"

src/android/com/silkimen/cordovahttp/CordovaClientAuth.java

@@ -21,15 +21,17 @@ class CordovaClientAuth implements Runnable, KeyChainAliasCallback {
   private static final String TAG = "Cordova-Plugin-HTTP";
 
   private String mode;
+  private String filePath;
   private Activity activity;
   private Context context;
   private TLSConfiguration tlsConfiguration;
   private CallbackContext callbackContext;
 
-  public CordovaClientAuth(final String mode, final Activity activity, final Context context,
+  public CordovaClientAuth(final String mode, final String filePath, final Activity activity, final Context context,
       final TLSConfiguration configContainer, final CallbackContext callbackContext) {
 
     this.mode = mode;
+    this.filePath = filePath;
     this.activity = activity;
     this.tlsConfiguration = configContainer;
     this.context = context;
@@ -42,7 +44,7 @@ class CordovaClientAuth implements Runnable, KeyChainAliasCallback {
     case "systemstore":
       KeyChain.choosePrivateKeyAlias(this.activity, this, null, null, null, -1, null);
       break;
-    case "bundle":
+    case "file":
       // @todo use pfx in bundle
       this.callbackContext.error("Not implemented, yet");
       break;

src/android/com/silkimen/cordovahttp/CordovaHttpPlugin.java

@@ -68,8 +68,8 @@ public class CordovaHttpPlugin extends CordovaPlugin {
       return this.uploadFile(args, callbackContext);
     case "downloadFile":
       return this.downloadFile(args, callbackContext);
-    case "setSSLCertMode":
-      return this.setSSLCertMode(args, callbackContext);
+    case "setServerTrustMode":
+      return this.setServerTrustMode(args, callbackContext);
     case "setClientAuthMode":
       return this.setClientAuthMode(args, callbackContext);
     case "disableRedirect":
@@ -140,7 +140,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
     return true;
   }
 
-  private boolean setSSLCertMode(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
+  private boolean setServerTrustMode(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
     CordovaServerTrust runnable = new CordovaServerTrust(args.getString(0), this.cordova.getActivity(),
         this.tlsConfiguration, callbackContext);
 
@@ -150,7 +150,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
   }
 
   private boolean setClientAuthMode(final JSONArray args, final CallbackContext callbackContext) throws JSONException {
-    CordovaClientAuth runnable = new CordovaClientAuth(args.getString(0), this.cordova.getActivity(),
+    CordovaClientAuth runnable = new CordovaClientAuth(args.getString(0), args.getString(1), this.cordova.getActivity(),
         this.cordova.getContext(), this.tlsConfiguration, callbackContext);
 
     cordova.getThreadPool().execute(runnable);

src/android/com/silkimen/http/TLSSocketFactory.java

@@ -28,8 +28,8 @@ public class TLSSocketFactory extends SSLSocketFactory {
   }
 
   @Override
-  public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-    return enableTLSOnSocket(delegate.createSocket(s, host, port, autoClose));
+  public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException {
+    return enableTLSOnSocket(delegate.createSocket(socket, host, port, autoClose));
   }
 
   @Override

src/ios/CordovaHttpPlugin.h

@@ -4,7 +4,7 @@
 
 @interface CordovaHttpPlugin : CDVPlugin
 
-- (void)setSSLCertMode:(CDVInvokedUrlCommand*)command;
+- (void)setServerTrustMode:(CDVInvokedUrlCommand*)command;
 - (void)disableRedirect:(CDVInvokedUrlCommand*)command;
 - (void)post:(CDVInvokedUrlCommand*)command;
 - (void)get:(CDVInvokedUrlCommand*)command;

src/ios/CordovaHttpPlugin.m

@@ -126,7 +126,7 @@
     return headerFieldsCopy;
 }
 
-- (void)setSSLCertMode:(CDVInvokedUrlCommand*)command {
+- (void)setServerTrustMode:(CDVInvokedUrlCommand*)command {
     NSString *certMode = [command.arguments objectAtIndex:0];
 
     if ([certMode isEqualToString: @"default"] || [certMode isEqualToString: @"legacy"]) {