diff --git a/plugin.xml b/plugin.xml index 2102a7b..becc763 100644 --- a/plugin.xml +++ b/plugin.xml @@ -16,23 +16,23 @@ - - + + - - + + - - + + @@ -72,14 +72,14 @@ - - + + - - - + + + diff --git a/src/android/com/synconset/CordovaHTTP/HTTP.java b/src/android/com/synconset/CordovaHTTP/CordovaHttp.java similarity index 95% rename from src/android/com/synconset/CordovaHTTP/HTTP.java rename to src/android/com/synconset/CordovaHTTP/CordovaHttp.java index cafa300..d4719a0 100644 --- a/src/android/com/synconset/CordovaHTTP/HTTP.java +++ b/src/android/com/synconset/CordovaHTTP/CordovaHttp.java @@ -25,7 +25,7 @@ import java.util.Iterator; import android.util.Log; -public class HTTP { +public class CordovaHttp { protected static final String TAG = "CordovaHTTP"; protected String charset = "UTF-8"; @@ -37,7 +37,7 @@ public class HTTP { private HostnameVerifier hostnameVerifier; private CallbackContext callbackContext; - public HTTP(String urlString, JSONObject params, JSONObject headers, SSLContext sslContext, HostnameVerifier hostnameVerifier, CallbackContext callbackContext) { + public CordovaHttp(String urlString, JSONObject params, JSONObject headers, SSLContext sslContext, HostnameVerifier hostnameVerifier, CallbackContext callbackContext) { this.urlString = urlString; this.params = params; this.headers = headers; diff --git a/src/android/com/synconset/CordovaHTTP/HTTPGet.java b/src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java similarity index 91% rename from src/android/com/synconset/CordovaHTTP/HTTPGet.java rename to src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java index 0bf83b5..cbec56e 100644 --- a/src/android/com/synconset/CordovaHTTP/HTTPGet.java +++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpGet.java @@ -18,8 +18,8 @@ import org.json.JSONObject; import android.util.Log; -public class HTTPGet extends HTTP implements Runnable { - public HTTPGet(String urlString, JSONObject params, JSONObject headers, SSLContext sslContext, HostnameVerifier hostnameVerifier, CallbackContext callbackContext) { +public class CordovaHttpGet extends CordovaHttp implements Runnable { + public CordovaHttpGet(String urlString, JSONObject params, JSONObject headers, SSLContext sslContext, HostnameVerifier hostnameVerifier, CallbackContext callbackContext) { super(urlString, params, headers, sslContext, hostnameVerifier, callbackContext); } diff --git a/src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java b/src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java index 9949dc6..4da9a92 100644 --- a/src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java +++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpPlugin.java @@ -56,14 +56,14 @@ public class CordovaHttpPlugin extends CordovaPlugin { JSONObject params = args.getJSONObject(1); JSONObject headers = args.getJSONObject(2); this.addToJSONObject(headers, this.globalHeaders); - HTTPGet get = new HTTPGet(urlString, params, headers, this.sslContext, this.hostnameVerifier, callbackContext); + CordovaHttpGet get = new CordovaHttpGet(urlString, params, headers, this.sslContext, this.hostnameVerifier, callbackContext); cordova.getThreadPool().execute(get); } else if (action.equals("post")) { String urlString = args.getString(0); JSONObject params = args.getJSONObject(1); JSONObject headers = args.getJSONObject(2); this.addToJSONObject(headers, this.globalHeaders); - HTTPPost post = new HTTPPost(urlString, params, headers, this.sslContext, this.hostnameVerifier, callbackContext); + CordovaHttpPost post = new CordovaHttpPost(urlString, params, headers, this.sslContext, this.hostnameVerifier, callbackContext); cordova.getThreadPool().execute(post); } else if (action.equals("setAuthorizationHeaderWithUsernameAndPassword")) { String username = args.getString(0); diff --git a/src/android/com/synconset/CordovaHTTP/HTTPPost.java b/src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java similarity index 92% rename from src/android/com/synconset/CordovaHTTP/HTTPPost.java rename to src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java index 45dfa5f..404f7a1 100644 --- a/src/android/com/synconset/CordovaHTTP/HTTPPost.java +++ b/src/android/com/synconset/CordovaHTTP/CordovaHttpPost.java @@ -21,8 +21,8 @@ import org.json.JSONObject; import android.util.Log; -public class HTTPPost extends HTTP implements Runnable { - public HTTPPost(String urlString, JSONObject params, JSONObject headers, SSLContext sslContext, HostnameVerifier hostnameVerifier, CallbackContext callbackContext) { +public class CordovaHttpPost extends CordovaHttp implements Runnable { + public CordovaHttpPost(String urlString, JSONObject params, JSONObject headers, SSLContext sslContext, HostnameVerifier hostnameVerifier, CallbackContext callbackContext) { super(urlString, params, headers, sslContext, hostnameVerifier, callbackContext); } diff --git a/src/ios/CordovaHTTP.m b/src/ios/CordovaHttpPlugin.m similarity index 98% rename from src/ios/CordovaHTTP.m rename to src/ios/CordovaHttpPlugin.m index f751aa2..a139879 100644 --- a/src/ios/CordovaHTTP.m +++ b/src/ios/CordovaHttpPlugin.m @@ -78,7 +78,7 @@ NSString *url = [command.arguments objectAtIndex:0]; NSDictionary *parameters = [command.arguments objectAtIndex:1]; - CordovaHTTP* __weak weakSelf = self; + CordovaHttpPlugin* __weak weakSelf = self; [manager POST:url parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) { NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; @@ -100,7 +100,7 @@ NSString *url = [command.arguments objectAtIndex:0]; NSDictionary *parameters = [command.arguments objectAtIndex:1]; - CordovaHTTP* __weak weakSelf = self; + CordovaHttpPlugin* __weak weakSelf = self; [manager GET:url parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) { NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; @@ -126,7 +126,7 @@ NSURL *fileURL = [NSURL fileURLWithPath: filePath]; - CordovaHTTP* __weak weakSelf = self; + CordovaHttpPlugin* __weak weakSelf = self; [manager POST:url parameters:parameters constructingBodyWithBlock:^(id formData) { NSError *error; [formData appendPartWithFileURL:fileURL name:name error:&error]; @@ -159,7 +159,7 @@ NSDictionary *parameters = [command.arguments objectAtIndex:1]; NSString *filePath = [command.arguments objectAtIndex: 2]; - CordovaHTTP* __weak weakSelf = self; + CordovaHttpPlugin* __weak weakSelf = self; [manager GET:url parameters:parameters success:^(AFHTTPRequestOperation *operation, id responseObject) { /* * diff --git a/src/ios/HTTPManager.m b/src/ios/HTTPManager.m index ee1f17b..5d2b294 100644 --- a/src/ios/HTTPManager.m +++ b/src/ios/HTTPManager.m @@ -23,10 +23,10 @@ @implementation HttpManager + (instancetype)sharedClient { - static HTTPManager *_sharedClient = nil; + static HttpManager *_sharedClient = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - _sharedClient = [HTTPManager manager]; + _sharedClient = [HttpManager manager]; }); return _sharedClient; diff --git a/www/cordovaHTTP.js b/www/cordovaHTTP.js index f8155b1..50faf37 100644 --- a/www/cordovaHTTP.js +++ b/www/cordovaHTTP.js @@ -8,37 +8,37 @@ var exec = require('cordova/exec'); var http = { setAuthorizationHeaderWithUsernameAndPassword: function(username, password, success, failure) { - return exec(success, failure, "CordovaHTTP", "setAuthorizationHeaderWithUsernameAndPassword", [username, password]); + return exec(success, failure, "CordovaHttpPlugin", "setAuthorizationHeaderWithUsernameAndPassword", [username, password]); }, setHeader: function(header, value, success, failure) { - return exec(success, failure, "CordovaHTTP", "setHeader", [header, value]); + return exec(success, failure, "CordovaHttpPlugin", "setHeader", [header, value]); }, enableSSLPinning: function(success, failure) { - return exec(success, failure, "CordovaHTTP", "enableSSLPinning", []); + return exec(success, failure, "CordovaHttpPlugin", "enableSSLPinning", []); }, validateEntireCertificateChain: function(validateChain, success, failure) { - return exec(success, failure, "CordovaHTTP", "validateEntireCertificateChain", [validateChain]); + return exec(success, failure, "CordovaHttpPlugin", "validateEntireCertificateChain", [validateChain]); }, allowInvalidCertificates: function(allow, success, failure) { - return exec(success, failure, "CordovaHTTP", "allowInvalidCertificates", [allow]); + return exec(success, failure, "CordovaHttpPlugin", "allowInvalidCertificates", [allow]); }, acceptText: function(success, failure) { - return exec(success, failure, "CordovaHTTP", "acceptText", []); + return exec(success, failure, "CordovaHttpPlugin", "acceptText", []); }, acceptData: function(success, failure) { - return exec(success, failure, "CordovaHTTP", "acceptData", []); + return exec(success, failure, "CordovaHttpPlugin", "acceptData", []); }, setAcceptableContentTypes: function(contentTypes, success, failure) { - return exec(success, failure, "CordovaHTTP", "setAcceptableContentTypes", contentTypes); + return exec(success, failure, "CordovaHttpPlugin", "setAcceptableContentTypes", contentTypes); }, post: function(url, params, headers, success, failure) { - return exec(success, failure, "CordovaHTTP", "post", [url, params, headers]); + return exec(success, failure, "CordovaHttpPlugin", "post", [url, params, headers]); }, get: function(url, params, success, failure) { - return exec(success, failure, "CordovaHTTP", "get", [url, params]); + return exec(success, failure, "CordovaHttpPlugin", "get", [url, params]); }, uploadFile: function(url, params, filePath, name, success, failure) { - return exec(success, failure, "CordovaHTTP", "uploadFile", [url, params, filePath, name]); + return exec(success, failure, "CordovaHttpPlugin", "uploadFile", [url, params, filePath, name]); }, downloadFile: function(url, params, filePath, success, failure) { /* @@ -71,7 +71,7 @@ var http = { entry.fullPath = result.file.fullPath; success(entry); }; - return exec(win, failure, "CordovaHTTP", "downloadFile", [url, params, filePath]); + return exec(win, failure, "CordovaHttpPlugin", "downloadFile", [url, params, filePath]); } };