From 141374eee35771b0905c58a57457e75163f06422 Mon Sep 17 00:00:00 2001 From: ChococookieOS Date: Mon, 15 Apr 2019 10:20:43 +0200 Subject: [PATCH] Simplified and changed updated process to be more versatile and flexible --- QuickLaunch/bin/basics/BasicGuiApp$1.class | Bin 992 -> 992 bytes QuickLaunch/bin/basics/BasicGuiApp.class | Bin 2922 -> 2883 bytes QuickLaunch/bin/main/Start.class | Bin 852 -> 852 bytes QuickLaunch/bin/manager/ResourceManager.class | Bin 2395 -> 2414 bytes QuickLaunch/bin/manager/SettingManager.class | Bin 5898 -> 5978 bytes .../bin/mod_quicklaunch/QuickLaunch.class | Bin 6329 -> 6443 bytes QuickLaunch/bin/update/UpdateChecker.class | Bin 2513 -> 2634 bytes QuickLaunch/bin/update/UpdateThread.class | Bin 1825 -> 0 bytes QuickLaunch/bin/update/Updater.class | Bin 4851 -> 4424 bytes QuickLaunch/settings.properties | 10 +- QuickLaunch/src/basics/BasicGuiApp.java | 10 +- QuickLaunch/src/manager/ResourceManager.java | 21 ++-- QuickLaunch/src/manager/SettingManager.java | 13 +-- .../src/mod_quicklaunch/QuickLaunch.java | 9 +- QuickLaunch/src/update/UpdateChecker.java | 91 +++++------------ ...dateThread.java => UpdateFileHandler.java} | 14 +-- QuickLaunch/src/update/Updater.java | 96 ++++++++---------- 17 files changed, 106 insertions(+), 158 deletions(-) delete mode 100644 QuickLaunch/bin/update/UpdateThread.class rename QuickLaunch/src/update/{UpdateThread.java => UpdateFileHandler.java} (80%) diff --git a/QuickLaunch/bin/basics/BasicGuiApp$1.class b/QuickLaunch/bin/basics/BasicGuiApp$1.class index f2637210ddcb3090e078be13b8f0b5d8e949f2a2..4b94953974c73fa57aa11492ca861d988af68b32 100644 GIT binary patch delta 27 icmaFB{(yah1T&+}WJzXwPJ0Gs1_uUq2B*o1%=G|a0R|5M delta 27 icmaFB{(yah1T&-UWJzXwP6q~N21f>V2It9%%=G|aF9s6; diff --git a/QuickLaunch/bin/basics/BasicGuiApp.class b/QuickLaunch/bin/basics/BasicGuiApp.class index d376be1127190014039947d92c25951a27068729..c11e0d0abfa0ce9d9799f4e820e56b493b82ca15 100644 GIT binary patch delta 1579 zcmZuxSyL2O6#jY^dT4F{M`RHZaX@xjP-0|}APOQgfoPW~_X%5Q(( z{0YEr{CG*ZI-AjEm_}ls1b0>Sumn$6ETSuLBZnaiOvVNY*^`=Ks-ajU7}FxUr63nM zLgX=Q0wWvYK`06s3WY+}A`ybyLbsWrSm=BLw5BXUsf?`>w#2L`pOcCM+XTRG=~2T@ z=++S}VNC0XVzF@r+fgnfAR)l7cmiDv6#|(Pw+u5en9#!GLzWiSWmJ+fon)Ur(>11t z$3>Pqkdp}sH4K?h6x5+XMm=wLmAO^y9$TaG-Hp9d&%2rZCX<& zG&8DpO=z~wa3A*aUtN`@t!S6gCSk)mVt^9SqB_Gqbnq;9AhQ!)GWJU-#GJ4P};}D;7Z*d<+A76Es`#KR~ID&qD+g;}?!BK`|803YXKAtUAaLsc|3iDd; z=63S#MTQSi%I#><2#*J~q!}LDwyR;M0t4eRP7{S9r&DKDJ3;BFM36{o0+al_x58&2 z#t_F8zvgXjwkf&0;IMA$sxc`{dWG~MDIrre!ZEWUZbk(uXBf_6h8JZVXt3~v=!_@H zK~*r#fe}-C&3Kaj5KGr4TdRk&@HEcJn3Yh*fA*FU0ngw(U(DFn{j7w%QO!2Owz^+z zJxQZ89xrcHZ~+&E+vg<|R0aPFA+Ms$7a3l{%e+9|Q}HTZm+>0G@0PJ%^I&3Tf(m~F zm$)t0QQ@57ExgU=<@)+}B;?wnVp|PSR}YG#g3D{I@*aZ>p9u5;!-x2YOTJ3Oz{d=q zh$hJNNn@&M`vmPMR z8ZxCUF^uE1Gj!qvMkq`v=^w;HR7D4cco>h+=}|&#gzGPg?~)S7?1o>+@B7IfqRtER3WudtF#Atzg-Kvq(|@P0(J- zs)ed+C1%>F@`H5hCV7~6=)(ZXA>!Z!`l-eNOcEP$`V#!)uT}65KU51=kwFy-F1(Qb ZAfO93=%d($n@G{YPl^k)i{JIN?Qh10V{`xj delta 1480 zcmY*Z>r)$56#wmRlHDv6?f>^*zW`JKJL-?``Hr-B;= z`ppby;7Q@DVyG5AO@KC?9_&<6%WI^H@;VW6CCo@PnKBcDMk+dM z?vKYOb@j+HSu9ZJAC)W2upp5tjfbT_2m2;QsH3-uaL@or=a|Lc&P~I~*F~By%_& z4NV4(bSyMc-qg^hV+KhT2`ZgPK0fbHrihxKsv`)dkmjBCYHbE{4D&d}qxKf*QGVWD zTKKpGr#~8s#~P+%5utpM;Ypn4zuWg|3wT;I#526iQR;jSFQ|B4LIq#2SJ)X|#7lhA zQ7*mAPiqA^yL2q!Re?UkuQ*ERq_YgKgY(}UZH_nbwu-lSu3DnJgLAxI^-=sihWGIS zH`IFRJU^r67cOsJ)JF^|G$H6?hEMP*�cj3_fG{TwGCZ$c#~A9EgpC5~djwxXTP* ziV#bfGifuK>Whcc)M+#Lis5S!uq7wrb2?VArec-XYsJd9_>Kp((qhr{>kJ#4UluLX z7f)QX6G0jRjeSytg5ju4fDFypU-Hax%ypUx#ZA`75-Q zQAn$UKtMT)vL4WmhV5434ZqPiZNO*2n?WPR zo7T|0fffrLE{}!17WQr6z5(AVhAbRf6|o0a=<7u&#ts@DCCj0mP6W-Q4OK+Hn&j6I z3lE{{2`r8h_Xm|)l+X08VQLjqt{CZ`rWXsd z87z#uB-djWo><3ISMjWj!xYJ2X`CwdiiOv_t9Zl0yBRD~Z9ZJX1#(=laFJ?viJmX$ zxw3(8&cV5gd<&Mim(7~A(ggzT#H51+by7w4kl;Sr9qC6e0;D~NA<{gGK^oj4(mqTI oN3-=P*ra@`9z-5jvllJ2+adi$KpEF)BO``BMj4Ns#g=Bg#eDVv_^@>7-M4uTU)5LT3e~8)ee7zDF_q>T-G;m zareG}8*2?U)|k|diLc-rxNzgjjq%*UHq1=!Ip_DCbMBdYfAC*i`~LUS7XX*>a!32% znoyBs@FkkHPWwW$Ue>^HQ^yQu8PrRLqaRr5~1W$O9NvfttLmCTSWW<3h za$U!5EHVtWOZJ>)uUSRA!l1-wC$lnbNyl9&>wP(0vdR@(3d=g~V@14mhw=~P6nV2y zl~br#lVPc7+5Ipl!&>7|eJsPa*)8?eb!wgH)FmkP$ukBmVYke7MaEv33<1$p0-A;m z6m(3WD5CC|p2l+-lo`Tt(NKbs>B%e&-ZbU>d~wt4nu(fOFDF*)mQ^oL?;6SsW5c3+ z?6Zcia62c_66Zb9ZGPh;QoHcKhyN6A^)P?v+#yHl;T~Ug5`sMI*fIXlv0?tmu@U~n zu`&MCvBnNHcVV2?D;TELkK+g+ic!QdhKmT{8p22+f(+5^WyFxfX_zozQP~#G(kolY zyP^xFo8{!sV~9K;ypMEl9~(K&rg})w%=9VlJ>>ULdgm0%y**Cyl+#M@7otKN06uJ@ z`oHNJh&SF*@zbljYp9BEUPFXb-TeY}@yBb7Ts@k^hX%28sv%yH-XworHAYec`WCU* j#O4NAi`W6Ng#p$k_M6z!0JDjW`;3#TM~tE4{7Uy9zp9eX delta 805 zcmZvXOHUJF6o%iAj-3mW)D#TCwt;rM(1p%Mf{B;50&)|9s)eGU10CCe+SblM;=*+8 z(#*=OE4NxxRE$4B`18_m zLqiHTbu3_!q1Uy&>yEeV6uc6HG%}IQah=t1i)+23r){TL^0>I8BZp;%<0KaAwrkgS z?X2ZFRldBM%qht8dp4}iZGMk}yFA(j$Lqv3hD)kht{&+7T)Wn;-O(1k(%h+VQ0S0N z2F>*9mRsVv`AiyTO!vPY``BPx=;fcvPKH_dTnlDDM&DtqiN3>prJYagBbDDrCQp34 z-J9&kq!if0)E;J=72dM$?F322o@YLmoqTf?>Qs9Pg39cNqAM(`*oD=mC1@uc83k ze4(0o-fLSsUAi&%}=Wr1xIdr2%Kurjf4#HIxH Zh*(fHLURJE5WA=veM^Uoq1wK-_8%JhsLKEV diff --git a/QuickLaunch/bin/manager/SettingManager.class b/QuickLaunch/bin/manager/SettingManager.class index f5caf7b1f6835bf96224e798417e12d8ef3a9887..8bd1b12b8ba03b949c19f99b16b49e83dae5c3f3 100644 GIT binary patch delta 2293 zcmY*Z3vg8B75+}L*}HqQVasI`79w%U0|Ln=l!t~yEMkcwc_1*-jKXxA+~C5piJJ{* zZCxgz>M+_Fa>tGWBB*iYsU&uTL;*`NEk3HPk3v;IEf(Kzr4-Ze-aOpQ-M#;R9^X0V zKj*vu#*&jI>hT{A9s)2^Chb?}+Q&MuMPQ3YT6Goo;6WFPuuV{Aj7}S4w58`5)6(p@ z6)LvlVFfz`qgMsi21-ML@XFG8O-&&^5O(1aJZd!Cr^sW*W_#`w2X+cl{6AH(8+#S( z8G%_4j_ND*hztAhgz>h$u%Zi3Dd-lAvEl}sN*C15zqMX(js}|;`H%RCz}*}PhNDZO zf%?@;BY}F>*@LGQ95Ci8-q=CYBdtEv)S@eRMvyfWXI^V#qaM*47VCiqJ)+={KpV1E z21ELQUd6NMP|=I$T*$?rSVv*ikk^1m#grRN`=4DnhUo%Fgz>6^Vcmf~fwR1-DbV0E z<2mqG7Sb39wQ&0atG@bXy?(W?u_@vU>+AH011|}Loh-rMTzCbq8rhD?8NGPgi9)>Q z!s~d$sCD?{pGLEzG;k7cDfm}XTNVxUfZ5l$@HTXTVzng{Rv|d$!fCS+u9m=BeTg28 z2E!{`9C%mY8I*jDtkG9bd{l36;QbC~jhr=Vo!8m^Bgip!s5z+$KI}f^ED`yi@rml4 z_JhDX)C%)}wXM?5Eb{ zk_;JToJ=n(V3FgNMS^C5zGgkLCfL%#N&6b~a8PehMdM^;O!wukJ`u0cpRw6L9yVmd zgG(?T6Zqu7k4rHFK3s;0sN~eDFbOweGD0Xco*y;Gxe;lw1EgcA+iT>zXUck`&OJG% zZBAh80X)-NW}4Jd78Nymv(qS zey1pb-#vhBz38p$#j|xqJviKhBh|DXt%>7yzxI3rvmQX6-^$OOYGVO$Eca`Fu`Ekd zExFpS9Ut^GOB;0b#4&Tov51b8^ZnY3mOa~_nwG%J2VhlgcMR>lR&IY^|6SbtJ&r57 z@DJ_HL<}bm;2m>+CV>-iOj0xbPH6_i%;Kaj!!5WRF_ht6%*Gai zcA|op!WB$%CDY8oGhC10XE@5W4|8!G^YALJ#u?1VS%yA`Yw#tm#RV)tKdzG$ER=Lq zi5oR!QLSWSk>ulgDa2wa!V;Mo!%`{34N`$+@^kz`7NJgV!i^F@rRZ2LL9CDvekoA| zWF3AbF*Hg$R?3~YSvDak9atszVYO^WNOoY2bdvrPdDcd#$YZ3B@G+%InT=1l6CO5% zPw^R2c;p6rjyYejMf=#$FYy&QeFk^qYkWiVS+wI@j6y2YrQ=L@!w^G z6Q_-h+EuZOCQ-n!H1Q+Dvwx*}cpGMb*>Lpph@z0V=13Ruzkp-yXBwNS~Kn^WEuB)@-jABm8CG8Q^p#{JO%FGCuzJg&N%PM&+Z_b3`_4~B(MzYt|Vr>QI=WY z{zDQbo0w2${)ElMY#D)3%=?v?OJstvH#5(@EeVw)ml~&tdYGt3MxY$*iHY(N<;%)* zKbC}=NYvu2{Onys?H++r2T{4krmTXDeMy)+<7n2TiCsi=k3eMbTO#izpYIeY_&-q1 BH@g4; delta 2165 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 Q5@z`sd23?1DR24vFHjla`v3p{ delta 1953 zcmZuyX;4#V6g?M062c20frQmW5P`4+kwrmJP(cw;L8NG1Lh=I9m|zxgsiju!RHrkg z{o1K^(HZR&Tf2e!urg(wb~;Ww)0zJ2&;IG3w*KgJv3s@mC0Oh-nR&~1?{~j*&OP_# za@BiF4WHb-F$xdv8I~Qr(Oa;=fM4*N4!;tT z{~3|+J50Rl8j@Z6S_8q@20i{HEbs-KZm)mP78(i!!>&j;q{BUed9QQC>F@>|EfJ4L z4$AIsvB{ttBSPB!NUPT;cgs$<95fIpUP2maxL$F`g9!~K+YGo%S~aR8nC7FgtsGAT zQKAGL^ai*nNg_$bn&9%u&Y+%>2~aDfO0)pxCW1c5XLfk~vH`PXQtPIR+lC6QSt1K% z3Tu*Wdp1+OPsiqTyJfdpAy=Zjxypf%tS2iWz1ioRCvH=v;9Ocn1v<(nNP`h?$kFNa z`r9I2i563#IGa>XMdDUc0hNf`NjZh3{}QAx=nboa*eTvX#Z;l( z%Ot8s5mOvhlhu`4iRx5nI=?&`qvoO&64g@!K@;*GmI?92B^%V#Ts<|3ajA^fi1(!e zeG9Eqk7yNNNqM&Qb6`9N9U+(OmmNLo)j)03t|o01g+{BkQ=%@~B-)K7d0Qmv#w*M- zB!|0YKF2xWlM`txZPQV&7&qp|_t8V*9b<)dyF@$aVezHWq1h$TZedQ|S>hpRH#@^a z^)>@)Xh+}T%4fu|N5{1N_YzQ!hek1cHPZc0NB)uWdh(MfICj)m%+ixs9b2|Jm_F7dg^T3G`g zD_+-4;RgjjPx50NgHp#Kj;~Hm9Efg|Vril#-CqBPf=c@g?)J|R`t4V-b(-R)Dd8IF z`NgASi)Gl0TI^%(e5}iU^umul z2=MAKj&WN~^V2g3akU87OBlgL91%M*7SR%MG-L5tF%z=S5h|Oe@@rHX-#CFLhNPnN z?ARkT|8 z&9!CC9W&ITQu0jG+Rhnj>t|vcx=PCx>L`s@XmjZl^(fR|s?bjHnYpOsX%=-H=`2$o zo@K8K_V#n^<>%SMFEE%hY}T_Z@JqsGu~_!tTW(G|D#%F#QRftri`=5ivPjdSqc#z; z1+_&-Y}$a=@&3QSS*;Qqw%4@jM%5k_{fV+!A}qU_xJMWXLd;UI7PlxC*S0p;3?xRQk0_UHp!2kdN diff --git a/QuickLaunch/bin/update/UpdateChecker.class b/QuickLaunch/bin/update/UpdateChecker.class index 456a3aa91a287c55a447d725d49cb1b66f76ecd7..67e0ea287a98ded1fe211f9d7490120dc71216e5 100644 GIT binary patch literal 2634 zcma)8+gB8I9RK`aVU}^YEn=*qq#1G*BOwLEL?y`;%tZ*bY}lP(WZ79~W>qZ9((Yw9 zyV&WWjt{Glg0H#Lt5 z1om2SLq##lHIzYBP$^Ko%)g2Xl$Svuq@e_*0+kUnX$+@lCk=a4pG*)_C}PF*#F%cI z@|+_E+-cJhSQA+(83a>p8>iET<3<<5R}iLk4?xmzJE9iT=BlVexq^CuwTqk~va{Sh z@wja`P7oVtFlJdZCM~AprsZt4>?swGW0Qi7tVn@wPD{fR*v#xs8ScQ`us+L3TAG$; zt~pDRkfh_Ba<7VYXq1WDLTEX)r7}a!V-kO}h8DC6C^0LU^om~ZQz(d}mnsU{1s?Md zn^uQxjG<&I?Xt9nJ}d2YXxN6Q1S*K!$D&eG4lMP23}S7=(-P};fx4XQB_h&oH@SYd zBWbt5?+y(+(Zd?iub(H4K632m&~q31q~~1%;YXeeWTfle`G|d8JdidMal=;8kMbY} zm_L>^$vUanhd~AV3+5?0=eWkKhUaiVU=7>*gBTUiWS;YE>3B@TI9?P8 zx>k0E*|hnj7J}@;F%8FYg0g3A(>0Ec4hqz+1e49zhL<&*l!g^{Pn@zUbi@=)7ADVI z8ye!^5R^EngvrgcWhI-(mk&q~Qw(~STok5;Q<&j`Vc!Vs@EgePJO5_NQT&z2kz|vz zlu4*W6H8bQOP&H(=xMIVe1{H=>^~PXQZDnW!I7esDK0#^xWGyE51VIJAzf>hDupUhj40E$R6D| zt}U0S7nsik5d>$9xiLMFrmoZT-O@ z-e)U}?LQJ78X1-q`%uG2_?Q#J-Q?aRk~*tN(>%LXsKpwdxU};2!~=Shb{{ODj;7W|S{JZxBDDSv8mhNc&g04IqPrP1 zEud|pHG{45=sdK5F8Te;JbH&0&`+&rdjjD=XwMz&&0r{Wh>vleN0yvlSaObL&*Sak zKn6!Mm}tx3C8_;NPf56BqNnU$cd)oyxq-%TS*_C9QyMM}y(+nC%TK5dtHqsRHPD&C z^!Q~()GD>XA0PfhT!|Y9M)ctjBdq-b4fL^7{{L!hK%9e_=EJMx&S76D$tXmrHFBzr#hEo?Gw( z&fqLd*o~_=hdE-{&89t%*I1e>=)>!{z~o=2zc=tEOMVkoxJa5x`vJU#w`t`PZEr*1 zA-Y=eI)N+@eS}N!k8sVb8QO1?|56X~+dBL9r|AY4=-x7U9}|`5Bp{ literal 2513 zcmZuzYj+b>6y1{qW(WhN=^I)oAhk`Q5k;l6+9xfAzOWB1h%%iF?T~aPOeR2mfr_HP zgl{Zai=-@Z>39E--_(8YOw&o}>T2%mJoY(fpOgIk@9%#CxPV_(#1u4^3R%OqGD~t9 zTer-d<*7(0IC9sxZ)Ea@vzD1#y=$4ig8fC8&)n2c%SXrZGYj%+KtarQ6to2owwoC@ zd}GQfl>7zXvy2T2#N85AkJd=cmHenk%q}QM1rpLTm2GE@%87#OQCpc(pxv>o?5bhr zc$`p>%-c?G(VejK77-5Gj_rS}pt<`^D^oqoG&JUBtt8@T){#OBVRiQ`C;oa2901Yj zsKXHr?MiSyuA?5hc?-p+Zw}nQ~D8QF;jk zlRB<|6sjYF=$kOV10niC4CA;aFiex(I~ZzY0uZx0DU?iN9-pYVuArk@yd@{+xDT8w zZqdK|(6kD^?K(OZ1pDd=BshD7bYAoflgwNa>LhBzb|6!8RVB(#+m1C`+E}%`MPpS^ zJ~i!{Mt<4wY;g`R6aKngWEV{D)!u9;g^DM32(lMIN;L%%BIP?6cz;OZoiPg1n~K{t z(<10u5}QdLD|w#f_{)}8WX!VJCPY=UIxMV`#GDP;iM(t08rH}(Hh@D$Ct)L};%=?o z&7yB@=*VM3!9g0I_uPWz`I`#5!ooynMp)12m8hkwqkwyyA`d*?_ zCJE?%0A52W0BCsTx`qb|bWx%0=YUk>EHk6YvPv9JjoYN!4dQDZ-{4zXkRV1~H*Xot zPNMsU=)8VB((xFKOBLyn7`0Mi(dA5K-S(Mzx5yOr6hqwjqa6H`W4Q$Z{gkg*dGJOtYLGI#q=guzucjID zXa%Oo*-Ol%?!3Z!1&-W%k-Z<;->>f5o=^8O50q|uF3}BPxSE45jv{ckM)-Vtiv#4TDB5ou8V!7xMM`5`vL2sXnAItA231z&}c ze8;-8KHIoDev`Nw&|JmUEOUF2cKb=8OT;#aV;G9y=nQeRgqaO+@V5%TUt}V`r;_9z z?u0Pv1&lahZ2Nv8{c4PUn-eKo10&Wj!CFp|6H^hN^`TFFx6f;#Pj*@8^J(Z)P+9uq z${PMCjurgGg(UvD7Dxv=t3Zy+&YK~SS^m8etgRxp!SI?0My2*D}Ef%+w;b~|WNFGa9eA|{qO9`}8cLln#p~|eJ?wOWK3$*T9 z3j%HBdFgHowBIys)4N6S_{6F}Y^G9D3AEyrj?bWL=n>Ex9cbtkIDH%~=eef6amP2U zl5!L1$7u}%0s}kJmK(}V<&@{qU_ScPF^Dq)r#6%~C*8ZIOZ*l0g+Sl z(2+o#H?pR!7W|!}a`O>GlG%zOtySro!FNp<^ES;Y%ac8Uf&qVA-)8|RX^@%SSkSSEB_^nzn^liM$=pYQVns(TRFssZywLW6j#aGD)~hT@Zl&U23^$t)m|c=?>DW}qZ+OaLtjsQD zZ_ms=oqd?e0cl#|JS& z+2ap{$6((-kY*o2DK~U%2BqvYICng?pq>Q~64(m5$EgwFV+k{h^_B?;!W(X&`bmu? zf%+qp=G&BahJBuwPK}3&T*Y?{6+{;3X&i*4`<}!Isolzd8&`4>@sN|`f4GzJ+*_#U z9OK%_uYI)h1U#EOMAzgSbQj(rSvW%95k5b}@GE?IfQ!kmxg6lqAuhkhl}}oI+h8^Q zNvrP~tZwXwfYMwC2pX(&3_Y0SgI_`~_Rxo$lm=i45kKMiY>#vi4;>rQ$|3H?f8{ugnk}a=AlI69RNJXMNx9J1qV}Ijeq4gCW<&N-s&8$qb z(51N_#%bp;$zU1WQ#VB+rY{BmTv8la= diff --git a/QuickLaunch/bin/update/Updater.class b/QuickLaunch/bin/update/Updater.class index 8f4b6d7063173e1dfc9ff938d40cefbe7b4701f1..c28f1add03feb117dc678f839a4fb8c10fea59d9 100644 GIT binary patch delta 2393 zcmaJ@dw3jG7609R&FpqU=+K00(l(p4X_MwL7(#5eg$9y7-8LoLB;BU84!e_NnsqkW zoo&-9u0nmG^dnwTQxT*nRY9ez?#3=fv04j0i%)#v1Mz{cN)@D~aPDs4^W#(hx#!+9 zXV3YabAI>SeYW9rz3;J$#~%jJfs50=mg%ik9;o=X`Pq$gs!ZD<2U(KBX5 z$Bm>9RYcGNLQ6G_vutNCe17hA&}&R*BG47Fra!FM|qwHrMOda;(!N7jZJ>Oym$e6_2*=*D^l8^l+~ zmOdXku}PHT4GcFl3cIEJNoQBbW~y(Z#yI9>FJ`7@~f*Y`l zA9L0AzLCK-W+cfk!;K1}qTQE7Z!yL&9MJ`ixw)SjL@HHIb)`yJ**1^g4r&iO$}`&q_6A84+RzA6M`R z+{gX$DtQK zcX;c=$MKMa0>fp+^2T**R9ib0HHy7fa6;fLFW!Z)tw+bVCG{w^v=U!d@D)5l7>y~D z2;gem*fi+FN#X2k{E)9QB;ypN)sslaW7cvz5KHW{;t4$#D9r^QPUA5Nk5UOo(`HKB ztee*Qw5i~m_!b4!W3ep>+Z-{Yy5QXOdB0P}clblTg#$9a$KapibgDQv0%_}2a!Yue z!j^)}4Ik0M4Z0PJive^-44^akp@JWY)I9OxW#t>^1^9t^7x@Y0fE#~dXy6H{p~;5~ z{-)sXg6K_W8EvjNh+^`K9|KzupO=SQlah*mWtrAT}jU*%KUXh1-R`y?|JxC6AGy+waa{bQa@5PXUt=fngS@Sxga*EZ&;KLG@j^ z3=R^QJl+$O{8A3L`aRwSIF!Tf+r{yN1S+a?ax6qv$Ll{;K+Q_bk3~6w5?? zs62>0H#c^0nW9>v{SFvG-v5cBiK@F*-MqQ2u zR8epJXh$^-@)}%=g;cf$SJJA zc{HTPVFra3 zESeB2%Z$v?NM^h6WBi2Z)XvKA1a6_s`iR6o#m|VL!*~im$1fL%0XO z!mo*ZS=@x*;J3uz^91%O{0=ffa^q?Io^~A+=xO|c&VQUEZ^_%A$lEi-e|oH>m#BiW z1SX+e0*&}i34;=168d1ySKVHMORojN7nkT!3g#raTM*&@ z@FkDT5phTUIs=)+*`fbse~#E%@~ literal 4851 zcmai2349!775{(9CbPSpBxG9(;b^x9Z4%n7Ksihbv`w0lHb+U)ge_O6yOU&^&CD`0 z+q5DgR7Dg~L{vaq0i}4`2%Aa-5fqif3sF1~FTC#q6{-JkW;WR+q5S&G&Ud`;z4yKM zf5+FyUb_E50Bgi?3d#hkbJ?`!>WOXM$5s#$IA)i&TT5g#b2!nnbC;fS1$0?JyPy)TS(J)X*I_mo_Y? z$+Cx|sKr95%y9w>>x-_?=h}uj+|to7AW7;}oPZO_U|4rsbGEIU?tpGPhGlwJYmeY$ zELO0n#5{d_9akSy5yuizSvgwjSYLu+CAN~iOCh>8)}mmUz;QF?^JQvJ%RSQmy;)twI;=+QC+({@~<;9`cp2d0u;6_?^N zfr#O3wRMM4=Y`vLd1i+S4Ldm}oL-JoKQYmrM14qlGYWwr6~i*;RHrh!X0{nNbC+fB zRbU9Ho@i5d6We+_qZq+T`IAvG21a<)VgUKE$~Y}tgQ)K?v$;YLN09|HO?{ zC+AM96~!LBPQhN9e@rvAVckyj>8{Jv*5yxCTv-Up&6+)Jl_;*l)e7EFn$WzQsN#*d zhVi{y%jEQ)AqH1*3JOd=N7jg7AKt9sO$BQQ+NyX9uA_?`J*(LoJyKdq{6yrXr|V@x zdz--OVtK*-Y)ya1-4jv%2pg#$my~C6la01**@b{Qxqkam&POnTdlh_^j`3_f#|@YF25eQ_hdhzl(S5-C#8FNQpF=)yX4i>K37YP_S;&D82B>zd3^PBX|am3Bl(Joui|U;xxPmx z;84BS%{(sUJRz{i$1HPRmzEi_>@hvf{VFx{N^g| z=r;S2D87krEBF?{J)AQfax%0#f_@xYzU&*9jgrwe_Y050z(l8KVUHP?&3RFt!-%3x1 zWv_F)Y>HD1uF{S*=tbG@MBTA$(9a2oc9N$vESSD7UN6IbZSK4z+~-zWI=f!B(w3|W?CS&IXT zVqh22FmFjsg8sJ@+&mqh(Qr;Ml4Nm-^jVl8#Y}TugchzZEPYb2`wE^FXZtKm47b)> zo7G4awPELxWtA6$U0T-Tq=-s^Q)ZWdIgH7)D#EIW$gZZ6Vd=PzT$-l})muvI8J%br z)!ZIx>RR8sMfO%f@tXEz-~uXAG1R5mqr_96m9ta2%*KpGzg4qY>~?FMcCZPtTQi#D z=yYSakS>|ir@Lk>A(G2k*989vXa1IR%tso3Bb+7p_4XPk5k16(GN}Bm^cEMOieuF$ zKs9POW4sj(m*2rrluLI_p*9(tU%RqqlHNKskK;E^;G`)mO~#f_V#V@28uD13$7#!B zXWg=2Y$3(j-BV~zPGD_pL&XDVOO{Wdy)PM>z~;V5bTx3;x zf22857n#C7DRL6`^#rfUo~! zu_r4I;~NLj?$5tdn4jg(zgL*ApdEh@`>`Z$oWirb?sLgW{CpC>xDU@a-izn+_zg*Z zcMze@L-hVrqDh>_dgO>Uu?dfR-$CYXIUi z7Gn(`zAeO6D_@o!SjKlt9KBeMBu>E&tY9Zx&)%~ESECWvv$MMyt1yYxcoa>PnP3Sy zO@wi}IGztpaufA9Q#9dhaR$y2=b%}vqpMS&HAPhd{ zOtc9Xo5VQZOjlyFxCUFq&FB=jp serverData = new HashMap<>(); - - public float getCurrentVersion(){ + public void requestServerData(){ try { + Socket socket = new Socket(); + socket.connect(new InetSocketAddress(InetAddress.getByName("cookiestudios.org"), 9999), 700); + DataInputStream in = new DataInputStream(socket.getInputStream()); + DataOutputStream out = new DataOutputStream(socket.getOutputStream()); - feedback = in.readFloat(); - out.writeUTF(System.getProperty("os.name")); - out.writeUTF(System.getProperty("os.version")); - out.writeUTF(System.getProperty("os.arch")); - out.writeUTF(System.getProperty("java.version")); + StringBuilder data = new StringBuilder(); + data.append(System.getProperty("os.name")).append(";"); + data.append(System.getProperty("os.version")).append(";"); + data.append(System.getProperty("os.arch")).append(";"); + data.append(System.getProperty("java.version")); - return feedback; - } catch (IOException e) { - e.printStackTrace(); - return feedback; + out.writeUTF(data.toString()); + String[] response = in.readUTF().split(";"); + for(String str: response) { + String[] keyValue = str.split("="); + serverData.put(keyValue[0], keyValue[1]); + } - } - } - - public String getDownloadLink(){ - try { - out.writeBoolean(true); - linkToFile = in.readUTF(); - } catch (IOException e) { - - e.printStackTrace(); - } - - return linkToFile; - - } - - public void upToDate() { - try { - out.writeBoolean(false); - } catch (IOException e) { - e.printStackTrace(); - } - } - - public void close(){ - try { - out.writeBoolean(false); - in.close(); - out.close(); socket.close(); } catch (IOException e) { - e.printStackTrace(); } } + + + public float getLatestVersion() { + if(serverData.containsKey("VERSION")) { + return Float.parseFloat(serverData.get("VERSION")); + } + return -1; + } } diff --git a/QuickLaunch/src/update/UpdateThread.java b/QuickLaunch/src/update/UpdateFileHandler.java similarity index 80% rename from QuickLaunch/src/update/UpdateThread.java rename to QuickLaunch/src/update/UpdateFileHandler.java index 456def7..0f0b1f2 100644 --- a/QuickLaunch/src/update/UpdateThread.java +++ b/QuickLaunch/src/update/UpdateFileHandler.java @@ -7,23 +7,22 @@ import java.nio.file.StandardCopyOption; import manager.SettingManager; -public class UpdateThread implements Runnable { +public class UpdateFileHandler { File sq; File qlN; File fMark; - public UpdateThread(){ + public UpdateFileHandler(){ sq = new File(SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); qlN = new File(SettingManager.getJarDirectory()+File.separator+"QuickLaunch.jar"); fMark = new File(SettingManager.getJarDirectory()+File.separator+"f.MARK"); } - public void run(){ + public void launch(){ try { Thread.sleep(2000); } catch (InterruptedException e) { - e.printStackTrace(); } if(sq.exists()){ @@ -34,17 +33,12 @@ public class UpdateThread implements Runnable { else{ try { Files.copy(sq.toPath(), qlN.toPath(),StandardCopyOption.REPLACE_EXISTING); - fMark.createNewFile(); - + fMark.createNewFile(); } catch (IOException e) { - e.printStackTrace(); } } - } - - } } diff --git a/QuickLaunch/src/update/Updater.java b/QuickLaunch/src/update/Updater.java index 3b9505a..51e23c9 100644 --- a/QuickLaunch/src/update/Updater.java +++ b/QuickLaunch/src/update/Updater.java @@ -1,10 +1,8 @@ package update; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URL; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; @@ -18,66 +16,52 @@ import main.Start; import manager.SettingManager; public class Updater { - - Thread uT; public void checkForUpdate(){ - try{ - UpdateChecker uc = new UpdateChecker("cookiestudios.org", 9999); - float tmpversion = uc.getCurrentVersion(); - System.out.println("got version: " + tmpversion); - - if(tmpversion > Start.VERSION){ - String dl = uc.getDownloadLink(); - Alert updateAlert = new Alert(AlertType.INFORMATION, + UpdateChecker uc = new UpdateChecker(); + uc.requestServerData(); + System.out.println("got version: " + uc.getLatestVersion()); + if(uc.getLatestVersion() > Start.VERSION){ + String dl = "https://cookiestudios.org/software/QuickLaunch/QuickLaunch.jar"; + Alert updateAlert = new Alert(AlertType.INFORMATION, "There is a newer version of QuickLaunch available\nDownload now?", ButtonType.YES, ButtonType.NO); - updateAlert.setTitle("Update available!"); - Optional result = updateAlert.showAndWait(); - if(result.isPresent() && result.get() == ButtonType.YES){ - try { - System.out.println("here"); - cleanDirectory(); - URL website = new URL(dl); - ReadableByteChannel rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); - fos.getChannel().transferFrom(rbc, 0, Integer.MAX_VALUE); - fos.close(); - System.out.println("Done"); - try { - ProcessBuilder pb = new ProcessBuilder("java","-jar",SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); - pb.directory(new File(SettingManager.getJarDirectory())); - pb.redirectErrorStream(true); - pb.redirectOutput(ProcessBuilder.Redirect.INHERIT); - pb.start(); - - }catch(Exception e) { - e.printStackTrace(); - } - System.out.println("started newer version"); + updateAlert.setTitle("Update available!"); + Optional result = updateAlert.showAndWait(); + if(result.isPresent() && result.get() == ButtonType.YES){ + try { + System.out.println("here"); + cleanDirectory(); + URL website = new URL(dl); + ReadableByteChannel rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); + fos.getChannel().transferFrom(rbc, 0, Integer.MAX_VALUE); + fos.close(); + try { + ProcessBuilder pb = new ProcessBuilder("java","-jar",SettingManager.getJarDirectory()+File.separator+"Squirrel.jar"); + pb.directory(new File(SettingManager.getJarDirectory())); + pb.redirectErrorStream(true); + pb.redirectOutput(ProcessBuilder.Redirect.INHERIT); + pb.start(); + }catch(Exception e) { + e.printStackTrace(); + } System.exit(0); - } catch (MalformedURLException e) { - e.printStackTrace(); - MainGui.addNotification("Couldn´t reach update server", 2); - } catch (FileNotFoundException e) { - e.printStackTrace(); - MainGui.addNotification("Couldn´t reach update server", 2); - } catch (IOException e) { - e.printStackTrace(); - MainGui.addNotification("Couldn´t reach update server", 2); - } - } - } - else{ - uc.upToDate(); - MainGui.addNotification("QuickLaunch is up to date", 2); - uT = new Thread(new UpdateThread()); - uT.start(); - } - uc.close(); - }catch(Exception e){ - } + } catch (IOException e) { + e.printStackTrace(); + MainGui.addNotification("Couldn't download update", 2); + } + } + } else{ + if(uc.getLatestVersion() == Start.VERSION){ + MainGui.addNotification("QuickLaunch is up to date", 2); + } + else { + MainGui.addNotification("Update server unavailable", 2); + } + new UpdateFileHandler().launch(); + } } private void cleanDirectory(){