From 72d0714a1688b3b6f30607a42dbdecb399ae7983 Mon Sep 17 00:00:00 2001 From: CPM Date: Thu, 25 Mar 2021 17:40:51 +0530 Subject: [PATCH] sa_issue --- .idea/caches/build_file_checksums.ser | Bin 592 -> 592 bytes GSKMTOrange/build.gradle | 14 ++++++++------ GSKMTOrange/src/main/AndroidManifest.xml | 11 ++--------- .../com/gskmtorange/Database/GSKOrangeDB.java | 4 ++-- .../cpm/com/gskmtorange/LoginActivity.java | 6 +++++- GSKMTOrange/src/main/res/drawable/upload.png | Bin 5246 -> 1790 bytes 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 73ba050b30613acdbdbfe9acf3eb3cd056c8cb3d..97111af7772a561f2a71700278d9cb29864d65b6 100644 GIT binary patch delta 36 ucmV+<0Nel21kePKm;`A!-legebpa4iBu>IS5TL5Td4#zCBGYw~Ap$QWL=UO} delta 36 ucmV+<0Nel21kePKm;__Fd>^r#bpa5h`O=eZ81GeHV}7QU-`16rAp$Qn>JZZa diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 42c0765..1bd269f 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.google.firebase.crashlytics' android { compileSdkVersion 30 buildToolsVersion '29.0.3' - useLibrary 'org.apache.http.legacy' lintOptions { @@ -21,15 +20,15 @@ android { defaultConfig { applicationId "cpm.com.gskmtorange" minSdkVersion 20 - targetSdkVersion 30 + targetSdkVersion 29 /*//For Egypt versionCode 31 versionName "4.3"*/ //For UAE - /* versionCode 28 - versionName "4.0"*/ + versionCode 28 + versionName "4.0" //For Turkey /* versionCode 26 @@ -46,12 +45,15 @@ android { /* versionCode 28 versionName "3.9"*/ //sa - versionCode 23 - versionName "3.5" + versionCode 22 + versionName "3.4" //Kenya /* versionCode 2 versionName "1.1"*/ + //nigeria + /* versionCode 1 + versionName "1.0"*/ multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 49da72b..f186569 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -3,15 +3,6 @@ package="cpm.com.gskmtorange"> - - - - - - - - - @@ -22,6 +13,7 @@ + @@ -37,6 +29,7 @@ android:supportsRtl="true" android:requestLegacyExternalStorage="true" android:usesCleartextTraffic="true" + android:theme="@style/AppTheme"> yKOSb{*$_-0jDW-B|XE&1kZ&ecg53wWaO2 z+x{R-5&>gij)813xFuqu5*JX6iy#CPHU^mtGXrrt0~n_mFi}|$7hi9;3mBA0lh^n9 z-sgS3zrWpCRau&tusi`lkVH?JyBf|`b37Ig-|PUH38zJBS)-01i<8U|gY>g0bp=wDBzcMHsr*@yewRs+XRM&A;v~0R%i-D8@yGh zOVI#ovyeDXk~C^}SSVXgj*ZMlX_6)hk|8J>r)(^l!%}uM@?cP!CWvgcyCfnDemOCp zVW=!Y1cO0K&}vb%7J_m(90W-dG>t<9uD8nu7s6#deV)M$bY7EGLsDeaWaOHaHp7WQ zP3KGqs8L#3kGKgsj0kZmL0L%Cq%ct6qd2uq^M{2CJOTV50AxdlSSpHDeTt#zKILDi zqsR9NfUfm=qcR?-OCS&xp&P}Up&1c}JP@tdwyS`s2D;Lw@t}A!R5RVQMrBwUnK;(k#Pdkqm1k=b&Ci zki_-}Lai)gyAKLeM&JzYpdxtVh-jPUeBf?ZlvSERrO!c1{#>`CK07L@R?+ zT#gmbWdMf*rkMevNC8HeGZ)@>D}0-o0`vEU|9OACCczTq{Ey6I7N(gyY?-9PsJ2H+ zrv_|_to#xhP8XKr%`$LeycvHWV3BRIuT^@H~t*`T!-ivkH z$YlkJb9OZTNT(l_`;!{%YV6PPa#cxF?4|{2h4%iW&v(xZbbYk)SZVqX2ll+RBv z8hh$o>gnp-yx$jQc<963!h+$>qP*c1blk1k$%($s`f~>zXUm2BJI`z_Pv8GeMf@?k zV(^JiVqTcu+DGH+b;ra2`u0&V^DfpjcxB&r)AqE)-ju1?9h>58iPpozXHrK#wq3nk z{>2;1h7y-7eX=_fiMv!IY9sr)M$*1rS2Ps+)0cZzCY)S8RD3u0`Zc|C(N_i2KaO>- z8*}7+b9;a5c*VlS1t$W3WY3hOiyd)0_GTnyc~;eTR~*XdZGie7S>5XzL>#9t>|Ebt z`*lUn$+p3piM|)N?SB1o?v_K#^WHBgpL+M}+pm?DSTD5RsJro@YkI6Jbm_N?&4V}m z+3z8cWl^IwYw})kyKu#^it3&SPIXmmKYsP>sa?)BTh5

L)Yx-A#n?f+rMXNW-wV=7}D6X=GX~YMs~@P3XwHbB*KX)42mJ8tRtC-S>4}-|zLkuIv6ys*{8DdVUFh0Kj@% z8;iXFAmCR7z+vEr=gB*P0Bo|fwJ_Tk-9I%H8}jabZ0qb?-4D_H4XKa!S*pbA8=dWH zUbjg)65*c`6oQo~-ez~-;MhHf#A7+TN*spJIR~R$s9MVVu0KBDq`Nosqml5ys6h>; zN4QsIUk3_pZgk;jcZ=SMxeXb8^Is!E6raSu4_ju}&7Y1N8JUnjbSP!R!f?vS5;rtr z#^AEd&Gs}Jw)h*lIKo`Mf|zdqcz@O4 z>ALS6hfXpdat8Mu#FH>a?BQgxQBS%5^81UUsy;cKuW*@i5_(`dbB*H)Ovd9sK%{y53v<7$?MyC>r~b|XYP zBC7c9%FNJCW39_OzZYdPq^ePfX!}Jy=Whg1!k&y5b`9RRI7Tk75-589>BWfch?<=! zs#q9W8hsb<*ckuS-NHvimQjsN(*UoS%%Y?u-j0RvlRfczNcMXi!`o)W%1#hfj1!ET zH{fOAC^K*3#y$=6t6HMH@}8Gx<1r)=G;@i*=$p#R7xWaBMh^8<=P6u7I3ck-BhMNa z-Yc!;sMErf6T3$O^Yt+#gyeEo*msOtbd_^Y?PkJ@V^uBoiX_t4s5F*-U(WH3RAM6eJa(dn&72~jSAKluQjtfIv&h`U) z@s-@u;qSH?wQLUlIv5msv_>{IzN=3YC_nlBtY!V>RIf{g{!ZIpBPB{wimRX%9JbzL zU}o#G{(f?9M$Hp+xF}nIWpE^fK-tuInkVY1Ytt$6<{Vy?gf=X}-spxWFqPc+wEM9= z5uWBm#GNc+qE!aMMnrOXKmFv$tmE=|6Tbe7xG?dmY#*=}iLGCvR(kZ-9UzNl5ItcM zCrYp~rWk2?VTyIw6A$u5=SgoXya=-&kpNBmd?{%en6;@wwjh?Y(hTRf>@~FNa{SyHYw*UO_n78b~$xWEH==#Q_Cz=ysF>3 z<4Ej&vam`EK=VT(BM4K0g*U!fpznzw)Z|177-^FJ!k5{u^eF94#s^~@$P*F3ql5{P z%Pt*^yS%;~bNIsJBv=cj#il+0nFQ<)Yj<{iSC>m(jg+JT5Dg7Q&Cuj&2}CrBjFVsh zG~{UKC&y!O-*GE6J>3luC?shxecohy$%N9z>N9;v3s^(a?yUgr(^isvJX$()xLrH4 zeAW5J7JzGNFjbW3>sI`IW+Csa?)d16_Q7~HW9wW^koY&xdzI<-ksC~NSItM&3E`%S zx_gz4Z4SVP!j$Vch8oM@?5EiSlr}1#FE|T@pHf%vc`XJb&!siFGXx9P87UaMifRI6 z7~4@|`LVYFMCdN0r6DE4)ba~}-bsMi`tB5Mf^hwzv1ORv;d-b<@hUAp@CuKu{~aP7 zI0u$VWU8t!cm=h#lwHILER>0;9rQ%K({>aq-#+I#d}XKwJX^JpAOh zqA)nn(Gx*S)UBKE3>ky&7$Cc0{QP&9TQAX1t_FQB(|yvRJ;o<1l}u ztx%>Yo4|0EHkgaM3g&>XGB5eYb_i#jq6stUhDLSf)1fjVOyhTIy;Qs%=AS( z60FE1%I?E6beZqsH&)QEmfoQi7XG^PHIkm*ha*r#poKt8?)=BVLPL5$^V+z=@^oQ#8pKrNTdRTq^ z>7Ej&Xl$cIpqS||Y!455nkbcL*SSkRN>s#+V>H6g@dp?gkimS-3@j99TV)j^rjaxH_sTt=&cqPyk!h z%L+qfA!*Kyjvv*6I}*hLrKYo=ANq9ZI*2T@J)-USiemH{IY~=VO0h?SO6~xA5~l7b zr)-GZ_*HH)PsBwEqKXL9?vzMSUp$=lJZP_wEbL?Y>c%$8tkZqTj0U)0(f+$j^MsDW zx?CCLvG;;bE1zY-&Q&z2AO7fLd!4sX){7k&5f={~x7|4IwIU{qRDs6Dq46w?=~Qcn zkuu+j+JI)kc9R}CW1F7G7-smO2Hcz)-bR%Hler=;VsLL;_$?^IONODAqX#XR`&nk0 zG!?K#txSa#Sa@$*RU*T|qF6%2=~4QXdlNcdEAgrKD{VW??oFA2x2kft6+ra&k+avD zI*jh(Lz)skSP#%jZ4%P}6ro=9D(<_IYI4Zv?O{6K+o(tRNCKh!5W~r1EglKK^qAZ4 zn?zBPcpmh{oiKA*dSj~6@7ky(hA_eR@jK?W8HE0Pu#U$w!WsX>a zy>;ns`6vd2i0i$Q;$0BSndpf~w^o7H;)xjEg;B9sCH&AdY8RDM%8~ZZsRj7L#RzRj z{yjtyw{tk!u_=lUhUx4X4yPw=I&~ks?g*lpnk<7B+5H&<&t@u~4p=x3v)>jqzD?q9 zkDu+mb=TcWRTly8nlWMSGb${1YQtBJc`cqHhoW0v9oM8KsUh2EO27K80s9D>oy;p*N4)$ImxmgGW_Kmqfnn$0=RYUK5%YT1S7?x6F-MTOsL z`Q2FOqlkR4n=E*9Z-YByr99%Ishn|ZYa$}qU>x*;eO=#|}H%c|Cr*^B? zs~b}{+JoMryQiP~*}br08Bp!Y*}lGx15fjk`aHK$LD^AnlMit|yhk6kYhJxl-ke}> z`7qLik6&t2yYf5o1U6k`bx#N@lbW1@hJ5c%_ z&d=iJ>?3{lY5v-641-uN)%3{pp6Zm0&+NSWyy1xy9y!unXP#|5H9?!nl14JiO!m!5Ow;6h zBAPV;*>j~e10!g4^fJrn;g9BDdi?R}8*peJ!HREGl9TsR0N~)ZfzZTcxi1cqxx{8Z z1@L+@Nq4%AH?jleaRyt}T`EAbOhXF4MM)55fyKCv7xQ^i5-*Ci^ifD|9ls_W# zko%Cxuq`N!O(_06sT>P5!{BH%|jRoohP}qnIeRRz{Hm zTK~oC5kC>i8833$rL|aOMG^E12twMb!%e;bzF5HkW$`2t48wor=RpifAecab$oy9f z;CJXa3D3}2BM6IfN?$$2@d0U?fcS*~L`tIlwEjfB86%y%`gET!@cRSRdGL6mq!h=u zihPv{cm_{Vz>_3V%&O_ZZve?iQ5J_ki`=Ic?No$PZeq$F_%_Oq5^h?}?>%@$SmWW}7E+fwDT;Id?(jU2^aaUl!5R}N ze$a3JDR}?4qsuoCD5HN#W>xkjS#aet-BpL5!R6C*p$H;Q< zX0dfW)O5*2_b(!lf@%e6l*TImDwYUlQcNs_ZxUp5;MrCZSWuFON^UI8wH8Jc)BY>g z%JKi`y!D?IS~WRUCl2HX^C@^n*k1(X_8YjvEd2Z@^Z!8gU(y*X$b28eQr^|LR%Ub| zpX9cAR3pXUvpIn3={DOfU+WgoSY)*Wo%RqB7|d4J*FeQ&Q- z)Fe*Isw5xPO^X|=E)a>4w(xVh2xmm&$J3)7Y6queemGlQbAUyfd0P&y?bxXdd~#&1L%B|njjG+dl3Lf0w>Hhoh>a;y5PG?Z{ehv`~2t zL6EaxTt|Fu4%n%dMVq)G62*Ktc6jV6swe5}MFc_dtPg*M-e?b{ZG-1++sN? q=}4)dBl_%&-9p)-c;KA8VtTpYw#RnDVRQJuBCxe|u&CJOllXUXll^J{