From 1372c710a4cef86fe2fce32d316639a54c02609a Mon Sep 17 00:00:00 2001
From: giuseppeg88 <giuseppeg88@gmail.com>
Date: Thu, 23 Dec 2021 20:56:11 +0100
Subject: [PATCH] =?UTF-8?q?Prepare=20App=20for=20ISRG=20Let=E2=80=99s=20En?=
 =?UTF-8?q?crypt=20Expiry=20of=20=E2=80=9CDST=20Root=20CA=20X3=E2=80=9D=20?=
 =?UTF-8?q?Cross-Signature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                 |   1 +
 app/src/main/res/raw/isrg-root-x2.der            | Bin 0 -> 543 bytes
 app/src/main/res/raw/isrgrootx1.der              | Bin 0 -> 1391 bytes
 app/src/main/res/xml/network_security_config.xml |  11 +++++++++++
 4 files changed, 12 insertions(+)
 create mode 100644 app/src/main/res/raw/isrg-root-x2.der
 create mode 100644 app/src/main/res/raw/isrgrootx1.der
 create mode 100644 app/src/main/res/xml/network_security_config.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 023abe41..631f8e61 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,7 @@
             android:allowBackup="true"
             android:fullBackupContent="true"
             android:largeHeap="true"
+            android:networkSecurityConfig="@xml/network_security_config"
             tools:ignore="GoogleAppIndexingWarning"
             tools:targetApi="q">
         
