From aa31abd93f568045d601df2507b228ec71e97926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 10 Jun 2015 19:47:29 +0200 Subject: [PATCH] Allow debug build besides release build --- OpenKeychain/build.gradle | 24 ++++++++++++++++++ .../debug/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 6863 bytes .../debug/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 4609 bytes .../debug/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 8887 bytes .../debug/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 13422 bytes .../res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 16655 bytes OpenKeychain/src/main/AndroidManifest.xml | 10 ++++---- .../keychain/Constants.java | 9 ++++--- .../keychain/KeychainApplication.java | 4 +-- .../keychain/provider/KeychainContract.java | 2 +- .../provider/TemporaryStorageProvider.java | 3 ++- .../src/main/res/xml/account_desc.xml | 2 +- .../src/main/res/xml/sync_adapter_desc.xml | 2 +- 13 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 OpenKeychain/src/debug/res/drawable-hdpi/ic_launcher.png create mode 100644 OpenKeychain/src/debug/res/drawable-mdpi/ic_launcher.png create mode 100644 OpenKeychain/src/debug/res/drawable-xhdpi/ic_launcher.png create mode 100644 OpenKeychain/src/debug/res/drawable-xxhdpi/ic_launcher.png create mode 100644 OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_launcher.png diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index a4caa1fe7..88480966e 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -111,6 +111,30 @@ android { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + + // Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE. + buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.account\"" + buildConfigField "String", "PROVIDER_AUTHORITY", "\"org.sufficientlysecure.keychain.provider\"" + buildConfigField "String", "TEMPSTORAGE_AUTHORITY", "\"org.sufficientlysecure.keychain.tempstorage\"" + + // Reference them in .xml files. + resValue "string", "account_type", "org.sufficientlysecure.keychain.account" + resValue "string", "provider_authority", "org.sufficientlysecure.keychain.provider" + resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.tempstorage" + } + + debug { + applicationIdSuffix ".debug" + + // Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE. + buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.debug.account\"" + buildConfigField "String", "PROVIDER_AUTHORITY", "\"org.sufficientlysecure.keychain.debug.provider\"" + buildConfigField "String", "TEMPSTORAGE_AUTHORITY", "\"org.sufficientlysecure.keychain.debug.tempstorage\"" + + // Reference them in .xml files. + resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" + resValue "string", "provider_authority", "org.sufficientlysecure.keychain.debug.provider" + resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.debug.tempstorage" } } diff --git a/OpenKeychain/src/debug/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/debug/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5104aec167275173c6d2ded4bb41e6a9b8d86f GIT binary patch literal 6863 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 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/debug/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/debug/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e709f735d4a1913482736bbb0a8324c5d03a7e53 GIT binary patch literal 4609 zcmaJ_c{r497axg~HQ5pwLs>Frvra>dG04s+6g6fBgE5R5#!@I5DSH%=BukqtA?wIn zF(jgpwX&y>l5F`#Z@u69$9H|tbv@60?)&=v&hMOapYzXi(ay$9c$e%h001CtVUBU& zuF$PlfS>z4zHNoYUG~yVo#~ELPkIQRMgkZUsU9St1qJU#av0jdK9>cBK%2rXS*T@4@{3WGwRa0m^a3mB8{QZEqYBZuJ z(gB10t;O9LfV}DS03-ww5)z^rg3zSWydW@ref=#Ta5$KY00)Ko)A3BOe~{824;WGq zfkqCXld1l|EsuB)DuZqS;zs&+3X}kA>wg^k2mLM-w`33|J^%vKghD8kt-OArgXj*V z|Az5D(LuP-020K36hvjv2;BSdRQf~a*6#lc{Q(jQ|KI``G{0YY5(yBJABjTprw4I^ zg8hn!8#xj~B`~&5EieWku7D?T4)RmW2~pGXQ~B7>lnij zTRK}@3;!TG-k(7F!zKThtM`AoND~?fPp8swRI1;fo3`-tV+7G@TgN~XNA0ch|E+={ z(a6ChB9=y_0DsjFN&c5EgTWPr5{M)sL01P%AQ2H@Es~xtSP!m60uyz#V4hkYL=S=v z4D_2!{8z%i$lBaQJv^W~U?_>G4c5{jdVuxxbf92_4$%|pp-+Gj@OmH!Hyk1XNhj0& zNWWXl*pL3(@*{6uFVYY1@5L=5m`L)(GyLcv!(bADn+-UKMgV&FF-R!LR{!{sxvXE- z-wq)Ea{KG}Uk&#M$?f7T^PlnIZvGiSl0SFqXx#A{Oe|gFj{Ii}j4_TmQ17}kKyD)a zY@`Ch;3_s%8>w+(F}f725Vhw89<9%MQ6m^5fzP?CoP0Z@;~1Kh)|PrNeplk1wn70X z3ny`!(UZA@(RLbQb8<|@cm4fQwl0eUi4!KNB#WT$!wsXenJH$A-Wn&8*&owU1_qJr zdHK=sd8**(GI_Wqx5)M0&ALZ(@z~Ygt5S|7?^35im19&R9~c=<*Uo_x$4-(5U-JDh zjGcG05LZf7X5Uj?y!2yT>jp!7IfXJ96Rz?-4oeI>GplE?&;?LSway^n=8k+0TaKI; z+JAOLP;{nLW7cpOYIvaa0;pTcsc`iDrQINf5GEJ+@a5FBO8Kp!{JS4RzFaq(F*w;4 zs{S&vL{;M3rW8@rT)R~?S8rx>!Inx4d3M^GP0#(z)T(wV5WOG&pp}^OP?A1|2Qjo! zfug~%Hf)CS$k%y+rmySTi4>IN&bKco*;2jKP?hDQ$l30?@TCA%WpSgMUnq&Q(yk6Z z{!5F~b1C*~6`TD%3;oZAKa}~sykzt~GT1;NT+-xq`NrN09ico%S;-*5cq~a>#{ZJK zK3k3>JD}8=IJ~szn`x&xZ*VQH-E!aTMDWmHRBlZCjaw0h^CIj;SI;JBgIoCOi>Z>$ zfMNM+_t6DsXGyc=rK$PBas!j=)t3p8FZnK7jhzA9yl`M(FgJh4*|XRD*<~y3gCU6} z%(>37mf%mCL;I2}EFFTb0B+Cc@}Lg1dl+k|_r7a9ky1Un+A(id?W$A2F3p=6eaDf; zZ%~jZvFC{7Z}UkzBuu+F_SfA9A{GaJn!K$GUXp4J+W5YTthxK4C(K^4Qc>;UnZU1) z*>j6A0dkRJvxD6sK3Vin5oyj@c!6h5rV)Kr>!Y9Nz*;_v7d`AlvGKNiii#z2gVK>B zsrd&k5oY(Lwkf#vu_rdRmjV`*#}5mzoH1!Hufy6bo%og%;Hu*G#lCprMRKU^=}u~{ z=$&lgCV1uuAb5VeKIiqLKT@8syhrmN4 zyoHK=d&b8q7HoYrEH%z9Tot~r?f?{t&$$LoPFmP?K4&P=y=<20Gv)Vuc|E=3-9uN5-Q*Q(Bdk+{mp;;e z6k8}dWnn}b=Xr3`%>mA9K8jas>ZCqfFLkN_k2~FYdNJRm7rakleUL*x=6CezICZ*k zbE3p1*PpGqqX6z*k<-*B@mNmZE+uL|swosdaIV{hb&S!O$M;oxpgL0K{RD18?mI?L zcI~oqyYz~Hz5*WQRJcvR#L&QP`QrBa%?CMSn~cq*q!L-Z_gemsVMC!E=`ImPN+k#4 zz2Tf`FBHm3aLt&CVB{?o78dHiepMFtGk9F0gCct?$!%sVtWxKxnT;AJS!zY-q(EJ^ znxn}yXunlqkR-BQ_0wbgXf$eLDoup)Ska8{ExPq)X^Pq4h|YA*8JXaSbmS!G(Rbcm zS%@P7YNflr0Mm{Zc+Yef;8Z21-#s~Bui|#*jcp@LbicJspU=U2jkeJ^ zZ}s|U+Zhb;rvlz-X&vQGwIyDA-Kwx%gLUO}rV-23;I*JJhd*<&@|o%lZzCp$zWyT+ zNgFqZI+QP(c8ag6=W4S13%q_R?`8$Nbc!pzFKUxzmL7}}R6Nw_Zp;Th;hkrszrcV0 z!hQYVq1#iZ42=4gUlb+Xe~{0-zq`%CxcgS{&AH$r^a@rm}I_y-f!V5_pV6Y(70y-jrmH(*IBl(IyJ1zK_O61lhPzzYXFwM*2xsO zpJ~NpCiBi_c)CBO!WDaj6+|4}(CDG?N8xN^l~|#yzHG((xT|QW_rY~d=(JGllzEVuR0K*n42LeP8*-+m~@g2ZSSL3!0 zm&PcE$(J;_!%ES^K(k}_okctam6UVTTl7ZMZnoM8DNCMb?rl1eJmPBcyu%r(V()&{ zGH3FW^obj3;m_hFai?-I!h1!ES1)h-h-?9%r)urg(g7kS!F_VPfnGYc#N2fV`N0&d$ox&E+TjHj-=5Z^|F##%)c z>dfXUU-fM+p@mjtXKIgce**BEjhTIXB1RQ~E3o1(m0rX?V6_(nZ&u3V z+r}|~>67RgtM(In7|*-hTwm|bqejeZJF0vIfa!|NT$L)do1f{4Kbk2N^>F=GZzdL& z>4tN?ek0t;REb|KFSAUX?Ra`Z8sdIA=7DIF6*yzB(BXE-<(|Gx((VHv;8&_;nh1$X z5rTh-TN=t_KkkjYd*KsbD^-zpj5TI*~~n0l2_-3_U$+W0hJ$yXqoyf5|WaQm_DpBoJe$?lBX z^(8&S;r*Hl`MpX+7tNEnAts0+jP`LOIVY@0{`9^?oYd$1bHMsOBUz zC*64A6yK++6-bNs+3Qs^Us&NI>mR0$yB+Ilkh)RrX8UBL(xkY4f0PDmh?6l@dMD$- zx*L3N{wqiRhHpMMsu~F%&d2XmxEcEb-z)AvsFyI(4>NDE`PM_xh1|ZBq3cl!(LQ&r zO=kO{{TDIk#nh*zDyt9J_^$?scwrnj!#tpMvNr~jImELK!Jl1+q%#8%%TA+T9ZD!a zO~7~YmIu=q%BVR*gMpgPTOrGt(GDj|-E>9UYo6eH8ymGK>ytho-5qRatjeNwVFNIM z5f#}4{`1`leVV@L>EZN_z~Y3Y=m)FeVPWUWu9yVGvg$nK@`84>{XkUKwtbk1KI*Eq zJ9{%=8q@3`cJw`z{U$}#rKmd_n-CkzSe;z1>KWM};Btk&)L#m3eqtzeE(ne7^vJ4u zH_((MFDEw?xb)`u{K*IiQf-=k%p?tTUkmm=GJjv#4| zRF{x6i;X~Knitc3UT=?+e^eAA)MRu1w9=PWj=uezXN^r%rB&cWr3jL*teQ zj^TN(hbR)X+#bQ2hfVwPZw49O!{uf?wgIIT_?5^5d-=fNo z_k)fKfUz2efj&C&aY&}e_KWNp*5Olo>7PC8vi#_xZr@jO$kjuCn^YAJj)4F4@TFER?|*m7P}k z{*)ZNXcJQGZTm$(d<0T!xeu1?-ts-{!q|Fqpxawmg0h5fDpAcf9-NPRvp2?#P|eYeQA0ZY6T%Wx*Wb*&WKyxsPJfL*+xFZ816lJG>t{9K{l3%|clL#oCky@g zn^)|*e}q@GzWScT zX!zRds(*Y@ZoS{OthgAgGGgVB4h5k!ePGwLWYqxar>MDLwM7ee$Nql+MFbdn&V zB@v%Izw*9+eCs`HopYD9uj|@--({V9ofD&{qe@Q7ND2S|$ko-9^lwY6zc(@A?elY{ z7wooRz$hDIp19g#ysX`k0C|L~4HBg8Y;A|sM_MC%o{u7>006vd2Loe_v9^{3+|~J! z^;*iF4Ewmj&3l>0U-^3DxwY1c2h*!JE-}(BcJ%{ z7{Gm<;Nl3dtPDuXTjG|$8Huq5c{`(A&=TI#;D2}}ZtH)$1;C(xOfXK;;D0$~tgQ!9 zbah99L>@u-;Sf;>NL28VpfFTSOpFgC1QCP?K!gMYh4=-mFrOZbtiyPbfbxVZRV4k01_TMK@)j|;}yo8JY^@gD{y zBpUAS;D&KJt25}I{7E?cFI^9hTTuucfkeQ?MET)JgfKr82@~Uo z2|UjhFE77-SQ+1Nlt`5{Pz2tQO5VZ#rDi9+~=MG>|T z8*#WG+!_WJxOE2sm%un+P{@BzEqN5?-!+uO-{F-&S-aTXCXpY3w6*p?VZbt;Nce3u z{AhPL$Oh$sloI$me^3s$sDEnzA`tjrwEuMfuL<`b%iCG}xBB1ZbKCgu0z|spt~&SI z<+WL*C<*|umZ&Sq8+b2$F(=7oMy3aOV4ki?ORL(tbEl04FsM5!I&KfFJwRtW`mm*{tV42oKCvhTw_Wzo9^+lci;dJk#WSJ}o1>r}07E?S>6 z6HRzY)SV_8g7|xGbVbPE6#6Xsw5bBSxzNc|=eD(^U*>9`PR>4E8dabZYY&5m7cHpp z)hcES9hQP8H!n!scCX3nk$ynSxJxO*(zNGO1`HT~^H}G}^Eym7o%IXUNKe+tyP9P6 z0;TMbt)eLI_q3_Z>*X7N415#fCt{0@kKEtp_g{xyuFAmVMV|v9fkNN9s;dt~8u>C( zUhFs$y9j+NY10KiI3Hg2#wPs|lKQA<#mfcG7jSWSd|jRd*bC|aa{ZQ_ zlG0KEv}YyGMF?0b`O-Sj&)hA=r_NK_YfHgZ6H!B-{4Q&|!Pn=)l?SaxFV!=KT*`D^ zw2^PA0=7^Vi1$f)pS$x%5%|ND>qbc(H%h)*>u(iZ=!vdrd%yutMk}9ix$SqFqOO-KqZ{D91!rj$;LwDUx z2#TKhLnU+rei2yD%=2#hl-SbYP~Xze$%~Fcgtz{=W^P`t7SmM08R%&PT9+|DNSqK@ zc}lfu<-)TyXOl&L3&RAz#~d$BXsX?W0}of|O~NnmI2;;Or~&jd=JrPn zr(EiQq=6e(3Fl|mU*e`q1YC9dR>Mpr2p>VE2Pg|NycW+_U4^IKNMRW&QW~Q}vL~|n zWagkW-~39+%XLrWz9RO&o=yEjpKLFjgu&}x(NWQ(L1 zYdjHl#%=e4H2COj`R@f0=REt>;s%34IS`35?!F zr7Ziy{VGUZziIV!DLTlJ+sLekWBN+lb$D-noxPq~D(@M0s*vyDfAwuoBjEFguYwD| zKXT3;O==*LIM{I_L#{f-4@TM?FFbCOwxyOCR&!HC-5hTb72hRKwPERbq}```Bu<88 zzpKq53%-E9(#d2ke1|3II7oBboMxyfjoP@jOGggm!4;9cmQC!R47Jv#@GOT-{*dOV#4>hiA>Tn zB4pu!^$d(si&5Y$#QGPt<3Pd56a%*qz>eLy6xS@JXlq28kCIP!(GP-G-rHatr1F{) zN>*}mtRRK#G;dtjfdXpfe5tD_RIXG`0?~1#jW$AZ_meIF0vO44(9DXOEW-mT4V)fw zHOhsPi^^5w;>eh%Pqq3>$0Up*#N)QU38tzpX-2$T3pV`D`T^k2v_J7qsJC*}o0oW0 zVirLC{Cy}FRJk+0RNv%RhFbnKX^&WnO9YMEtOyNov7Up2V!4vGeAG5OkX{03>#mWkc9Qz9uqCI<7AJ%wUL;KRP= zoR*%x>X#IJx>(0{l6IX;w}7p*dtDm&PRpz}y2iK{?068$eHls9J+CK%%_UK%K0dry z2a`o8k(u=t$|e}RPY5X&R{}`(iBCPfS3bIAC&fC^r5kp4_<~#QlKD@McIsAV{vz+s z#-b^ZlRSH=NAgqLZ_Z=yRoXpMkG_r>WfVZmLr<9xr{-_Y_b0e1#2$#Xtt@}G$On1`1+V) zNdhvbWn6eHg$oWWJYWQiKYtf)B8VGV;CwicD<^8g)f|M5{Uhf_aNXP3L47h|7=1pS zf*;(t+(MxK3P(3R%3QX4D-GUhF4&Ti-&&$+4hwqex?`d_cCfa>y=L3qvK?y^eFaL! ze@HqMKut7T{v3kl4Qw-&7cK|m86q-!wW1wx3T? zPlaKb=DYn)dss$h7i^=G5DkK2YnIIIt@Isf)-_7usx5lWB7z8j9Q#5yJu78SQd(2r zE|xg-nDp$+`Y8d~$}^vd{g9vVuPOm{Sd8MHibrRb?M-quUy$Y#Szpnu_$b4F%urk1h z3K%BX9Db_6i51p%vVVzlO77h|@N zD6N+^fwU9Gxe;*_cQ$T#e^RmjY3HEWk2m_^l}v)sTpe_2#c)aUWYAR6DhvXSlhlOc zZ~)FqAS*p-DR4p@GEd-23lHUY-RN;S)o!7FrjLy_iAY~ zAmM1wAb+U-G%?una_(mWOI*;|+Sddiudm>h_)$El)&31WeL;!*6jPYJ7BXeD{zCvn zC!LeTb|RNVXV*h0D|CL|2zCmjG0H9W;6^Lwh|d|tN7t?!lNtGPzq74>BgS#Kt(sKk z`om|SE(ToJ`R?@-jfy6>uiJ)@B9-tl0cc^3FyTpQ?~vVTOEf7W)Sf$GhsZf>4r18D z9LI{SIGoH9CSur@-=Bo=J2^TkaKCCCwrn54UEdZ{I&O>mLR4&;YL?9%{duvyR$BBP z`L{d41O)fZ177%>K%+-fR5tq`ecrTuGbo5hYc)7Zsw63yj5G8+Rrf}{lB=N&=cuzz z;q);rOF4d1>@1oMY@!p@DOBV1B;S3}HYZ)UAav0^PWN9ee!i!;XX<`D_?8SLf)UwH0@FyLD z^XVj!ENC^i7iBbzN|$D?ZU?w_5$T=1Bzc&DJ9JV?9?+VSJbrQI5Ai!kVN3CnHOh`n zAK5!Ngm9=PLaf~Tt!9FobU#3FHw#aAEP=$O#okE|n-+oPiOYZV0idNUR}v1Y;L%N( z@f$T9A!TMSsZ$3f$Nq94%3oP!A6V$9g+CtID#;60;SwU0`bAA%Y!7jGHB_6^A&%~G zbaX7Ntxe2gO7(C3G>!^XR16cwDc#-092g31e3^xM+l1v@TWUde+&jkbEnt&VXTLP= z5HL7}hZ?nmA4*n@kdT&L+szZT!v5 znDA^s-0FSLXPEKMnF01k#a4yKp>Oxx`9C9S3A;;>mG|vsUR1sgFMYx4JB`9K;QHi5 z9>u8!P5p{MA$t8SXz0eL*RP(&@&M7$g(Jo&ODTc^J2e14ikxRu zh0@^3Xm7Y9gNVGW4(@1-h70S#Ma6p6?rO*#BkhQ*rZ6g!7(J5-MP;SX#aU_bp64q; zNWY#a&ebeu#X5Myy)^HoCL&;*QxMmwFuIyT(vyTr)3`r9BD~}td4x}5P8rkBH#U9K zzdK5reSNC{AoOEN5<`<@_L2)$INCF0>%-S!t4Vp91IIC|KYVQ1oc%BoxHOdtgh#+l z!APQ@m~POq+{REl^|!awL^L*umX$QDYd1J)Cx5^GD}MtBphc&4Y*3mbuK)o8qOV%Y zaD(5!OB+7m`|@Q>H93p-PDyh{halN@QIR;_?Z&tMR$FQbbGMrJ845q{a}aJQ7?_mf zADoCy#2arbs-N|78;WM1Pa|G%pds@{XAq18XEZrM_Tnqt3h6{#aw&U&9k`~{`;^|| zmBddBrdtiBsH_c@g4H*@VaqlO4ELQI-%ayrDkASp0?ATPnC2+l&@ zReO+`&-T(tNh>;B8#5H4y;R@Jmb9cQQ9>z7_Bw=moS`r(I(&4<3AN`6(l&WsO|K*m zCx0@blF$itnB1kgS7aSBOXnkKv3nwwjx6eb+{3YP;zL#$e=mamz&Nn?=?0sw7u^#5 z8J?VpdY|sY=BP%h!I7WA9NN(Pk{+qV^!Z^XJSqwX-4(}%Mj`1el?ln`nsjaJsfL#p zq9oO%{ci;0Lf4rFGLI{va_0v^PN$4*-_vI`7Gf23Dz);qlol4nm;U55 zy+WB{u8+pVmzJJHsG7Z^9WLC)6;i}m52!b)V034dyI7&!HEzX=&-O{Z)(nI(N4`bx z+WgoF!LNB(MvAR}txQC|0*e%QVbfl6S{FD)Xg%Tsply(VGY@_5t9**9`rYAorphE_ zFXBxi&p?_H-cxItB#EndLQLN)%5GW45uz{rgNoDGetgsZ+Dzg{C;cXbh4)6iGIg!= zIF2@kbg(@HRF{32RXICn#-Hr@!X}!CpgA_cR`1$FL-EkYPmv{HvwSP4V+h9;!n4wA z!~vcn?6A-zka*M)vUw+sInOtdtZCK8VPia|bK_U5eniP!PEfr`kG&eAPPJz1$#A%E zp)MXQiZQXL;}_Z7=e`O~>pfqxPPys%5;4FC5i_qkZ&GtK74TsYy%jiu{ zJ{-5)uSohpdFPP8;n89c{yL;f>KO`c;|gd7f8`krBSrNLhUfX2dmdGYJ8~9a6XBz(uWz>N#r0@orN+m@gk}SngL-w|YkZE^_MdQ; z?7XzXZNooRO#i)XUvU&#NU|7@^RzY#P&3ICHl4eq3bgwWbGu0c<~6#x@Pe^Zvt_>C zj$-0V_j}G)WJJYXph}W>Bncux3*k=P5QYg03zC@9d8gmH9vp^-`Mn>%mf;7#;Vujx zyPm-gb$2=U<>TRcOYcMrb+_7AByVXLk%{L2XmN7fXdb*9&E33NsNa~yC$UjM*wLmD z1ep3=p9|IpJP4R!G^suZoOl@*P5(<;**B@&Qd#%++j# zu3hTUk2|#dGR!MY6H7K-J}U;5d7Skl(Xp7u+@d2NDvqKrZUDJY1PXXe- z1SSrDqk|LJjZ@gENYtIdL^oPN!Z6^!Bq@tqWIU}gt(dJv12iR{33i})QkWy<#5iHA zU$;=+?)Ns_zqr=5tCtBK?80ZG0^7nFKkf~> zX2&@cD`z-WXTtAl#(I4Re8-!3e!$_;UPWXplO&@Ra((-?s9ZUDw&6{!{W+aF^$)f{ zJCfz^D^Ec8fbvuctTVdmJPrVUBN-rhVS;I`!{EtqQNd722xoWesUlJyVL@l%El%J^ zSy}I%MP&Qo?Lxf9LF&UT{lvxnxU09O$sJtO^GD*zRR_8>#K8u*nW@0^JA+J`)21mOP;`26tzFN;a#^fR~$b4w^ng=R|8qIaltzST7mHmK0Dn9;9Pk zEsiirCOy1;6wG&ZPhz_25%DGeuGQ`Aq9Q;^k9z2?Lkih*S;vSNJcs5^k zDNEoU9vxrY+z+!J)8_r+{O5ru*hzw3{wulf2$NOSuRLc&&;>6Zk`L*)*h&xiuL$}% zgA?M&vrUSLY;|6twZjv6k8w`>qteBruWqFx2{YBb;&ut}8ul3!)}P8=M!r^stdzt+ zX}PJ6cJj$#kmuopB>#h4^$eAg?;0zR{oyd%;vo|IRUKv3&dAooZ;0>JH8n)2Gyyum z!APkkdx;N%+atqQCKe)|y7xpzS3lHHeyW zqVAXi&RtQIW9X-&#qrWiDEmd@0J9BLy&4bqZit>*^g$-mTrkVX7d-fIVg&6&qxu=u zB9Dq9orjAqdrOQ;L6#3xR$g=UF55?4b2*e0vfj8&&4k}_4Zetgva{jy&TR|l$hqCW zIm=*~^>KD~t}`+)*h6?Sj}kehD4HH`z1qMJW<4cWe)$ys`-bo-HPsaG3J+8WOm{4r z13C6J2|#;Uyp9^_%-+x93#sBObU73u66E$YY4+aTp1=^dr%%y5zi)4;g@Q)upNxw$zOroN7Vb2iXUXHG`OPl*Y}A0}{3KbbH|dUhpyV4Kj)G$a;bqTB zmrp}?hC}3b_QL$?`wstL?+#vVZ*RZ9tJ94l}vKd;-SdDeM} zADieNwA<0UYCO6OwEFpDUv|(bk%11tOm!SNP5nTO+s2&U z8hYyDY7Q8LAzeWu_dln<2d3PIO;3NdPlWm1o;2&H=EIlSvc64nQz;UWil~3Dsjj9A zS18h@%pf^1@tA9ot)On89rgZbo?Sk~4{9sczB?JWekWXG_2Wo!NrJZ9r0aQQC5hvo z&NDie=|E7yl;uVWwG{sPGkou zQN9h*bs!4?UhT@Hvt#=gy(f;Z#|9r>-P=`Fy#fI_^eCb;9|-hb$Le$1L^y>NxhkSD zDXHoOhpAGQDji+=n75%iC zZ#xY;%`V)PxJFswDeBh=0QM26dKwuU&z98p`*ZeGB47QQ1TN5K&aQZec5S}F$pwOv z(435%?hu(&cB@{-tgzk|(Aznfo#eR6K zVFkGj+$tUz zI;)Y3rd=$=SLh&3H{NB+>!{MWOzvuT-G?!S$PF(JB+7&m5JBQ27j%yU_W;aZXy%U* z7U$$Y=v|F#^7jfe39mmR?rpzj)-7t5iC%qzW$54@N+b4Me9<7!aPVegb!|H5esc4Z z>G3!FS`SH2NKja%+0Sq4<5>aj+6i1d6UDx{eJ=CZx7L0pnRgfFw=eMp*}|8V3wbn( zLjp}f)dJdXjJQ;76jC<}#NkCj^i0<}6HBYj?>#F$Yx}%*$?z2{eQ>$pvBk}xdr`8u zg|LG9`E!wLBjr2^eOKh282~OoWSytWS5V^%id7HuOxw?KcWTh%l ztI)>& z7u$+IYY?44<(F7NPh`W+(W6OH!`IpE z1q}d*O8B~2T06qvKr5K7y^9#=yzM&(Xb%+w>GP{{sk+I)?Ccf%Jz(1YYC6{bj@Cj@ zkc2o;)K~b0finzl3G{V#a`6=Q6$AZ?ukcIxpK4AJ@LwcwM={WUDP^Fl0hDp|fC2eA zxY(_^1h{|#+#KAze1d|4Y(O3^ZZ1wP9!_o^c5XpoULIjCF5tfp(2Fz=sEx1|MDE|R zUY^82c5t|xFej&vj}M0rFNdp#Eho2-kkCIoczD=fDA+yyT;P_z>@J?P|KR|Ed0Kne zyTR>UU4Z{^w6t>df{TG(H2p6VoZVDa|C_Ok=f55G;xbNOOE*q#4lYh-=YQ<_7qur` z3-&*1{C}xEb^P35oLVqXS1%9im-eus{SWxXcmKDb{}4j0|C`Ru%fsnkc0#Q=VNNh- zmz`Uhh#2Ta00-0_DlE;z$0x)u#1H0{;o;_%<&%=*<&u_@ z6_l3a=91wS1pg!FAFQH_C*0D-8ulNo{r_P3{!gs1j0emT?&_iA>gx2LmR59f^74dx z{8J5-(dPfh{r@Ee0`su$g|0(`=_j!5v?+yra zdFgc?FWsx@6ln+m;4)H#Na^@4odjXzndoNS`Z=D?DNnB&eiM0A(mTNWOcx3?2Uxzs zNsAq?KuU~{?-B$*w1y;K#UUn#(()V?;jnDU5$QM+AVFz$i$FEZe7BVFF<*2-aQo5c;#n@YrPXTqn;lViow~OH85w{@+J-{a*8RI}S5y3hgj_sK~9A~;L@aS&>IW0oc#}Ix}i9dqzuKb zZW&ston)K58}^ohslci11GX04p;lQ6C_iS$t3KhD2ehx^h!hKTgUVYf=i(UPBR7a zE_d`qwpe0R6WBMG82~bwQ~$Cy_f!+QCR9KSWaejTFpILuie$b(K|>(ptO*Yq?h^yD zyn2~bx`%eT?p)+RE{}<)EI*Td(>P#-BRS2b%lzW+#Fpi``~&JV1={FPk^pT^`PO5~ z0tikZY27vb4FPR;ef#oj0$VM@1`XvtZ!q-sR}pzxW6p4#jpvayuiFPynGN?6+o2efOcY!*_QD> z_vrmn&(i`7e~OS_lC!uBChhhV440=u7WJVSyeA7L`7>tSak5tED~_0NO6Dsjx=j&; zo3H^I{_=t7m;!mc!YsL`R6WMhKM9$99Fwc(b}%FU5`RZQyESJZTAJ0}8LL9d5yIsp> z_R@5g+Q~z-E&uKWmK6en@R-F{dL6#~h()qxj^J=k<^%+7VYMlHG}@^|I0}x1;yS+@ zU)!JD1KHk-vy2eq_@Wb4_Eu`M^c%1FGrFHs-hPonl*RJmLx`EBEHe_Ve{F6%C3K?y z>v(oaJRfj4d(-&Le@YF)svVoR9vbwF4OH+wQQO{Z&lAT6HnDvsMAA*Y|2o$l4CN1g}m?V?9oM~CLwVX%B= zyhA8-@7m_3mXuPE zf0lJM)dk^OSn87jG}(Y{3H4vtXJ{JyzFh78JVw^2XPru)0qltS!4ZU zVmz_jgL;5M*mKOb3T;(wDlly}7e=IhkemM*8TZZvB$YR4(M8*_k^fxf{P%uD<3U0B zq5tsHG#PR-7&W^n6#=1ccf8{y40 zx!dF0oBG9Sp3aT|m}dU8m=hgjGAOzT#NE3do=qyj`R+{@r&qtOKA*>rEkBgKqF#)g zs5l(|E*_PAaIUFC`LMS-mWV{{sM|%K!g-NM78)Cn%1r&r;H~SS#)eFxANjaEo~h4R z;xTndea+Er$XRIbATh%{G!1QWFux^ZK$F%7k@@j>9=XUpx+_o#Jx^%Jy?!+W{QEa$ z+x9C-WUAn&O|*eNcETdQvCvgCEB(Odwixm2a|vNoc{QdD_sb2c3d&=?uzg_k!zv*s z!~jmKijKhu5p^-~84Qx=WT;8#Tks7UX!Kalsw7|a-0}Uj=`2D^+;VW}on$@x%8rL+ zV0kUM7^SLdU(3A-8A-Z#%WutmbEkFnM)jqMkdt<%`xPdDgx~NNzwTTaG{ZqCcWJP> z)tc_l`HFlXUoLFG+k^oELN0rqlBrWo!+)h7C=KvaGXTTWOy&FBWxN|i4s-)0?n#E(Y7l^7Ny6TJj(sjo z)6X#C0*^Vm&Mti&|qq!n5}Z>nN-q8<{A0 zb%f7kCw3j$pYTP87-u8q4M4CC!Bp(~c2Sk8Ov#_kMpc4K86S^ykSC?dMaeCirpT!K z(#hz4kSFc6caQo}v9KVM+E{PRS;z|L6(|9WLLqG=^RX_h3^qd!PK-BGG z+$H$#UR6h;n~w=_fIJXSA1N+eyS5zFm#K>MqHzJIIB@H~(+d#A1}6{BsXzf^4X_(J zU(}f>JUWLZ49yPLf-z-}R&7p``!Ct6fFUaOUD3F!oP5 z>>FM#u5Cq{L{`k?{O$jAON0Jl3P+uZA#})G3M=BRY7boi;m|JI)qKOUV=!B-ATC8w z1CnO8pmNi`8iY>p-Q~xAgV>N=OQ2<}w4Mi$@d(87Ko9(Il5qV>hC znEkB~HT%17|7FmK~>W&j<6|Gc(+8I-#pHCE0ooUi*z@SdRTyu0nzV0YBL;r!drLPKW$Iyba(J**9{ ztBZ%^KHRgvvir+(SzCh_vHYoR?{bazms!xmGV^>BuV5#erRTi1pPIG9y<<|TdSQ9A zKfB9!02sM4e1owhxc zJAY28q}P5(m~k-uvg#4EJ@)S1SC%wraPZfY9?ZIX--k{{^Vp}RYU!`UXt!4;_yBbz zwc;P&IzDPD4OzU3lKtY$za0RSLoqmUc%KDAVhdw8pmCWX= z6w#PCwFaAgg8_|8Bv0%(t}$M0L?24y~k2CXRr*r7vXe|%74>z#+jzXTrgdZr9D zH8j>NA6yM>b=7rT((;3FH0}=dOUw(jn8|;X-4HLKymK`tM5o}=0RC*Lq8P2^wlrc# z(`HfGK^I0uL(805BqQeicsRGG#Bjt|ttJ%eOY{jbo`OocgQCUDZE_78FWJaMWus2a zGy-9G$r+K$C!0hz_ruQR9dNS}N6gY05^%#iaq1B;p+7VHR{O`@n8_RB5^2C}>D zf`F^$7S>M9kZe%5dUf@$vU>XvHj-F5OrR0vpKqtPZ|qBR-ZI+DOLHCpsJ=8{BfwR3 zANwrn!|lY>=J%GEIb!LjxU(l;gSV`il1n#8QQBMd^J8|g0OdcofS2|}QkZmB z!rFG~M~o(@C#Z>7(8!-;Z=zcidGNeQ%)%aoacpRc-eoJgm6%40#mIsKDO!o0Wz*S; z%4Sg6%qb+#7^Qjqc)m=9(PE%-ysc^AGTT}S2M(E;Ul?C1oFDtfI9tDw{0o>r8Dt_3!X7v?`ggY0fwQ=E>5?kKiSe}wSS^8v7-z0WSCY(F?(BnZpO3t zMSSXqcZC-2)~g33=b#^MQ-u*l2BIB$E!UXI+RY!LX{w604Bw9LZ-kil_YVAKxii5( zIKq^1HL%2F!zP;``L11;W4rV-dDuIi{%yGZocn^W3#W;@B|&R)w^iYLJ>=BK%4`Yr z!h8Y3=^J{*t%QB`fyWD9Bx;$N;AchSMgtuR90*NS1@WdP|Isx>`U^tu*B(8^bhQn@ zXiJKHSL4@Tzp$PI*4C864EA1mv?JQy1OSyLjpBN)dzuwY4)25z^7Ao0r>FRbTleF; zpheTpRYItI^ZlDa%tBa)3)Z)p*RbC)eV<~f$y{AC){a|X z^}dhh?hV^p%GT$G*p`-hr;1DGp@hvQ1N^(H_$>`t8d_`QKlY>$p)Nx(IsKg32Ps++ z0I$ckH%i}w4H~&HHr+TQX{*F961_|FD_cZz9Lbzbc+lg-jG;*qncjtMiP4!HdSg}iiQ4_4QtiQ|b_)A0x~lpo6^Y~R zb*MIe3`6SRSWy4z)>(Yo@3J?ej52E*x29davio*SuN5W~VIyi14oUFh>S`8b4Kc7^ zGPWFitMTTh zyhzuv`zrZGn~#QVhHp(Z9{IcM*4L5#)2TXa=a;%9R}D6~n8g}7*b2;<+tNa~9$E%p z-DuvUXO>JLeg<t~N9@qH%~1T38tf7V()V5J|mEoBM8m*&*4HO_y7-zMsnRHd9ae z^(uUa;Y)(K4n9$hSupKM+ac>?Z-}43jqwk)S8AOlp6^5(oQmJCUX-9)cV(VD?u_H?zB1*{CvG2-Km+4Pr)Cl%)o!56U5??R|QSF^#0Ik{zQW^NBqfc zPl*$Or6DJDOblX zK43)&l+7@r6@Y#RKfK37e)iI!RFSf+L@SxHQ`>M4|8g*E+JV~QZ8y1Eigei2;-sNV zBWa3_OC-MK?#?#3%7ukCaeX*rIaMN?I0E*^btgxhx!fLn^lRjmg0CHtsS)6KpWqun zB=PU@6q;(%_oGJOrpty-$@y5JYiO{gcu_815$2!l;0xozgHTqENt(1+-rY><0bYd) zw>F{KG`O$(d&Gd-no07hv}IDKF7$?$htuC~Ts3Bq{54PmK7GXTohIiC^4Fqp^Jbed zDpi5*nXZhh!jU+!hQIn)z#QoR1bpg1*al27YFOzU%y9*`Hl{ zE_$nkNfpG?%|@OQ1IZ>4HIo?Yc|`?ldTPH8`8J;1ac9W0k?yraz!j4;Qcecz^9t_< z5*lV@WvR3i6j5AEKK91o^2+)%UF2OGAsGuA|19gao=`fEk7u(hf*Ef4o_Wl0C14h9 z!h_@QtEh?3N;O~MqB&+CPtK52drMZ8+6Ns*=@VXD%*PT#celFtaixn&;==~HKdR0Q z`MUCS;iY<0<8Ao9e4%bY%`2ei{&*DcI5;BrsH3CfnaGAf9}SlZx{k~6xrrae zt83=dV$0>^mtY#?bj>%-crUsRstWAeyL$NP*hY)cGOkB8sXl zTl6PYFK>Hd>TywOED1^%RRtpS7KZj#^7R~1=zu<0IGMJ7NR)8{FBF|Aw_MnrY&z`b ze7#W6mttHw#edv^_(?oNwan^15>N7Kbc-!=pRR|=p!OuUDd%?7RCTT|XGS!i3YY$%nOMWugS+9$c3CWg^jBuvLUh#a+}a zAFdR#v;|0Pj#JT5&E-KkIy&k){>>v66Dm_Os+oNlXliQec733UT5HlbZ;@2nw8YF% zYXt4`bS*+;BPw0Mtm{_PvCVdfKVd=(t-R^m@<57(5UVbg!zd~bp=x?>brmO3=H_(4 zkIczEq2*ap;2>GNrO9}a$vlWsS0f?w!HE{|wSI14+-oylp^PqLcg_xO!BJ(erwC@+q|S{e5+ z%qp^WX+;ExOKsFHDqij?0)@qrkW|?I{ef!Pw&;}>`N;}l)b5CF&(a)mgF`O0&3vnd zE&f6YE17!HwtIEecjXYW0~+x|{jEm`F{Qla8)Q;M+{f=rTLQ`MDF7bIxO&ZI5ld*cszHp&E+6kAtbpEOOP1<}T8{O= zjo{B+WbC&@v~0GEo^~OsoG=T_2johdvr z^7o2a=WaHnwY7v$9t6yIqvCa}@I>72fb~uzC4i=iN3UJZd9!WP!hI+3&g3hudwn%# z^1Z79etB(0S)#Vls&iXOgR?D>3BiYSnP;17#6k76MPZP1X#Pj-{OW2>xQ&Y*VNbVq{lia~W0q&8Zv*GC?eIpda5+TZ#$KJD8k?|{O*vmE% zB`>L;)Uo{JO0Qib?FNJ3_A;A55>{y0GNjmTlDqdyLF9e5OrQ()yx<$RJxq)qO?)fG zF#7nC)D%pKxyqswO4N5pEi{@xjua@ARkP#qs38Q2wsU4Cgs779ueQ7B-@KCS*Blm_ zto-`ENYd1c%w~gV?*y8uN6~~+%+brti?dxkwPc3>3Dvp>F!U=mU44Mfp-Oq=N35jP zE4eSsSAR?2(fB}FMoE=LS(5ReLg@^cx0I%2p5L+$I5vlmj9Q6CBgnkl>u=~uoXRmB zKvq6BR*}FHlGoJ@4gZ45qaON$*ijCKr17;j7&tzjSFIktYs#A&l}V~0SVz?#h@!?* z+K_C6ZncSih=BwgB%sA}&&YXW@rsnoQ4a~R68~GTgVeJ%<1THoT$S|J2V@Ofp*jBS zbNNzdc2VQvTqj1PdvbCzi>aP_JMQx08e?YgG8wF8&{I2lMTZ#y@NbT#3~#0^abeacQkS~Q7m`d(Nqo6p-V^Ekf8Gj4sz zhFnyCW|l3P!K$I$B7jQDzOX6BETlm)UF`7?W>?2JE7OLL3?}|yz~D=|&pp;DW}BH= z-NB29O0*`Z5{W>;@$S#N-AClAmNDmANIVVo3#{sxUWNmYH1a z<*6e9cCoEa1CbFZnE25U-y?k(Ud@#^^82iKp@U}~aVYxS-5XY3zBx3-u`^x}uHsws zm2!m115v^&6G_s!AL3ANRr?`7#!bhHTZAwlO(-v>Ydf}aRF0fDz+c+!t`hMw6YF=M z^tD;C=>*sHGt_e5F>Kc{N(iuIs0X+#L(6q*(d`-Ewk&aw&drPAX(ez&4UhSX8{~5_ zX$cOLw&5Sa+#dE-Ri)>+#widna-fWL*DiD3osX#WycI}Do$qg&|H{PZOTk#&>(?~q z5|5igzv9-?-|Gz}TGC-xWn@3f!4ZUfl*;|tuK=fXrPbU+)XdAt8+0eY8Svvt`2c^i ztv5taCef7wRlVlpHI(C5bsoeOkpp$gfqE)C5VEx!YpoKq`9Gg$HISUHv=i!BQjKq` z89LUmK<-X{ds=LoNG#in@SLLkX4e^*0*EA*9Gs@beoTwya%efYaWWJktEEKOx%}AL zkL}|3WPH7t7ugyMA7KgazVz^(tX`=Nn!A5X_%p>(m9F;El23F z&usY+RhHN=d+zd8fs7C z$-b~PW}iXrZ>`p+6ekP&mi;b+rRH{EMoaMlSx{APlPtm=n+K>+-6D^f`mFSrEQ>J6 zj}HLpmdDL%yE1f?k?r{HbGa4>Red8SVYYV1AE-W6hkl=F2I_h_@milhzg^+ zWRh&bwFo(R(*%20KGlC@BC0k%QvEwivuQb^M6e`ZUWOaAs0>qHxYpbl`!D>owi8@k z-1oLP<4&oVeoV|Let(o$GIQ>#v1!68&m8e>w2VBz@0nNb2dg*7oiu|JyqOsdsdC-F z>Bc#N)Y+eU=djt{%xeHkvI1K=sThwP`4AvJck7?QtlMmAyywjBCC=v;7Xut&bE%{? z52;86RoWFz@nSOf>X`VawX4ga_P8z7Y-hmb@|ba4uXNrFX)6H-ZH^kx*&%7c<^H`lrRTqP6VPUwOB`l$&>q!4btN?{^~ma>(I5_MqGU$S`7q+LXjpE z`+pv6L;Baer0wsRb}!-tP(IS|Xu6W>7^LimwNsuvo2#Lmtk_*xqdC$V)(2w7X*{R& zpPMv?gyhWF*>4;7;~U3g7d)Xgf(~qPpBC1wUUqZA*K&zXv3y$$IKCA4S(GQJ ztRaV?F=y|2R%d*o;&};zAp5l!)*rUuJHy;gooq^8w{E#K7@``_eQQ@VuH{5pwx! zBwfWbe$_L_%d+?l_wMh(mnsI$-%wlmbk+HyPg4E}rwWywX)~cAE^~X4PdBFJcGxe` z0HVsYf!ey6&&# zLAY+k4-JVVhj^i?;2#)*fm*BySE&otvf4p1~3>!fOt`F}rWox2yEJyrZHrSUry}WpH7E1E*b(9l(m_U`*@Mx`93Rrt+ zQkL|uQE!v?d*cqiu9Og0wcDWIoTNwxymz}^s@XU3IcC%!xEN*aO}jqy9r7=`N@c=R zZ1~tnM}gz|vK;mEv)AC8qhZhdf40jizT+R_a@pmoI4Z|!N`Dc@{`9i#lCAg9WMCjv zT<4L7oEkC4aw1U{J~1eDN`znolz%6n8%h>?@5*8A%AQ8v5Q3&VI1S^{m+ZGF=L)F1EW0-o_wqS3q_GqhAqWqu6dQqLIVpu026FM2bGkNmVV(2Ff*#8aS|)QBtT zb5nV{;q0b_IN}uYcDCDGVB3sgWOBFJe26c(*c!H9D+xE2qj^U!?N9 z2re=Oetfg;I`Kq}P*YM89u}h%Eu2*){}O*pc8@PvGoX7m#$qeag6WTf4LzPr19rqq zTGjUmp7V#38L)x_L3lv5!z(<~Al<%&%Mv;Re#fsW#VQnP5Xl3#K`{}-@=pnPkhIEo zx_P@uCB=QY^q&nAiQcL?YJEP=C-O1v%QYvK<@O_pBt!aVZE^7vy2|}Sxl-fR(HD!X z_y=(#jJ4_bI-h1QGH9U$`li|3a0RbQ%;fhvj6o^yXXgf1m{AyF&CKO#fOoMttS9PN zARoL8X85AlmMd_Fm?S3LXF5&1&05)xHr8X=-$00lb!%@!Fb6LX(EdQCMQmPj>fZ zMe4i4{!3C+}4KXFze0I$lbWW8B(;Kfv%L`LjjcTD@;1 z30R%5`TM?@$>kuA`sZugc!YH+wd=bX_F9}EjyyZA32%m2yNxT9w5tH)zkZlPDQB^D zR-qNwfTr5gM~$`M6*{~uZnv0P9!2j`rmJi(&lcM8bY|>M&vTBu<*PcpA(=cF5(0bI zUd@j1Ry-Tmjuj^k0u_cm{&YpEIGWzvnWlCL+9l0933Ylx%f;PR^UOZs=0th~u{FTy zFq=~JOrRuWt|)_PT%oai7!jI3)zqVqpL9(b#)OByLxCy%y_9FSSi?@=)O1yRP-n0c zh|90LXBOQuUQVCAJG!JK`q#_igD?dQkbg2?R|VO5wzK(bkZzJNQvBXvgaXkw5Fu7} zxU+6-K29TV)$xNN=$Oqcv^nj=qpZ8!In0piH3Uv^D1kmMh%ZWkcks2b$dH5$lFh3%?Bzny}cby<7>>fc2n!AZ2w{t}(&<=hkw|N2~z ze?ezti}3eiD^W62_2t_~lVkpkyD5P&xquUxx~`59Pqd|DAIl^l8n=5!q5{%uiAmcMM}9Ic9qw zckWiQN#yvzo?lT?QbM(!k-R;8TA=E^CY$g&h#(~7Py@*FS6sbDO_xA3*pY4enVUaf zSkJ))k|&Qx?-meLnvGIuXj{GO^u%gpyGBvVJJ?5!3F*zfQ=`!CObU+Zx|*M#UklxL zOX8EzI2?6K=JhfS;37L~<)TV>8vjLhMZbI^3-kzhsucMuhXRQZBBxa2)3UW@U}U*L zF7wRDz(;^%g!}F)@MdP^yx|rP2IeaT16K&YNh$Wfr=fjnzWce|y^SmUlad(kw-EVM zU&v+_j$2!_*;k73#e)L~?IqzZXqbhSb=9u5ZiHb#PC^%<1~f`OlysIN+jAZl-F7b5 zEMkJ$I1nh4{)!_drOq%3^XgN-ArGv}=Y08jx-t9iDzh2}#>3uqVk3TeQ&FYF)CW59L|ET?O366|Z>~ zTg#m?Awf18L-6IVL>d3xrkduCHF|--)5PlrY0GG*Lm+jg2MG6?b@nTWV3AD+2Q-iZL28*3ONIinWQ+!{)^8FW0l#^l?U8cq zJ0X#h=~+4+{N4wL3aa72e1_N_M6=Xt3>9P+1_BHn6Prqw!Pi2ol~|f9?@Q>eQ1Ii* zZ5nO{H1jUW1t?iB@G0HpEW61)5Hvpz$)Q1J4(Hm zyM96N#H-aZ2yjZ4S|<^CJk&JKOB;u~aLg}Cs_i(@(OC!y&|jKk86`DEMp5eWdvC;k*BGwU2O zUmW;}#E7?Vv9;9$6f=TnkasFdi-F<}PR)n0i(5hr*3^`gp>G!6FdH-4lgq1bxRn&{ zg2smq_d|OPWnL0&q#$ivzZ%DxfY=i=3HyhXB*8^L1S-`ac?VG@U{nM~PlRkRKEeRL z{5_c5upgpI%P}i!5=0=m{pHg_-a#vc>RIr*kl|Dwo5Kr%^VwV+;3(%MYkD67%}=WI z*J5DwAUZaYgdXcU`!0Mw$${3Jqme+bi=WP`1@~?3DdqR)8#zwE9mV8d7#Vxh=HZ=_DOkt7jbrs!2OgcAMCOb5q`&!V`?Qiq z9GlS#4kkwc*b90TkBA5h3!p`GYYoFJojkEZNlA$~nU9ya; zlxgPDQzX7V!gpmGy&xcZ2b$5#g#alAroMefK%VLyO3L2Y=U1pn-2+XfW4j^^LP|b$ z5Oq#Zt00>Pq$zuW(wbAv)Hi%+o=h1%nk|((|E2(t0J6SO?@CD8DE|2aNKsY|QZH>0 G{{H}=Ki`1> literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/debug/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..e5183fb05fa61229149ac67521bb652e8494b511 GIT binary patch literal 16655 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 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 7b74a5b20..81a692e2e 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -50,9 +50,9 @@ android:name="android.hardware.screen.portrait" android:required="false" /> - + - + @@ -727,7 +727,7 @@ @@ -805,9 +805,9 @@ + android:writePermission="${applicationId}.WRITE_TEMPORARY_STORAGE" /> diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 3aa58d024..f0e922a2f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -31,14 +31,17 @@ public final class Constants { public static final boolean DEBUG_LOG_DB_QUERIES = false; public static final boolean DEBUG_SYNC_REMOVE_CONTACTS = false; - public static final String TAG = "Keychain"; + public static final String TAG = DEBUG ? "Keychain D" : "Keychain"; public static final String PACKAGE_NAME = "org.sufficientlysecure.keychain"; - public static final String ACCOUNT_NAME = "OpenKeychain"; - public static final String ACCOUNT_TYPE = PACKAGE_NAME + ".account"; + public static final String ACCOUNT_NAME = DEBUG ? "OpenKeychain D" : "OpenKeychain"; + public static final String ACCOUNT_TYPE = BuildConfig.ACCOUNT_TYPE; public static final String CUSTOM_CONTACT_DATA_MIME_TYPE = "vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key"; + public static final String PROVIDER_AUTHORITY = BuildConfig.PROVIDER_AUTHORITY; + public static final String TEMPSTORAGE_AUTHORITY = BuildConfig.TEMPSTORAGE_AUTHORITY; + // as defined in http://tools.ietf.org/html/rfc3156, section 7 public static final String NFC_MIME = "application/pgp-keys"; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index 710dbf8aa..98f19e98f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -128,8 +128,6 @@ public class KeychainApplication extends Application { /** * Add OpenKeychain account to Android to link contacts with keys - * - * @param context */ public static void setupAccountAsNeeded(Context context) { try { @@ -165,7 +163,7 @@ public class KeychainApplication extends Application { int edgeDrawableId = context.getResources().getIdentifier("overscroll_edge", "drawable", "android"); Drawable androidEdge = context.getResources().getDrawable(edgeDrawableId); androidEdge.setColorFilter(brandColor, PorterDuff.Mode.SRC_IN); - } catch (Resources.NotFoundException e) { + } catch (Exception ignored) { } } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java index d5283f01f..0d9a4ac16 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java @@ -90,7 +90,7 @@ public class KeychainContract { String PACKAGE_NAME = "package_name"; // foreign key to api_apps.package_name } - public static final String CONTENT_AUTHORITY = Constants.PACKAGE_NAME + ".provider"; + public static final String CONTENT_AUTHORITY = Constants.PROVIDER_AUTHORITY; private static final Uri BASE_CONTENT_URI_INTERNAL = Uri .parse("content://" + CONTENT_AUTHORITY); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java index 45f806960..2000a6525 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/TemporaryStorageProvider.java @@ -45,7 +45,8 @@ public class TemporaryStorageProvider extends ContentProvider { private static final String COLUMN_ID = "id"; private static final String COLUMN_NAME = "name"; private static final String COLUMN_TIME = "time"; - private static final Uri BASE_URI = Uri.parse("content://org.sufficientlysecure.keychain.tempstorage/"); + public static final String CONTENT_AUTHORITY = Constants.TEMPSTORAGE_AUTHORITY; + private static final Uri BASE_URI = Uri.parse("content://" + CONTENT_AUTHORITY); private static final int DB_VERSION = 2; private static File cacheDir; diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml index d29395202..6d8d76b02 100644 --- a/OpenKeychain/src/main/res/xml/account_desc.xml +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -1,5 +1,5 @@ diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml index 6871e1a5d..a134fdebe 100644 --- a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml +++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml @@ -1,7 +1,7 @@