From 26c5a3bc3603b1513e2faf5678afaf22001e12c7 Mon Sep 17 00:00:00 2001 From: MIPPL Date: Tue, 5 Nov 2019 20:36:08 +0100 Subject: [PATCH] fix min bet amount bug, add balance listener to EventsActivity, fixed random ConcurrentModificationException b 248 --- .idea/caches/build_file_checksums.ser | Bin 539 -> 539 bytes .idea/caches/gradle_models.ser | Bin 250599 -> 250614 bytes app/build.gradle | 4 +-- .../main/java/com/wagerrwallet/WagerrApp.java | 10 ++++++- .../presenter/activities/EventsActivity.java | 26 ++++++++++++++---- .../fragments/FragmentEventDetails.java | 2 +- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f957b3882ae45288710ee42b40c6eb23822928fe..1666c72783e728d07295a6a5f96577836a414ad4 100644 GIT binary patch delta 35 rcmbQuGMi<>3>KRYyDBEmDHq6he;)5Usql!iL4VgayH@$h%8Wk%6etg1 delta 35 tcmV+;0NnqZ1e*kqm;^A^3MrACcM#D~=o-(UE{@ZE)zU8su{o0?0r&_H4{iVe diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index 86cc0c2fd2c047d97c209082d57d1ecc3b150e9c..89f49875c694a601f5d4c3c0db50e9ac62e5073c 100644 GIT binary patch delta 26805 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 GP5wXH9!S*y delta 26695 zcmeIbd3=q>7eAhvC%H@Rl7tXjh+UA#MmE`qB}haOt(3STNFs{}5iJST+G>3;rS?|s z5)Gc(cP+If)>?|7wvQ66rPY@2nR)K>%+0O7Uf=Iuzkh!HV`R>pIdkUBIqx|$ckb=W zwJ!J9x|E*oBrTXDj6xW#Up!Cvv2MOY?Oqv{ah7&t^V3JQ>zp%cR9b3&dQNsYDW4~J zqY~mH3iXKld?Bz+NiPRuR$;%KoKc-eTGF$}jCPoWfM(7rOtR#qTe9=xvWMqTssk1W z#l`3jrEWVgCeNXfnBBX+cxO-TrnSb>#ySr0A7kTnl<(k_nq|pM6CWhxH-t){Z=kPV zzJp-N&85SXv4V}bOZ=gVYCp@64z2ZFhxT=7YHGp^BuI7 zysR|K(DZxt3?)gz^Ag#>bLrBL6d_1vn2N95<$O6#pv ze40+^=aP#9Ny-W#ll-!}ntr)AT5qIdXOO3B1e1-pBJ!YxJfmk{RqOGY`N&svMiXq9 z_ePiIlbfADDX(1+4AG^66A`|tW}%-dJ!X*A-v}#hy496>{X$lc1(jEA5pqbs^@5vC z>-Rr>P@AC5N^9YUYHAGI@^URX_`bE(H8CwM?_IW?&~?xVI_wN`bdylqMtVgHk29pa zrXu~x=4!LQvhGEII`&kXZmY*VSgJPUkdTsUN;yoN*xROc<~G4V{{BjEwh{1T*~J`! zwh3R^(3%t?;!C?Ll#$xup1jqTl^8p{`Bq#1={Q$UN!_%yRBK_+o>zudX>{ z0Gan1TA8DG>=Zn0`eyIzGQ-A=T1wU2=tXX)3OP`MzpEy6d!yeIsHco1VY>tu8+q4n zI&GmrF_IJ?fpw4BT`gp0%;_3LV=0To@2S>p zV4qOKW@y3iB98(>mTOw-$alup?_=|xlA>`!4-&m!XiCx#RCBRA!FNuRgpU=!rTUvQ zM!riAmvqhVq@p31)OEkmmyA19%{Gt5tldW^`LT^|ULhHaY)1a{NVSn)5BlyZ)%+uy z9uZ}CgPEz^#$=|YXWOe$M4BBJrU-cs!Q$hDreeb>&Co8g>A0}YsZ{09{J|Sw*$b{ zx%+G=E4sIX62;YovQ}K9m}>iCf+Z_W?$gV`S=}vV3d71$*bxP^TwBwP?u`yGr2z5S z-B#j-xEW;HJ7j{@q5;J5Zt9w>qkL>hb=|lhBzf+%BYybDs{@uE= zk0a8TSB&1;Ra}{(Df{ZfWf%)>%3@OXp$MVr>MLGjn2?sU z$2@%i!l|k9(nh6O#-vppAgzh_tw{WoQn z57M(m@dtrWdD8cLCID2eIfOUY=b?-2eGk9!?H)A>z}sbMpG8jR4rlhhdx?#PPE`J8g%l zMq0U(U?FM5=Q|)jsz0j#p;Xlf|o9Q|Ykn9j8 z(Hca;oTV)V?35uk-ZWUOT52fsS}_u79P11`y6Ss6BX_}Xbz6NZ<+TPun-=TE$;0as z*9k&bF*+N1ta?a;;eNrh$CS-Fon7r;bQCKy2Gfu)D_*T8? zmq*pJPDMQ|ARszr@ha8VDQEl}v5Ga&VzijEu~r+$V)*<2a<(NK4KUj`Ebdnh>Pkwd z37RsmtqpKfB~S+RoSl~M;1ZKPEH5X0SS-cmo@s?Jg3v}xDUI#yI1y1z92}`z6tHqU zGwckYq8+S_JG~<%9-_rjS{$LpVX^kMeO3(aGCn`g(gTinF?spv!!4=#v_D`*)wUtn zv99>ux1HUr`^$}gmbG<&Mo{CMZx_(;4l8R2oFA0Ugz|1#Q4K(KeO6)bvH7`Utzyc? zZbxhjO^6d3hzoZtz?$x2tDPCv{UdHzTHmz%vAO*$V=|R35ae#%xeyD@#aOA0y6Kb^ zNCeS66TpjV8=o_5>?n21G-MURMv@0-OqB$?XkuPY25e07gsgjH?_D)PA0!Uj{Q&^W z{@vahO$bC=FhpA`vDThxKBY&-H2oXAJT)gP3-)oJbmlLbL4a5pmOP4EzCq8PeL;N# zmC@YYTg<)cAqMSD#+oE?{@y4Z2!uvWviQ^9HVrj{^Br76eFJ>`Lw&~u`1yD63-t@R zG_8ah5|xRK_Z`$~lDhs`_%fH=2ob!=KOKeoM(Uxel#uE4h2*-3T%IxT6?% zXb`o+`a}NQ3YCXi)uf%^z#i=DH_Tfc#`=)a`OI`);@(3#G3#(5?RemD3*Pb9!;Rc% zN5S9M@5?h26Xb5uH=*0D)9&KHBkzN%X&HZ1<&r+(LX+yM-apbr85OPxf(kdRkh@pC zfef}P2KkD^j`pELN=LogDYjnIyju|{nn4o?W~-&piK^fjNlD&G~2DUI0cvaq^iu;?83Y{1ti23VfimUS5dtS)=UjpLzdmYgwXadqgcbks0B5 zbfhAo`=9-)@*PaFgfVG(<3^>)n%S)4x^^$GGbt?c-SQnu#rfw$!~>^li?hDZ1RK5W z@LG1S*y=Wl|Dk>@O*We%Ek>NFGPX1*hoANgQl_xy zFXQ%n2O~FVTAux?>?kG6Wo;Vo>n|G5WKuH}o{0!hWVAlAZ7v{$EMsJTKHJ=E_3GGS zPkmWJbOl}3I%34x5iqY+QGtoztYP-fdgZLuS=;;i`v$Ieh|9_>tQkh zr13n|fW&naYS&~cTVclB=TO^xhnnL2ikf1Lih6Q@1_Xm7|B)`!!xTOC(pkKz@KF~* z3_RCViDv%*U%wH)8)q|S61~wHnPunt(q6jr!Msl-k$bF`N%zUn%nXRmss+yljmgD!^Bo?l#S$$Nf(v7y{EfZp-d>fL{r z+_SWgHSXG9`ha$tcd0$^bo!F7qF7+g;jAU#rVs)w9A3Z{xQlro}A=(3EX+4 zB`Y-#5*nXTYzrx*#?@jd7)ok|lwdE}FiLz87GLp~Ylt8HlmrWuyK>-oSfD1vKML;u zR)z`2P}>DEX{v5O46DPW=H#W>k8xD@(ZKfCp zmiYTj=cjT54L6MEH4k^KCz}tXjsEioe%(**;os3}&QGrmfoYrxIlUC7 z;VrJZUWd#L72K)^U$g6Nm2v%i{nyQo*da@SYa1(~Zo1CU-}&e8P{qXl=gUXuJLu$4 zv2LX{0ld(deuqg>O#6)$y4=N+Kc~`}w7bFM?#ktx7uC3Q+Oy>nmOv&^@x&2Dx)Zp>>h7Z}+4l?ztVv^?P}{ zwGuZlV!ZbKp|W=7@(3~aP8#LEe8*Qc@p9Lz(||#n0Bh%Fk&{MWOI|A6;(((;i|odU zJ36k^$$}#9F2^w2pYKkEylv<&e`p}Bs+Cnp+|CNM#c}rrIco;gzqz6S zVz)-NEvo`rTF1ZW?wP6E^D<9WaH{+xW0XcxwaJ>(^Os*v#?&O&YSLtLe zv>5vN$f_l53^MpP99EY4Yoe+Ffjl9al0!+tOI(vg>yVl3i$x)fCLXI=2I|2+9z#-o z!y)3eXUnlRS)A}&NL$5q&!u|qg|Howmp*Kir7&mgyA&w9@!JJHB*0U&IOIhb8SX4t zM@%upY=I;mf4Llvvy~4SgLvcB3Od}RKRUElhHF0Q#45O77&A6EHzyCq@@Hpjjm>P! zZv62BA8ha=nBPGW=}3_Y`;pcrd6Hc@P2BnSmoUkkrKmgQ=}7J0MQ!#czGkc!2ffj2 zw8_04x*Q{KXP`Qy>q=a&x(9E3Q_omUjq*3QxEgQ)9ZjCD0O_ySC}uv}1I)~5KVY;H zRB#!qFx?f?0U>*+FWkccq$R{<=GG-)Y(EhIa^mFN{E4r$xAi)Lw78qHYR14KZ zAUf8eydanOdkYcOR*5{QjT#s=zbSGwze}zj=)5Y2u)KGO4z(n=e1wj~#mDNQ()4<$ z77f)~ji^7>LlLBY1GJi2XnzCLj$7zO1JuGG$6ex!(mT7!={nHimJ1G+mV2U(>PQj@ zT0sR?^oMpYFVum&XpELpf%BW7E?nS^CbXADYS0wjReQ@}>$(+|wYUZHrE)4qfE-F8 zty-bw02zLNYexfQv=U=3xRX1rP#rE4K8|cdW%_xeO{z@l0E<7s8XWzLe)a=5<9_IUsYg2$sE#db-#Y*WNH6`77ag5BE~StefoL(cOXDCEp`IDm z4Jm;u*&3>oSh6jn3iH!b$NbAt<_4kP_&{(HjV41vP!ur?Py*3wAp|1ODq&cNi@v04 z0QMp0^$_Qyn#oO3q`~{(xO-b6y^}Wi)qqRn>{--=JiQNa`SE3JsP1K@VW^3*nz!Bv zL#~1X`^5hTP{Qvzj+F`{Q7oM;^Sk0}cpOQHM$71IA4j9$Hi}_SA1v7jAg|6gJ$=}} z=9v(K&hU9MTtCTrwo!(WJZ(_hs9b)TR%rPsOvTQ+Bd^ zf`UJ{-b1tKKv{iJtcx1O{;sDeMhLm8Atr1(b4^Vp_MZVbZo41gNse4rrv#h#RX|9o$`}Wf?v+ht; zPC`5B*g(`x9ZB?hVbezT3JM%;8ie$8u8<+ck=(%$qtT9nHFfCq3HU7A@~A+v&rxtD z`%{pf>USaqwN$t6=tkj?b?Pkuus&H9Yo2&cF@ffM=*lPO=m&sZh+i7=6NmmCbGpuF|sp^b_q{vhRAE0a}ZW(eHe{!&syp@>9$_!X;5YrjJxs`waA9IP{ zW8Bcs*4N%&{})`}%Ic`cMH_W~I;P(#t8?oa_LCxpBY)LU)Td%daTRFsXe84@0xisJ zO&VvSR@}MzWTING8XK``#@CZ&l&Na9!&OAe1i8<^u3pib%_HIAA9XFZ5pA@cawAoW+*F>t>rE`)&08jq%{1Ig&a z{DU&!8 zI0Evs_h-o4`d>3p7@u>*OjOU6FQw+1d%?%~*1g*iM@V;Pq7*(VgFG)skXEQsMr7Gu zv<^p+!E+GJsu>D0rh>U>6`g(Ec_@MpId~rOtTtrd&;=*hM!9$&j+PAbQ8piuZfg>( zX(9C>=3!8YBD)r$uc+j~i&2#7Jp-HWe=py`oopj;W;wVRIod3y=9*N#7`@?w;qVLC zORe=f54+1iTd)*)(s5|sC$~)>0|^4`C??Ww8Ty=#xNjM1*-BZ-Zp9;KD3Prk>up0& zGA>6O`Is!0z1E;0Vz{lCFC`W5W8NzC1B}b?1^)IUXI9H0n7#&us<4|gvB^h}KPrAB zAB*h0MmoF3Hh(N#E9Z}c*FpYB^`EdF#i$nBH!03YzMzzVU^9FRcCP| zxpD|?0?TDID5J-0*b1MZ=EP+?u1{PaAV+S$tA~-d(RTNiT#mr!(ymsMDc2^8$m(S{ zVexSkB;7cU-h;6uNX5d~f@htu36b!Dhj!8sId~GeyHeM&orrYvgk6Nhk)pF;oxe9& zy;XemDuk48#4+UUY4kPBh(!tzI+0l$l^qcxg)#MHSta$kQ)g{3exzIDI~3z{E36oA ztHMx%x)QI0V5VCYuu4NbutpsDtBDkkhxD%WB&tjNx+4uKsz5p^sshzgZ7e&_Di3g; zo9DUnkRkPPCfRV2`Dsy`1;2x}TM_?A!Gk<+jon(?Zqx4lLqCMafRNKg1PqM+o*$zV1Ism+!YXvp0u-ahNX@A*R%)U zM*Ln!#`fa-s6B~mq26(%(ora_@jdhfr~)tss@#W@pWl7-1$BUv_YuEdz z{ycH%bNW$QG+9+c=tY`dMm5FIAKSx4q=7W5KsCrLvrtB6R%ko}f52m~+k_>YMLSpTtbU^;t06#@D3tKewW< z;$Q;BxV!ZIQ<}#s00pns>XBQ|P&OGk*%}d2?cY%wIy~D?Xdm*=WX1j)#!|~r+N>$u z{$%_M)ULU*g^MW({|3;c4%`#E$REE}|Fm_HE3Pk;jL#)8p9tpGK%yimHLHFcI}?qWd9ZU zua1&f7oTLEQ#|q4Ser(koyKAG?o!Hw=U@nF$+j9eTq9UJB*yOY(MVXEvf z>fa2v$GQt-{$C)k#2XU(Yt1ku?z*2yWi$M#l-mM7WzsFJ@j7hqVA3g!gp!GE@ZZ<~ z9-4uBQ4sMb`>lU9k%s%=zO36GKWdbp2^b|zz6iVFj}2g+N`mHsG1(p1pg{a5<9JLPjXiZ?qpsjYQv64QuipV0meSW z@)9;-dLSaDF<`)wp~xVejm8xMOuqj2BlYs+8Qyqy!6DetjyxL%!%>QKvJ0KOA&|`P ztdQcnVZ;Vb?1?X6=TGV4gh`M9j6~RZ2B|DXbLeV>!D$*`{Zaz{QE)cwxHEX8Cp>&W z@>JN3N3*^-9P7T8EPb&E23}7p=7S)={y5hWI$V6PB$jpP^BnYNhY#<8I0ow%kwZlw zogG>JHxRdgNiHGJ2IBeT)bDWJL^-9#gYY>z>Y>>sJD8AXC!q_=ekNFO6n4&{6Y5N& zEjU~X9f})+>Z8fLL^{WfaN{z{${s6?7>19qrD!`6ufc{n@_N%CCQ&b8PaEG51hZ;s zI-ZLS3nWS~W=fOCV{gW|`D0vx4FzP#M5-$VJ2VNmg(dokz^C|(6i?<% zg8Vmq6&xpkBTkAf#`okoOa-6SeNOtU0z4f!f4_=kk0RIQ|JxK9(+@9Pm!?69ImB%d|fFdLy4+sA_Pl}JCMbgBbcrtZ~#e48x z>}(?Q=b<7gVlMzQawg^T(M)nM9UOulyrlm7@p`7>+e3Ie*13>__rQHz-BCEnc0(G; z?+7-6FVrNHU*lL(ToW!Y26+fFhZJ%Qe@?wY8#FwLta?i~1$vy0I)MYR{+Ng!hcSZm z%L(iZs{-~tiHB1A9(ulHCz}{Z?MyT1$=F#Umc3}2w6UBbxbq%jIS&iWlIu1VU{!BV z0WOOmA(w8S!?) zB3A-P8AT6zev+{g4`nvYy$hR?ehb4r`C^M*Trc|eo~NPcrl*6*^F!W!P`;%AO=wr5?=% z*^{=m5{_V9OL*=)l;M z*^VIrX`dr1C0jcP@R9VV^nhueP9Am;+UhhDtu@bJ0WP&iT5H3Dg>J5zv2rcOyz3iS z0W99S(#!yTwRNmqkAsCyI?Z}(twV^=Tc>$$t<4UBqrB$0TwB)Lqa`WtDEJU9Tf@TRKg-fLb%|q)BJ6%m4plM_V1Ln_A*>( zR#O`%*XCYyY(%BoKH`CU$Lm(!jE+JRoo1P}wy>k%r_&Cw)=qU4db?`acjnB~YxKL& zlWAFUvJ0CTdr%AO^HBuorEO&GQyL+_z3^;n?N)>k>8e>H*LImtTxJpu-fqq2*~iM2 z8Y#e&ks;RF;z*&hPIJ&&tBe#PbXp&4twj`ghSu3yvqTA@I?ZEiZB3NW&O>vT9U5JE$(L$b+Z>=9cjbTq%9cQSIYuVQ-PSTF2X>o!Ur)cpbu>`?c>vR{P z2gb)q-L67wgHz7%lozqk>f$IRbQR7aaM;G(Ap%gDbgw&LhxH|D*Yr{O@X(!#DIvIr z@P0k(Q`YF#e!skh|7Z(4@RW@aOXFLU6+MIwt>ss&wtd-G8RFp!jq=l0Xrk{bTA1Uc6WDIp_K-F^;t=hP- zHMDuNj#!^MEne%XJzYF0H$JYKjW#>kJW+pYn;lQ9-C z&QW_uxt~`#nfue{u9m-)8d%^1h?u?wBNOyxv9i?08eTnRAY|qdnt?jz50b@MD8Bca>QL$QOWU#D(2bgh}7~@&aSiat& zzx?c#DtVzu_Vg*@24BW`nREU$(q+X#RU|`iP10H6%yq_ilQZ5L;d`j2%6M0nI7ipE z24lR>86UV;k^q&Fp=gmN>17-2#W7&QoH;mE5 z8O=xaPE%EpY-`mdHEUJI)?3S7t+J@qx__V9m|_@PML9>%B=rpY`orAOu>RWmTx5g! z19#I8mSs+cj`XGCU1lI{6VBLl-RyqhDq~A|-mfa&Fvrlci(Yx`HVci#=_(`J)xa?( zG=Z^UXul#Z(*Mcia{09%ZDHw!CaL9THS!rJdrlyW40gyw(^ZiybF@WKAD;B$BIDz=*$-4kww-H| z!gF3FF_HZ^WB(l;cg#^42e7}Wm26O+8l%A^ZE{+V3Ks6#!MuCQjdhb6kcwQPX1tc& zCpx%6XTxjd+uYi8CX5mPR)}oXP?_3dbYLxP^I-jrj-*e2p=OccjoO9biQEWpBH*jy zyf;?s+T@6=J8o=>9OJcx7cVqDud>LffkL!b-|WR&xccU1GU2mXtK_f8(FHRXHB<#~{mqRTk&n_ut!tBO92w3cMZ2E6 z$cD6p%M9e1riK%WOzjp`hT)`2+{THgiWI87{)Tea!u2;?kO@vNYO`EO9_ozRpQ~@E zU_?I3Ikm1${vvZcgF@{=rantLw1?_kG9{?|CT~Tk_82F&R*5G#v8_V1SKs8vTDbbA zAer#lhyy{qzb~IZ*WcvNSUFdKTGuA0|N7!4bDy8M`LDEZ{`Nza-N@DdnG?DCm7LhN zph)>ihB6Kd)G>_q`WvnK7cCkd%LVu{&1hGyzR^y7qpkWl3wLAcSIO!ZL0|2&D@$%P z#$*pSCPyYT_e6i=L*D-lpFh{%WCuPbTkzSGnB9kJu5(t+ zuQL>tmW)<~nhF*5buOGZK_%AY#E%Pbk@Xib%BT%FT$+kybvf@;nNX+8xs9ASNs($} ze$!+|~JecZjB%5P3rgz8#yVung=!-=C5qP_Q)Pa}mvRlv;9=b0;ZY50KUdieR}`7LXimJU61lq? zimoeEdyNgZSPR$Ka91Wc68G=9)EjDluD+p?5joRswXRLpw>MNW_50FNMtfa9w?^e1 zRDM&OB2+h!6MLw{!JODjA=;~NN@OiueN#V~u({dm8N7c{f+~RPZ|cK{oa;Tcu1%gW zB8;6BbXnZ|*=xfeau6};6`8txF2h+R@?G3y}na%q@;q&L_H$G#moa;BWu1#)xm-sXHS;@`6YSOYb@?`-7Y7RGFa~T|N z*u@*Op7CRjc4gJgZ?uOSqZMwZcKzfqm-;TaG1|e6(H3r^kLa1-?WXfa;|UH zx;FWl^A#B``KeJ?zQ?DWJ>igz%Dw-BD#OUV|0hl~{wLZS?Y-Y<_5J}r=o@nZ@A7`5 zo%b7Uy?@ul^XxFEyKnU#iuMl<3?5{&2dSH_jvYc}ORJl$u1X!=^q-rp*?zM%I}(2j zpuOo0vnBO4Zg8{R_G-4>UaNK=Vc($Bu^f#Zi1ZFu+(%`qY8X!_GWAZJcv2xT#4r9C^6B_mW{eN7*8MQxG-&nzjoavlehi?)@on+yvuR{$kqrJZFcV5HZ zSNTnK6`^{b#+vG>M84jp1`5$$eUle!;p&^3$%J7S1|8xfy)(BrHD;`wtBG2Nr}NoC zZd7xH{!rP?s=wdCt zyV=&?hpybk?i}^qnfeUv^>LpVniy4~#yB=zI>&fU?4c6bF`;6Tgl&L8#_BdVUl)skx3mT@`G) z&e5)nMxae{X`kzuthvrSclQ`B;9a?n$u8G1+2%Tx`7_Tm^{oeUiuU@#t>b<6s6x%^ zZl#~diRx~ppUjDn9KSm^HrsDjX6t4(*K@^5-hUFGKaXCs-EL*J-K{#0*fpBz&o6NG z^HEG_m@3pbLs3f459Y?1Dv=+|ji3KF+RtPBHtw@fCb;iA`3WCtjw00tJB{-hkuxn& z>)PZFi)S;`)GG&bKzsd$G-J;$D!++?CqJ2+IC%1tx#>T#(`1jGrVFI;2#WUaf=iPf zT$*g*G9$8VJ~Oy{7N^(x`a@sNnR}5d%ng2w6S=`paAFZy{M`;?vNyQNYH+XZA2@OW z?=rZ_&fq3ngFjg~Oje&A#jR+6Wx%I@zEy=9Llvd;HpmdB5-T}pM}_z=xQS*hHvSST z6GENic^+jfic|$~e>cW3A|IubTGu9j*=%hJGr#pLPR;*p(Crc~)UZpDsehr$Fzi-| ze{$kpj&^0$;l^-~@pJtRM`c3K=B>JM0s9rHHvVon#E6{fuv*t9ubh?bPt|v3H=`~L z?Va_@zCJFf{HAn8sI!R^GgP7*Cyr8x_U1R`vKFqsDPJaJ{4&kvXqL_A&&_Wd%~<&; zd1_soyno55XH0)~qs?+1=f=kl?cwKpqiTNV=Bf;%YJO*LPTb4UuB^KGjrQg@TFrm^ zrM~Luly|M$z6mw6N*RXR1&W*FS<2x&Ahr&0c00rg?Ss zP4?=Wtm-ES^Hy@9`}zEB%x|Z^$yWcF&0f1P{S#&Vsrr2urZ;y`g__mib?(oJYVbOL zz=;sN|8bLJwvS%3HF`hYb?!MA@UGxB+Xb)LHhBM7?_a^xA8A!z2l}Vi`}oK$c)tTz z_0CzUaN|=Qhx%uzZb@8&4Iv8t-! zA)79BAD;6V9w|fvpQ+)oLbNx(p^CL|?>9V`2?M$`vKi?KpFcOh;TdD)`uwKWwaGs$ zKJG&eZ(tw3v;Eajb7Vy#Plt_l89U|S5pAre66>pijSc=2;Ei64pX+aICKDEE+wes- zHdLhAq&LRKjL1i6qSm#^ksl2AX6h@SU_&}@X!G5K9DY@ARK4F|LsY%r5XdF}r}rD} zz27*DpfMEf2fs^WJAXIY`umizd)e{T&`I@oL+7B@U3uo}b_h|7F3ZsS=wQ13U79D8Ol@>{~7*30EwD^n`i)rxjzl!?nS~;?9zdli-ktjy+H~q7JAdK)WKH*;kEhy?+#$+|L@%)?Ek?X;CFyh;73KW z8T1Q*@a-qTSHS29`$b=`l3pa`GeJWhbru?lenYyF;u(Sq@th(2?(6eY>TW~>sD>*nzSWJJ~Ehfd?$Hl|zLB(J2*!u-@V_LAw zUzhq%+U%llgsm^1;V-vY?0=S^yh^S?UVJWi7rpZ>vfC^+1NvLrRPKN9+-Q7dI*l7Q z_F1Z({{Q)2*{u`9W5@C3OBPn-7df!s$Ysy7cY`d)NwlEACGREw7gF6w{E!19X}98B zs*d9n)|>q~m6e}S0*hM5Y3J9+_}eT`7X81_XlO6`I@EDCE$I6>M~YjH^JqcA%aOi5 zc3eb@#ZaIlRD{i&I`%?a{%yzc@Uv#}uT8TbbuK_?JbfkZpo5dy*|;2&@KpSZI^q#nLqO9i`qEzLVCq*JEXkKa YU(c4p$gF^G(=*MDtVSo}wtD>k0X(G%@&Et; diff --git a/app/build.gradle b/app/build.gradle index 247ab6aad..5fab39d57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId = 'com.wagerrwallet' minSdkVersion 23 targetSdkVersion 28 - versionCode 247 - versionName "247" + versionCode 248 + versionName "248" multiDexEnabled true // Similar to other properties in the defaultConfig block, diff --git a/app/src/main/java/com/wagerrwallet/WagerrApp.java b/app/src/main/java/com/wagerrwallet/WagerrApp.java index fe1359e96..e62633306 100644 --- a/app/src/main/java/com/wagerrwallet/WagerrApp.java +++ b/app/src/main/java/com/wagerrwallet/WagerrApp.java @@ -23,6 +23,7 @@ import com.google.firebase.crash.FirebaseCrash; import java.util.ArrayList; +import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -226,7 +227,14 @@ public static void setBreadContext(Activity app) { public static synchronized void fireListeners() { if (listeners == null) return; List copy = listeners; - for (OnAppBackgrounded lis : copy) if (lis != null) lis.onBackgrounded(); + + for (OnAppBackgrounded lis : copy) { + try { + if (lis != null) lis.onBackgrounded(); + } + catch (ConcurrentModificationException e) { + } + } } public static void addOnBackgroundedListener(OnAppBackgrounded listener) { diff --git a/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java b/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java index 3926229a8..c6310e62f 100644 --- a/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java +++ b/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java @@ -66,6 +66,7 @@ import com.wagerrwallet.tools.util.Utils; import com.wagerrwallet.wallet.WalletsMaster; import com.wagerrwallet.wallet.abstracts.BaseWalletManager; +import com.wagerrwallet.wallet.abstracts.OnBalanceChangedListener; import com.wagerrwallet.wallet.abstracts.OnEventTxListModified; import com.wagerrwallet.wallet.abstracts.OnTxListModified; import com.wagerrwallet.wallet.abstracts.SyncListener; @@ -293,6 +294,12 @@ public void onClick(View v) { BRDialog.showSimpleDialog(this, getString(R.string.Dialog_screenAlteringTitle), getString(R.string.Dialog_screenAlteringMessage)); } + WalletsMaster.getInstance(this).getCurrentWallet(this).addBalanceChangedListener(new OnBalanceChangedListener() { + @Override + public void onBalanceChanged(String iso, long newBalance) { + updateBalance(); + } + }); } public boolean isSearchActive() { @@ -455,6 +462,19 @@ private void updateUi() { // String fiatIso = BRSharedPrefs.getPreferredFiatIso(this); + updateBalance(); + + mToolbar.setBackgroundColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); + //mSendButton.setColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); + //mBuyButton.setColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); + //mReceiveButton.setColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); + + EventTxManager.getInstance().updateTxList(EventsActivity.this); + } + + protected void updateBalance() { + final BaseWalletManager wallet = WalletsMaster.getInstance(this).getCurrentWallet(this); + String fiatExchangeRate = CurrencyUtils.getFormattedAmount(this, BRSharedPrefs.getPreferredFiatIso(this), wallet.getFiatExchangeRate(this)); String fiatBalance = CurrencyUtils.getFormattedAmount(this, BRSharedPrefs.getPreferredFiatIso(this), wallet.getFiatBalance(this)); String cryptoBalance = CurrencyUtils.getFormattedAmount(this, wallet.getIso(this), new BigDecimal(wallet.getCachedBalance(this))); @@ -463,12 +483,6 @@ private void updateUi() { mCurrencyPriceUsd.setText(String.format("%s per %s", fiatExchangeRate, wallet.getIso(this))); mBalancePrimary.setText(fiatBalance); mBalanceSecondary.setText(cryptoBalance); - mToolbar.setBackgroundColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); - //mSendButton.setColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); - //mBuyButton.setColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); - //mReceiveButton.setColor(Color.parseColor(wallet.getUiConfiguration().colorHex)); - - EventTxManager.getInstance().updateTxList(EventsActivity.this); } // This method checks if a screen altering app(such as Twightlight) is currently running diff --git a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java index e75543404..bc98ae17c 100644 --- a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java +++ b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java @@ -333,7 +333,7 @@ public void afterTextChanged(Editable s) { mAmountWhenSent = rootView.findViewById(R.id.amount_when_sent); mTxNoBetBalance = rootView.findViewById(R.id.tx_no_bet_balance); - boolean canBet = ((int)(walletManager.getWallet().getBalance()/UNIT_MULTIPLIER) > getContext().getResources().getInteger(R.integer.min_bet_amount)); + boolean canBet = (((float)walletManager.getWallet().getBalance())/UNIT_MULTIPLIER) > getContext().getResources().getInteger(R.integer.min_bet_amount); if (canBet) { mTxHomeOdds.setOnClickListener(this);