diff --git a/app/src/main/res/raw/isrg-root-x2.der b/app/src/main/res/raw/isrg-root-x2.der
new file mode 100644
index 0000000000000000000000000000000000000000..0f5f95fee95053be45dfff48e6913b0f896b211e
GIT binary patch
literal 543
zcmXqLVv;s!VqCa@nTe5!Nx<>a+>1r8-Ysu9sFU+jzdgu+i;Y98&EuRc3p2BUzah5)
zCmVAp3!5-gXt1HCfjWr8C9L3?SCU$kms+9_oSIx(lvz@#5R_V+npl*aq2OMWUs_-&
zY9I_!$}G&|864!U5R{)^q7Y$ZAScdiWME)vU}69UQR2KnmZhP&p&5uDMSTm)3<TKN
z!Tw=lWMkECWMNQZPGVp=JNxSVhGwoeoL-;ByzFAmm#?{(&dMvxzU_|K@2GB(+m8wp
zj_h)sD%jcgitYY)EisuTJC7bUdcgcZu1Uh8`?~85uB^Og4CTL>0&A6SaOKU4F2Dcb
zm*X4DJEf;G*m>k%Ep{?+FyI4*fGj^F<9`+wU|6#m@PqimAU>-BGmtWn1qtx6h_Q&&
zI89r3&)dWL*Q6iwdd}x|uPid3iX0Qn84L!gOa|4Jer^FRhg{m-q+JXCN6ftU<?oV9
zq01C>ORkyhaa<e_&!`@@WuJN}+j=3r(iy#fm<$=Zzn14*Igz^R0k_UOk-6&TOMV6~
i4Sb^6eEr7+!)T}ZTwnjKW5{^k<H^4*KRR0U({lihI<*b}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/raw/isrgrootx1.der b/app/src/main/res/raw/isrgrootx1.der
new file mode 100644
index 0000000000000000000000000000000000000000..9d2132e7f1e352fabac7eafb231488b5da91ffb2
GIT binary patch
literal 1391
zcmXqLV$C*aVh&!w%*4pVB*@StaDKxjhsTjF$q#lXH+3@@@Un4gwRyCC=VfH%W@Rw&
zH{>?pWMd9xVH0Kw4K~y?PzQ0igcUsVN>YpRQcDzqQ<F=JGD|8If>Mi96N{2F6x@sQ
zOA8D|4TM2TnT2^ggM-`^g7WiA6e0`_<ivRmO%2QpObiVTOpGm}#CeU8xzx9?iAf3B
zQ;e((%uP)E3<gb1Tue<&j0|gEs1$z@G5<V!o_4r~O#8k&+wWUU=*hEr7QUe3d+DJ?
z|GsABePi&~xP339Eyrc@wvEYuMTD~V%U^nBI9svqqOr{`kFR$t?{D7mU+AOaEboI|
zZH1X$X=yqAbv6b2*J>)UeSUJ_S;M+V-u>HW)=goaf7yL{%}fvF;1?F_{JHX*^)7mb
z_cWAjyQP1@qPLp4KvBB%lYz~z{&jb6C9i%h=6|S9(7WzD_ly5q%k{o&s`h%|Bc#ex
z(95j3;9;=J8{wPpB=-w!_Uf_kT$~tqZ%sS<lrPDJZ}cAJN6%<{*coF|nN#-OdO}j=
zv)fB%>8l;RAn=gy-c5l%vESRjulRoaDHHpQelw1#&mWmj<25Ut_nWV1qwMTG%s)L@
zZ#3Rz-J*5P@#PxEvZ-ABH|}5ED<p5KuOXguX~w}7oGImb?&iDBt%;1wm|I_Tt@9|G
zqo!S?-Ceb>DklY(M=kbokat@+bL(=ez`Qo=d9_8$g;*;h-`WLMh;lRc_g>Iv-DFqo
zCF5PpD)i^rs|NwXHO`YuHlHea-Y3t<alzn9bfMW6_FV@J3}QUCH(AeER-4eZXt8F~
znO%FES)>;=GdnK4#`;nE(6$dNYTB&bR(NQ2+$oz?wqHJLsjX!HYm3h*_fBZ@a%uek
ze*2NA(-ox)>ah<i|4BSA=veFb>}I#svAgPldH?sMd^L9VXJTe#U|j5E;9$T9Os}&1
zjEw(TSb({M&43@o7Y6ZJ4VZzHfh<UXk420{q;gB-v+8Y6pD-3TaCDrIium?&b{=vn
z17;myDq~~_m5*4tXVZ#+3p^WdNM$OhYjUhfERE^P`_c3?Q~&C>Fz=l^iUlGsD^9O_
z?o;@C)1`#9mMgeli7SS+ehlD?e0}ag<jY+rMc=p0?Qd!L_T=Tn33tS2CrP`0NSk`8
zCjZbY>-X~KPhVT7{&D4o6YKug*3J5*#Pa(8&H7gpwUsuC^Ywq~GKr43@rUtb$j%*V
zXSzC!JAHIpY?|)Bn-<QxOK11@BioPrSvT!7JfT!vJn7=0h9#Dk0>;WsJ~s2)HigcR
z-KW{sqcnToqipMNtEK|qJDkTmPjj*R=DdjQJNf?H>f^h&YWulf^SYpR=4sI>j;y6q
zAB!&hzU1vmo%p4{|F6+t(%W~vdiUeP>Iq_(+2h=TYs}f5dM+QCHs|Whty&MJN;P<_
z^RZ+<cgB55&{XYRJASXdWE@=kRMt25>cWl3o${YKsGG(t*4WP8`@Gk9!gJ;MzXRq}
z=D1zmBD#56Ufpb-X;wRebnUN2Km5&csO6u^ip8C`)?_`D(Av1dIWhXO{2lAwvQN4%
zdQ0z%8|T;t|E@mm82|syq6>)@52x)|6WeWmz4WT_ftiBq<~klMDs9=v<meQiuHrG}
z;%xPO?Dji%_&1gWKCIgQcCPZHeGjf`un5~2GS9nPmD7KWUE)~%J@-C)jd?6==a+_<
hl<$4hIs2u!^Zn@C@&Eed!WW%&m|K^mbnBjkIsk}=Sg-&9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..4d64d941
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="@raw/isrg_root_x2" />
+            <certificates src="@raw/isrg_root_x1" />
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>