From 9f291886da0a4c093e1f70bff0fa7e3a4544dcf6 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Sat, 18 Jan 2020 20:54:09 +0100
Subject: [PATCH 01/14] fix issue #56 data.class() return undefined

data.class() return undefined => use data `instanceof` instead
---
 src/https.ios.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index 0c4bed5..1d9770c 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -44,7 +44,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
   let content: any;
   if (data && data.class) {
     // console.log('data.class().name', data.class().name)
-    if (data.enumerateKeysAndObjectsUsingBlock || data.class().name === 'NSArray') {
+    if (data.enumerateKeysAndObjectsUsingBlock || data instanceof NSArray) {
       // content = {}
       // data.enumerateKeysAndObjectsUsingBlock(function(k, v) {
       // 	console.log('v.description', v.description)
@@ -53,7 +53,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
       let serial = NSJSONSerialization.dataWithJSONObjectOptionsError(data, NSJSONWritingOptions.PrettyPrinted);
       content = NSString.alloc().initWithDataEncoding(serial, NSUTF8StringEncoding).toString();
       // console.log('content', content)
-    } else if (data.class().name === 'NSData') {
+    } else if (data instanceof NSData) {
       content = NSString.alloc().initWithDataEncoding(data, NSASCIIStringEncoding).toString();
       // } else if (data.class().name == 'NSArray') {
       // 	content = []

From cdf54f809371bdb492a2c3a73e907d87d425a8d1 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Sat, 18 Jan 2020 20:56:29 +0100
Subject: [PATCH 02/14] Update package.json

---
 src/package.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/package.json b/src/package.json
index 13b9002..a906fef 100644
--- a/src/package.json
+++ b/src/package.json
@@ -43,7 +43,13 @@
       "name": "Robert Laverty",
       "email": "roblav96@gmail.com",
       "url": "https://github.com/roblav96"
+    },
+    {
+      "name": "Kefah BADER ALDIN",
+      "email": "kefah.bader@gmail.com",
+      "url": "https://github.com/kefahB"
     }
+
   ],
   "repository": "github:gethuman/nativescript-https",
   "homepage": "https://github.com/gethuman/nativescript-https",

From 0951fd06b5addd16313adb3b3635bff53077438b Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Sat, 18 Jan 2020 21:38:24 +0100
Subject: [PATCH 03/14] Typescript fix

---
 src/https.ios.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index 1d9770c..937469d 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -44,7 +44,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
   let content: any;
   if (data && data.class) {
     // console.log('data.class().name', data.class().name)
-    if (data.enumerateKeysAndObjectsUsingBlock || data instanceof NSArray) {
+    if (data.enumerateKeysAndObjectsUsingBlock || <any>(data) instanceof NSArray) {
       // content = {}
       // data.enumerateKeysAndObjectsUsingBlock(function(k, v) {
       // 	console.log('v.description', v.description)
@@ -53,7 +53,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
       let serial = NSJSONSerialization.dataWithJSONObjectOptionsError(data, NSJSONWritingOptions.PrettyPrinted);
       content = NSString.alloc().initWithDataEncoding(serial, NSUTF8StringEncoding).toString();
       // console.log('content', content)
-    } else if (data instanceof NSData) {
+    } else if (<any>(data) instanceof NSData) {
       content = NSString.alloc().initWithDataEncoding(data, NSASCIIStringEncoding).toString();
       // } else if (data.class().name == 'NSArray') {
       // 	content = []

From 847ddabe63d70e6dfb6139d0c6223fdbc59fc1bd Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Sat, 18 Jan 2020 21:49:16 +0100
Subject: [PATCH 04/14] Update https.ios.ts

---
 src/https.ios.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index 937469d..cd45551 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -44,7 +44,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
   let content: any;
   if (data && data.class) {
     // console.log('data.class().name', data.class().name)
-    if (data.enumerateKeysAndObjectsUsingBlock || <any>(data) instanceof NSArray) {
+    if (data.enumerateKeysAndObjectsUsingBlock || (<any>data) instanceof NSArray) {
       // content = {}
       // data.enumerateKeysAndObjectsUsingBlock(function(k, v) {
       // 	console.log('v.description', v.description)
@@ -53,7 +53,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
       let serial = NSJSONSerialization.dataWithJSONObjectOptionsError(data, NSJSONWritingOptions.PrettyPrinted);
       content = NSString.alloc().initWithDataEncoding(serial, NSUTF8StringEncoding).toString();
       // console.log('content', content)
-    } else if (<any>(data) instanceof NSData) {
+    } else if ((<any>data) instanceof NSData) {
       content = NSString.alloc().initWithDataEncoding(data, NSASCIIStringEncoding).toString();
       // } else if (data.class().name == 'NSArray') {
       // 	content = []

From 42c17d207de8d6547ac311d511f429a833948cb4 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Thu, 23 Jan 2020 15:37:42 +0100
Subject: [PATCH 05/14] Authorize utf-8 to be set on Content-Type

related with #54
---
 src/https.ios.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index cd45551..220011a 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -138,10 +138,12 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
     try {
 
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
+      
+      let contentType = opts.headers['Content-Type'].substring(0, 16);
 
-      if (opts.headers && opts.headers['Content-Type'] === 'application/json') {
-        manager.requestSerializer = AFJSONRequestSerializer.serializer();
-        manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
+      if (opts.headers && contentType === 'application/json') {
+          manager.requestSerializer = AFJSONRequestSerializer.serializer();
+          manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
       } else {
         manager.requestSerializer = AFHTTPRequestSerializer.serializer();
         // manager.responseSerializer = AFXMLParserResponseSerializer.serializer()

From aa1a00f0fe1c6eda9427c2650ae1db679ffe2854 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Thu, 23 Jan 2020 15:42:49 +0100
Subject: [PATCH 06/14] Update https.ios.ts

---
 src/https.ios.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index 220011a..e24004a 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -136,11 +136,8 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError)
 export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsResponse> {
   return new Promise((resolve, reject) => {
     try {
-
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
-      
       let contentType = opts.headers['Content-Type'].substring(0, 16);
-
       if (opts.headers && contentType === 'application/json') {
           manager.requestSerializer = AFJSONRequestSerializer.serializer();
           manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);

From 1961e5e8bbbb67f8ea6ad8e9b6f76f4b50f68a22 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Thu, 23 Jan 2020 15:52:49 +0100
Subject: [PATCH 07/14] Update https.ios.ts

---
 src/https.ios.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index e24004a..867540b 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -137,7 +137,8 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
   return new Promise((resolve, reject) => {
     try {
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
-      let contentType = opts.headers['Content-Type'].substring(0, 16);
+      
+      let contentType = (<string>opts.headers['Content-Type']).substring(0, 16);
       if (opts.headers && contentType === 'application/json') {
           manager.requestSerializer = AFJSONRequestSerializer.serializer();
           manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);

From efecf79d5cb7b70982dd4fe2e6387172db365afb Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Thu, 23 Jan 2020 16:01:08 +0100
Subject: [PATCH 08/14] Update https.ios.ts

---
 src/https.ios.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index 867540b..03b40c8 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -137,8 +137,7 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
   return new Promise((resolve, reject) => {
     try {
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
-      
-      let contentType = (<string>opts.headers['Content-Type']).substring(0, 16);
+      const contentType = (<string>opts.headers['Content-Type']).substring(0, 16);
       if (opts.headers && contentType === 'application/json') {
           manager.requestSerializer = AFJSONRequestSerializer.serializer();
           manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);

From e77b9b2d9a6e0844a200f9af65e0e425beed6af5 Mon Sep 17 00:00:00 2001
From: "kefah@Cocarz" <kefah.bader@gmail.com>
Date: Thu, 6 Feb 2020 22:02:33 +0100
Subject: [PATCH 09/14] Fix issue about utf-8 and data.class() return undefined

---
 demo/app/main-page.ts  | 17 +++++++++++++++++
 demo/app/main-page.xml |  1 +
 src/https.ios.ts       |  5 +++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index 3944f11..9405437 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -42,6 +42,23 @@ export function postHttpbin() {
   postRequest('https://httpbin.org/post', {"foo": "bar", "baz": undefined, "plaz": null});
 }
 
+export function postHttpbinWithUTF8() {
+    Https.request(
+        {
+          url: 'https://httpbin.org/post',
+          method: 'POST',
+          body: {"foo": "bar", "baz": undefined, "plaz": null},
+          headers: {
+              'Content-Type': "application/json; charset=utf-8"
+          }
+        })
+        .then(response => console.log('Https.request response', response))
+        .catch(error => {
+          console.error('Https.request error', error);
+          dialogs.alert(error);
+        });
+  }  
+
 export function getHttpbin() {
   getRequest('https://httpbin.org/get');
 }
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 7ccb009..25c7df0 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -9,6 +9,7 @@
         <Button text="GET Httpbin" tap="getHttpbin" class="t-20 btn btn-primary btn-active"/>
         <Button text="GET Httpbin (large response)" tap="getHttpbinLargeResponse" class="t-20 btn btn-primary btn-active"/>
         <Button text="POST Httpbin " tap="postHttpbin" class="t-20 btn btn-primary btn-active"/>
+        <Button text="POST Httpbin UTF-8" tap="postHttpbinWithUTF8" class="t-20 btn btn-primary btn-active"/>
         <Button text="Httpbin Pinning ON" tap="enableSSLPinning" class="t-20 btn btn-primary btn-active"/>
         <Button text="Httpbin Pinning ON, expired cert" tap="enableSSLPinningExpired" class="t-20 btn btn-primary btn-active"/>
         <Button text="Httpbin Pinning OFF" tap="disableSSLPinning" class="t-20 btn btn-primary btn-active"/>
diff --git a/src/https.ios.ts b/src/https.ios.ts
index 03b40c8..c6012bd 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -137,8 +137,9 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
   return new Promise((resolve, reject) => {
     try {
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
-      const contentType = (<string>opts.headers['Content-Type']).substring(0, 16);
-      if (opts.headers && contentType === 'application/json') {
+      //const contentType = (<any>opts.headers['Content-Type']).substring(0, 16);
+      if (opts.headers && (<any>opts.headers['Content-Type']).substring(0, 16) === 'application/json') {
+          console.log(opts.headers['Content-Type'])
           manager.requestSerializer = AFJSONRequestSerializer.serializer();
           manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
       } else {

From 83d2aac037b36dab692959f2a4819ade939374be Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Thu, 6 Feb 2020 22:24:32 +0100
Subject: [PATCH 10/14] Clean up

---
 src/https.ios.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/https.ios.ts b/src/https.ios.ts
index c6012bd..1783c13 100644
--- a/src/https.ios.ts
+++ b/src/https.ios.ts
@@ -137,9 +137,7 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
   return new Promise((resolve, reject) => {
     try {
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
-      //const contentType = (<any>opts.headers['Content-Type']).substring(0, 16);
       if (opts.headers && (<any>opts.headers['Content-Type']).substring(0, 16) === 'application/json') {
-          console.log(opts.headers['Content-Type'])
           manager.requestSerializer = AFJSONRequestSerializer.serializer();
           manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
       } else {

From 7874cc95c83ac41d96cfafbc19b72dc34900b9bd Mon Sep 17 00:00:00 2001
From: "kefah@Cocarz" <kefah.bader@gmail.com>
Date: Sat, 8 Feb 2020 11:25:32 +0100
Subject: [PATCH 11/14] Add Wildcard verification support

---
 demo/app/assets/httpbin.org.cer | Bin 1393 -> 1394 bytes
 src/https.android.ts            |  21 +++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/demo/app/assets/httpbin.org.cer b/demo/app/assets/httpbin.org.cer
index b2b0c26c417e32f158c82dd1c400d6ba0edcd3af..8ba123fbcfdfae8d3b54c7c39a5365dd71db3038 100644
GIT binary patch
delta 908
zcmV;719SZG3i1jcFoFecFoFbDpaTK{0s;^Vt5)?d$@d}1!(04V>C8NlA6peNFfcJO
zI503UFfcG$7Y#BoFfuVXk&i%sq+Dkj`j{C<rQdBooe?(kQGn@S4p#;~Hko_$0yE>5
z$6d@#yW-w3ONIve<=9J{aRNqOkeKu90?brqa3*Xr)bml;`bYE|Ssu<7H~MF+H3A}>
zan9l@R8$xHRs!k^uU7gm--&z)2?0X)<yCwB@+|a*e7Ryngg|z|POC+KlfKyyZyaMg
zq2Nt*t$&%Tq>Qszn4hV|DeJKm%!hYJP%K&FxOP#PW7#EwK2^R*%NR7z$&o~7%`CK*
z3ctdIUNe|Doa$D(SkBhR3DJ~WM{+*go8A~lcd-b(d!gi5TS%B`C59^3#82(>p^x*c
zK3%*g01^x@U7^#{H<>aIY7+tj0RRD`f&zvxf&zk*+yN{UO-I)o+B)U?&@n*D&NbFl
zxybLOvm63F0e=Jr3M&Qy1Oe800t5mCf%OD|@&NDvb^z{6y|;DFV7lQ#X&<ZMo@S#D
zeqXS1*n<GXdx?6e{mTFV0dKZK5?cTO1Oos^Fhv3(0D%C4c(ee4t<mrYhG!Uolgoeo
z7aN)MVkjO5*X0=AeF7kPc0R|t7D8eYg>b6{Cu(^%7k{qIP;p^8W{@&N7c6x}0CoU}
zb-(9XeE5t*nP0v0ZvR$|M^-lfO0{6YwCev}po0$p00D2dLK3O~00aX7M=(VKAP~%A
zDYmd*9v+poXTS18Sz=EHyde~$iO^m3l}N$vrUD@V>@&_yq+oOR2i)w)87sPUww`;D
ze_<IW3xCw&k!Y4oFE9-T2`Yw2hW8Bt0Sg5H1A+ko0D=TX1{$q=qXvk!$~bH7WaDnb
z%S}X-6;if;>YS3`$$o|XZEa62C~td|d|7A+2JRkZjFb&8fz5T&S8O0Q#{e(X<i>``
z{M`qLj$#_pZX?H4BEeEb!M!15bN8?5sTUJ7K7U4(h(NlqcWEDzGJF7H%FP6EzOJYg
zz}08c9had}Ufo=4S7b0ueq_uX2K<|~_^4`<`#$&cH&U`-sPV9h%LmbK2Z4p5DN+)U
z-L8wCQGv17Kz0LPOPGLSx``7p9C=PhTh6H%1iev(<_`jJt;Ei_ttp}852oMJnbH&S
iI~{T|m(Boqm+pLa!(1U+Jz@d_;}!->s#<#6C|q&1)Q-jg

delta 907
zcmV;619bfI3h@dbFoFebFoFbCpaTK{0s;^Q3|&6-&@T1CtO<^@4mqolA6peMIWRIY
zH!v_TFfcG$7Y#BnFf%bXk&i%stk1k`vkQP`jbv&JEr^s6_BL0_j5uyvP#e)PJP1^?
zE>|C2VVrMm{6W#Bc@L1U_VCA11{IxVnd5kkZ6#`gJn>fBkpi$xXy7wlWye715Ww5n
z@)s<O0eqs3ViJ5kxX^Ug9Xi*r%NO}Q9A?&&;%0dmEuQ2R;xVG~UQ1hl*Xd?kwS-sc
zrDFj~CgL+~Ya!1fpbndV8HLsM0&B|kvQQXel27w=S}N>I@jU1oTVV$Rb{<-7D_jZ3
zKJFv!jHfH6b)A`=9;%3j>QFJBqw2ANsrqwk&im6E2fDb|Ve((>AOnI+6lox{`d>iN
z-F_abRq|Cm?$nngKrhe_@4Es60RRD`f&zswf&zh)+yN{U&gKUj33mr}6E_kVWBe>u
zZ~DPVvm63F0e=Gq3M&Qy1Oe800t5mCf%F7{@c{1tb^xTg36QiHSQLl56Qay#a0)y%
zm<0J7-?-y<%?`*7+z<c&0ciaJK5zg41Oos^Fhv3(0L2f<bVZ3Yz4wpYQen}+^Ji(o
zEzK~!|HNrk-t2SWtpXq~ODYVcuy6Q05d(MS!*k(6{(t_WOh>5CDie(X0=7qS0CfOw
zQ+BK|@G%+KnE<3w75{e?91+<9!2l@+jj{-uH`x;a00C(I0YAV100aX7MleJIAW^%>
zce{`Mzab?fby(dh1YPGxjg>o<YwT?1luVRyJOUsdg@4I3ui9%YIJZXYd|ysF^|1CY
zB3P0;#D663D6DvZFbxI?Duzgg_YDC73k3iJf&l>lQ4>d6qhPWP*Z3&^0mnKh^5731
zyGv9UQltL8j9q@hYyFVT2<(-CScwhv%D*9#CtDY6u$VS0KK~QuETinXf1q)z$p=Ep
zTgfL@P1!dAc2y%q6d{A{GJtE1sZuc^=Nj7UgMa<IDMJWIYo9jbj|(8hA)v1E7l!Q;
zh?H7r14Ave-y{{?5U7&sg@56z%=z`;%atRPMDDQXIQv;{8*^L<MMIVQ0I<FELUKFv
z$h$XqNagLP+Hh=%zVgDDCw<I&X7O#;dneGsmpQI#k(B$uJvY`~cHiNc$ZjA<=VZyP
hfgJtAdZ1{P&X<9PA;~Lm6ftU2d-VVegFmgM*{Fg4jnx1E

diff --git a/src/https.android.ts b/src/https.android.ts
index 492a751..26ac1e3 100644
--- a/src/https.android.ts
+++ b/src/https.android.ts
@@ -44,6 +44,9 @@ export function enableSSLPinning(options: Https.HttpsSSLPinningOptions) {
     peer.host = options.host;
     peer.commonName = options.commonName || options.host;
     peer.certificate = certificate;
+    if (options.commonName) {
+        peer.commonName = options.commonName;
+    }
     if (options.allowInvalidCertificates === true) {
       peer.allowInvalidCertificates = true;
     }
@@ -128,12 +131,18 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt
             verify: (hostname: string, session: javax.net.ssl.SSLSession): boolean => {
               let pp = session.getPeerPrincipal().getName();
               let hv = javax.net.ssl.HttpsURLConnection.getDefaultHostnameVerifier();
-              return (
-                  hv.verify(peer.host, session) &&
-                  peer.host === hostname &&
-                  peer.host === session.getPeerHost() &&
-                  pp.indexOf(peer.commonName) !== -1
-              );
+              if(peer.commonName && peer.commonName[0] === "*") {
+                return (hv.verify(peer.host, session) &&
+                    hostname.indexOf(peer.host) > -1 &&
+                    hostname.indexOf(session.getPeerHost()) > -1 &&
+                    pp.indexOf(peer.commonName) !== -1);
+                }
+                else {
+                    return (hv.verify(peer.host, session) &&
+                        peer.host === hostname &&
+                        peer.host === session.getPeerHost() &&
+                        pp.indexOf(peer.host) !== -1);
+                }
             },
           }));
         } catch (error) {

From a517822b1b7b3f4c742dcf6529ed6be73918e3dc Mon Sep 17 00:00:00 2001
From: "kefah@Cocarz" <kefah.bader@gmail.com>
Date: Sat, 8 Feb 2020 11:31:51 +0100
Subject: [PATCH 12/14] Clean up

---
 .gitignore            | 1 +
 demo/app/main-page.ts | 4 ++--
 src/https.android.ts  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c1632f..3fb9940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .vscode
 .idea
 .DS_Store
+*.history
 *.esm.json
 *.js
 *.js.map
diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index 9405437..3d7d160 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -57,7 +57,7 @@ export function postHttpbinWithUTF8() {
           console.error('Https.request error', error);
           dialogs.alert(error);
         });
-  }  
+  }
 
 export function getHttpbin() {
   getRequest('https://httpbin.org/get');
@@ -80,7 +80,7 @@ export function enableSSLPinning(args: Observable.EventData) {
 
 export function enableSSLPinningExpired(args: Observable.EventData) {
   let dir = fs.knownFolders.currentApp().getFolder('assets');
-  let certificate = dir.getFile('httpbin.org.expired.cer').path;
+  let certificate = dir.getFile('httpbin.org.cer').path;
   Https.enableSSLPinning({host: 'httpbin.org', certificate});
   console.log('enabled');
 }
diff --git a/src/https.android.ts b/src/https.android.ts
index 26ac1e3..04f9e51 100644
--- a/src/https.android.ts
+++ b/src/https.android.ts
@@ -131,7 +131,7 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt
             verify: (hostname: string, session: javax.net.ssl.SSLSession): boolean => {
               let pp = session.getPeerPrincipal().getName();
               let hv = javax.net.ssl.HttpsURLConnection.getDefaultHostnameVerifier();
-              if(peer.commonName && peer.commonName[0] === "*") {
+              if (peer.commonName && peer.commonName[0] === "*") {
                 return (hv.verify(peer.host, session) &&
                     hostname.indexOf(peer.host) > -1 &&
                     hostname.indexOf(session.getPeerHost()) > -1 &&

From 33906c2209befd31c7387f6dacbe454b8e2889c3 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Sat, 8 Feb 2020 11:56:24 +0100
Subject: [PATCH 13/14] Update main-page.ts

---
 demo/app/main-page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index 3d7d160..0f26010 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -80,7 +80,7 @@ export function enableSSLPinning(args: Observable.EventData) {
 
 export function enableSSLPinningExpired(args: Observable.EventData) {
   let dir = fs.knownFolders.currentApp().getFolder('assets');
-  let certificate = dir.getFile('httpbin.org.cer').path;
+  let certificate = dir.getFile('httpbin.org.expired.cer').path;
   Https.enableSSLPinning({host: 'httpbin.org', certificate});
   console.log('enabled');
 }

From bdffe11be87d84b767fdacb195a3aac160202cd7 Mon Sep 17 00:00:00 2001
From: kefahB <kefah.bader@gmail.com>
Date: Wed, 12 Feb 2020 11:47:22 +0100
Subject: [PATCH 14/14] Fix redundant declaration

---
 src/https.android.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/https.android.ts b/src/https.android.ts
index 04f9e51..ace54cb 100644
--- a/src/https.android.ts
+++ b/src/https.android.ts
@@ -44,9 +44,6 @@ export function enableSSLPinning(options: Https.HttpsSSLPinningOptions) {
     peer.host = options.host;
     peer.commonName = options.commonName || options.host;
     peer.certificate = certificate;
-    if (options.commonName) {
-        peer.commonName = options.commonName;
-    }
     if (options.allowInvalidCertificates === true) {
       peer.allowInvalidCertificates = true;
     }