From 70ab9ef37da922659a5178510ac15814761a9578 Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Fri, 17 May 2013 16:02:32 +0200 Subject: [PATCH] Updated turtle mode icons and fixed tutle mode status indication. --- core/res/drawable-hdpi/ic_action_rss.png | Bin 1140 -> 1368 bytes .../ic_action_turtle_disabled.png | Bin 853 -> 1104 bytes .../ic_action_turtle_enabled.png | Bin 742 -> 853 bytes core/res/drawable-mdpi/ic_action_rss.png | Bin 760 -> 909 bytes .../ic_action_turtle_disabled.png | Bin 571 -> 690 bytes .../ic_action_turtle_enabled.png | Bin 466 -> 571 bytes core/res/drawable-xhdpi/ic_action_rss.png | Bin 1492 -> 1716 bytes .../ic_action_turtle_disabled.png | Bin 1225 -> 1660 bytes .../ic_action_turtle_enabled.png | Bin 1024 -> 1225 bytes .../app/settings/ApplicationSettings.java | 4 ++-- .../transdroid/core/gui/TorrentsActivity.java | 13 +++++++++---- .../transdroid/core/gui/TorrentsFragment.java | 1 + 12 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/res/drawable-hdpi/ic_action_rss.png b/core/res/drawable-hdpi/ic_action_rss.png index 1c5baa20fceb20d25a82f1cd6ee3d5a89f6e5498..6aa10203b06fc7119c9aa841b425d40d82c236af 100644 GIT binary patch delta 1350 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 JPDHLkV1mBlgEjyF diff --git a/core/res/drawable-hdpi/ic_action_turtle_enabled.png b/core/res/drawable-hdpi/ic_action_turtle_enabled.png index f132d256ce25e4cd069d352a44ae1c2db11f6a70..1532eb398d80a84ae002522cecc8dd7796c77a05 100644 GIT binary patch delta 831 zcmV-F1Hk;|1=R+SBYy)NNklZ*%GP$o_uOIVxJcsxhY&M%!zCUz#chBTbjsqGQ=MBLA2vz4{*Yzc_RQyDbYJF2U41eKIw4|T*N}8BcMZgWm0uqTt ziX@|4-gP8z2Wk-kcO41XWb#W?Xr^2)r`OsqLQuy&(Auz9H_~|sFOzQ(ZgbqvaRM!O zDwU~#NF>tl_xo?!Ju2<=#p+nd{vg*&t~|%=l2sg20mH+?mjR1e1yYQA!v=mhJ3IT+ zE{>@H+JEO7uIvObxE{x*88LEvrN?iZ^|(xs^f@4&h_za6kZPRe^2h*N^Wt2WVvAUu ze}wbTE#m$cW+{nS#c6blWP42#eMa0o*B4^SKA&%eIG?BOrq7vlNyphgjGMQf;NO)<t% zAtC+`FGTD@#1#fZejHR{I8Blf(YBC(jB9BpNrebr8!m#eU##c;9e;Z6 zIKdKYEbjsFuM4-XlX!~9`ZK2q#X8z?J2)q)#sJ?L@LoH`vn;@A0=L&`0d6}i!`Bs% zIXL9@ysm)T4$JU$1!NAnJ+CX^w!<=fT>+UxZqMrqxb3hE|2KF2J3zSppqKyv002ov JPDHLkV1oRTgGm4Y delta 719 zcmV;=0xScpQfP!TMw5>RYJ2nvF~&+ot#Ve@upXXcF| zFbjv}?c96joO|E=WKB!_$(FeOret8TJD56OgP_0|`N@lM=G#+n7b9Am0ngd9c<~{QR`H{1^ex z5m(ay{9AeTf!#U&2gFqUl2*MM2DSBYEhSh0}sZ+|3DgJ))ad@Um@G=O+*k+*^C zR_QDL6N&f16RNGsS9;0}48pLl5=(fHs(lIJpIxcS3|xn-4d`yuh;6e-+YAG}MgMV| zA?rC{PDJhh{h--KXvVd#Te(f_6~y1E$h#n{>Lfa3Cdl4gFwr}{>(==m=*0X5R)Fd8VPKd^I&u@~$~*>in*J;jfq9)DT2Cjzrd*u<`&ztSk4pzGGsAu} zi|#Ypp+?Ju=M`aOBj1L=mU&|j;ke+Xo+K9or-|1kOX9CFsVeXM7!$hJ>@dkM;X2_= zWD;BqY$N9e7-zy;z7r}B6Ki-K1G=FHm}N7g_f z;L7E4O}zVo+ka~WMrvYweEiCK3OvL8oj4q1!x@%-6xajQ9h!wb zrxFDUvbx>w?RLAplQcA9bOGbN6rLo@Ov8>s!{jiD*Ma+b?a@ z*=4iY?n#?8+$9aOiZX@y^1d#BemllV9EcbE-F{$LYCxoxACLgVScZ?J?Ql3O>=CN; z190hd`it}f)xzVXGQX_t_`d^*DqWSH>mNv{Tn~}Sp`lvmL6yC{Bbm$wLe}*0Dnf|! zA?o6_UdfVCDoV5gQeVzNqgaaM2*$VHxJUGdQFVT`Wj0(YTL7D`z(11l!Z1CAZw3GW N002ovPDHLkV1j%or#}Dy delta 737 zcmV<70v`R12lxe$BYy(FNklNIHEC!P!Lp990A%9RvlBAfWBa;Be4>Nf$ zm=I|=T=tia>yWq-4*W;JzWi*C#+^-(XotjOpF|dcUM4K_Cf%c60&~Culd+C@34wjp z2s{m9zJ*2awFvJ_G7_ti8^NM6G8snK%4!4#1EnbezaKIaX>S0B!2DW?Kw$Y;3AD3d zh=pIWjF?yUFn=c3R^2Tz1e{$FcnuVy0Tg`;JhF!NNiegLH|ina>y`1FpdW>Q+yLHK zO8tB#5-|k!qwt3%-wNbT;URl7R1Fo2>3ca(YS_@`yL5hR#(9^(8pMh5zr~CQ&owXmKYC&AEEXo6y5Mh z9H6cP=_lCA*jFR54cS>Q0bL>wfihigb@#+64Ba(D(~)<;Y|ul0pY_i}YEF8q#&|&2 z=w(wl1%Ih6rtPS&Y-Q}bjkO_nfI<2WdfvH3Jx#_K0!pkmp2E%4PguK~vD-#K`(N=_ zl5V2^m-U}k+pUiw(8i*oN8l*+-PV4@Sce&EMn16qo!*wzd7yJ)q|`znypBJxt{c1q z%7NoR2aw8JpyX50-XE}f7xJ0am544RHC@NygIdIq&qLPqAX$s0b0Dwxpd+r`q;Nj* zzoguwRBqM%o)-xj@5Q(dtWl-Xvs|7~^61R3`p_s7A3e)ofkOD@Zhqs>sNsQsmZcal T`)d$M00000NkvXXu0mjf50+kr diff --git a/core/res/drawable-mdpi/ic_action_turtle_disabled.png b/core/res/drawable-mdpi/ic_action_turtle_disabled.png index fedbfc9b5d15f33851c56212a2cc218fae6805a9..70155517bac5d22ae540930fab92b9b840276438 100644 GIT binary patch delta 666 zcmV;L0%iTX1hNH?B!78HL_t(oN9~l$YZFlv#+#QJgGEdsnlxgnpxC?zow{$w44W4%vi{()= znf$)p`$Uxk@p#-=tJUTp6d}K#N~NlsbCWuqZie}6I-O1+Vq;JteFcQW;oT6-k@3rH zHoGh*aJ$_*%x3cmgiJIVjio}NuqKc3`Fu9!_T+N854^?hbwvTOSZox~E090QWHPUm zvV-J^!C*Lxkbh;|kc5hoIGzi*HY$o@o%I&(-BKkW8jX&%+wDt?yD0yp##)KcWHOzB z@G$YKj02442wK@ZvIV}c_Z5Kc7J}x<`~jK2QA6Gx<8(TA+HAJ*X0y2_2!a6|KcXVM z--Gv1QGmESeT)tT4{l|Z~+??I!{c$~R$9I7$ZmV{!h!2esRQz+It z^>c`dpMS!^->SWrke&i)s|g5?QMI=Nfxs+eV*n@Q9U)bBwOS3ZK266g(gkM7rsVB5 zumF$8vzH5Imdxs8{RP0sN_HaBMcjE}?%>D_&fVx|zqGD&5$Un>8UnI_JyQe5`R_yY zIRt!V&!U<=eXn9QApa7h3D6wS9MBvXx&yxezY{SVFvXt*D*ylh07*qoM6N<$g3cjH A?f?J) delta 546 zcmV+-0^R+x1-k^0B!2=)L_t(oN9|QjO9D|8^`$g1^g$S9L|_|RD1L?;30$>l+oqsR zw6skS)uK&{en)L0T1rtaS}JXHOfgzSxzZqz9HEpk?Yt1G)qM%K@*~>m-CM;_jHn5^J^E4bSsu(SK;P)b4%4M|P z29h~B5d^)}>-CF7A`wBX-l`By0Y0B^1WDIHGOLyxLhj1t@^L1Ud6MItPUkrGMpLQO zJ$~OCCod;;Ah00kpO2`)x1R<;{z-qM)n9b%8z&4hw3>bRu zDNM|DGMRi)G_iccJ1l9gsWl0Zs3#A#h#_qW}N^07*qoM6N<$g4g@{IRF3v diff --git a/core/res/drawable-mdpi/ic_action_turtle_enabled.png b/core/res/drawable-mdpi/ic_action_turtle_enabled.png index 576931edfa6d1fc76a6d2ebf0ed94a54e902906f..fedbfc9b5d15f33851c56212a2cc218fae6805a9 100644 GIT binary patch delta 547 zcmV+;0^I%51G@x}BYy${Nkl!sI|O7&M8Z zxCW9rIS~ZC)$8?(L?RJEtlp{+O#wciZv;u#K{BhB9768O2Jr-jN{G)l-95d z?kP;nbuyWJQ8cl9!{hPLGn;2ftOdzRl5~~* za=BNn1Wl*F<#H_;jm9N~WrP&4N1IH-;vtqcDfi=C34e*kcMoG!@`*I3_T|`=2Ta38SKOwTj$sw-vY$ z)-Z5cjN3s+4&dWH^us2)7n37gu_VLAW8pY%8Q&Dp@tqw33t=}fn*RmeAZcj~f16M- lRew#W3mniL&>fIF@BvNlt08b+3Zno3002ovPDHLkV1gV~`dI(~ delta 441 zcmV;q0Y?721kwYLBYy#zNklrFLiHyn>Y7-@AvzC=e>7K zF5_h~_Roa?p#z}<|EmMm+9~G7A{Yiwpak}fF>+nk^6CJ_O@F9wfSDAR7xoUpF+uE4 zQ>Xzj??!YJOeo?v)VBz6m*k<*$6gO8Q-6=wodG!533(6XJ@2drZwH)<5$Bt^UInwD z0bH=Z<`sa$y^+|Er+J+Az@KX{4hCX{8UZHN0GPK&&(-(NeKNj6Iw3&8836NE2)kg+ zN7aK$`O0>~#N&tKmDdY8VBd485bl`}HB)uoPNRpFO} j5Fm6QbRcvf^A3CfDw=H}wO;Q`00000NkvXXu0mjfVQ0$h diff --git a/core/res/drawable-xhdpi/ic_action_rss.png b/core/res/drawable-xhdpi/ic_action_rss.png index 762be0e538959faea3a9fe6270947a0a0da6dae3..03365510e9b7ee4efcd3ee4f11134925811cf2d1 100644 GIT binary patch delta 1701 zcmV;W23q;l3$zW8BYy^aNklZ@ zDM2h&ELiFMcrpg|iK7Z-0xh9)upf6P0^{1+!CCVECkM`xntBWeH|8ylOL zq@CZ*(N5-Z|8eMd_x1JlMl(-T03iGWpxy@JfoLX4R9|?z4sRy`;Y+u3x&}amhv+u9 zgp=IwxLXih0e{fc)YOPTkNb7y&0vcr(B2;$9PD>m2uA=khxeinZQe0OZnZHEO0P|aBpw#;aCB9$05#lsX`Cn1?T4GN`C<6c4*YY(8ff9A$bA-?2icm zy#Emgrj-Dg$F;PyB|HliJ^iSj8d&J(@?Kxaf8Ye7Ll3o9f*+~TEH_!0mk5Jg2r zTe)w=M1o!b;cEbNfvc*j*5O3AVH$1m2ElUx@cJiV{1S=BH5}f*!^6XWBE-T<1R> z2yp@DRft2BRJere5}uXvE>9((p?2@KGmG-_@_(HC{QLte^$DH>0ArS!U_(Pg2rwE* zgBt*1lL`p>oF#gE9u9}EsruB`*4|2(+_#eGkTd`c!UXW_wcKw<0MU$PO^Ox@st@cy zAVl7UX6=SXrdtOn{rmvH62EB0o!soODvEe^1rXk}1A)3k_9Eryy7>wK;aVJ9PEO8a zTz}S?rEt;&ZFA;T#@*x=0p9_jF&=1cZr+Lgw{jn`CxMFpKy>(6h8l79`q9c z=VAJHR_`k5@Wjy2(64TpL#4$xJk2k|I0jlh)bU3Zbi}8~CXJj)IJQJ+Km-#o{|n6h ztgWQ%)!R1w!o!TY#{__+&W8YD%xbW9Hh;0#iMG5?H~>0R2sI4|r}#gOAph7fD=R8H z&a(4tY=bc0r7#5<^DJX3oIpq#045-0pZs`* z9BE}`<%VD|c+d!#nPx&X00ur~m48l~C$FxqUZ0(v{S?n5j?(SoJcUmSTCm4R3;G{H z|9b^sFW41Zi2y*t)q5&6L`_Q(_<7!E>3u|Fr~nU>G+i{0)12Euo`>{z2zU+vK2(^& zF6eDh&F?t?cA-jV3bpPq$7~0o9!03l2EZ<30#XBrBaLX#-U6*%Ndth19e+=T$lT;~ zrrF4(99vQSy=+zeSqQZ_Jw4sYj`L-+pp?n=_!>#4Et}^Wz^q@`B{{qgU|X9Ifm;0dA+!#~67@ zga)Lk{D3Bi6fKq?RKfUJY=2uy--yPZK{k5^@0uPf^9M@nPI$1KBW3`wN2lX)ozDwg zoWoXsBQ^(NNb-QK4jZFkast^@UDnKMEuoXXmRTfyB_mvl8alDK9FIGFAfZxyKRl1i z2NKxWy%2iH4+2HYgKXKy{E3Wqmfw-+uREd@*4$reh{?&xw`2ZDN`DBW1$Ef-Ub~z- zR)*s_UaL*ISp7jKx{e=7=>!O8_XEOqCxU)>&q95T@L##%#WeszY)yYEtD`CAz;(Od ze1h0Ke094~d!uGVr2+at%`tAqB;@4z$;`|3*D3ktR9w?@`}$juL1u9Qzdt9RzV~_00000NkvXXu0mjfUfLm5 delta 1475 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 delta 1206 zcmV;n1WEh+49N+QBYy;tNkl|t3X#*S0J5Ece`A!{Sf^jx35qrq$ZZe=aUA4vmeCy{rTg z$_eP`=-5UeM}G;t&1ygpk${NH!(3K%RLLnNpt-quPfbnDNu1kd*Fi{_r!5Av*=+B6 zR)Z=6Jgu#*pVI3+1n##R{Bn7Sc(Js!baQ5A=FY^#L`DM3jZV(0o(cjC%Ki%seo5I2 z<0>vOABHoT%oVC3VFuXL)Z}HLwj&otZ!49QWd2+q7=IXeW~N&%0iO2u_9GZM$n7;V zX7@e8yoA)=WHLE8IXO9BOdtC}e*YZVrsWBs8mIW}ycr471i<=Muh)ARBcIp}%%(hX z6&^DrZ=v_k=;-L2(8s=?taoF-hxc{GFnJdn8XEd#HG5J72;&6*6$U~!gDFS6fbtaO z{V&g~+kfrePvE;(4bCuLL%?@R2@t_E>5o%l2g-?NopfJCqtWk`5g>xEt*!kU<{Q^3 z09i9)h(5&6-yk5agn-7z#(>}NKVfHsBkO%RdSZ9UeHTA(QT}N&EK4&W7!3LXfxroX zBW8dVc%Q|uNoGTw=aad)xd-FpCPvm|fTcsX)n=g7)%4~*OR zHbJ%*W$;V`BKW-+I0g6?83SveQ(yq!=K$3^GBWZIe6c!6U#0}G%lpx6xskRmp@=Wn zrl+U-N^OknLYflL*4B0g#&==ZV;6i46cJ_^6Rer8YBUd~AL`!0Ghi`ZI}{J%or!Xqg2Hqi;kplJPBd1xaavh&y$By2gWA;-Y({g z*+B~V4Dvsj?d>i4^uL%C0nCMN92V#PQkNJ^kEog$!|EOd&5YBwN+zYWTi{01k>}+2=9$%34FcOJuURYQ-R^qI2l_B`M zEOya^$$*im-DFA}GF(FcU3M;!oj+voR_eSvb9@7#dsn<0gn(aF*m#d2RRQ$vMt=Z) zz`-3Nc%IjB>?*%4sd6q93Tc0nlmGw#07*qoM6N<$f}(p$WB>pF diff --git a/core/res/drawable-xhdpi/ic_action_turtle_enabled.png b/core/res/drawable-xhdpi/ic_action_turtle_enabled.png index bf572ee3689585df3ce230ca0f493d063bb78526..8bfedf1e65b67477c82614237997bf0b126a1ffb 100644 GIT binary patch delta 1206 zcmV;n1WEgV2+0YMBYy;tNkl|t3X#*S0J5Ece`A!{Sf^jx35qrq$ZZe=aUA4vmeCy{rTg z$_eP`=-5UeM}G;t&1ygpk${NH!(3K%RLLnNpt-quPfbnDNu1kd*Fi{_r!5Av*=+B6 zR)Z=6Jgu#*pVI3+1n##R{Bn7Sc(Js!baQ5A=FY^#L`DM3jZV(0o(cjC%Ki%seo5I2 z<0>vOABHoT%oVC3VFuXL)Z}HLwj&otZ!49QWd2+q7=IXeW~N&%0iO2u_9GZM$n7;V zX7@e8yoA)=WHLE8IXO9BOdtC}e*YZVrsWBs8mIW}ycr471i<=Muh)ARBcIp}%%(hX z6&^DrZ=v_k=;-L2(8s=?taoF-hxc{GFnJdn8XEd#HG5J72;&6*6$U~!gDFS6fbtaO z{V&g~+kfrePvE;(4bCuLL%?@R2@t_E>5o%l2g-?NopfJCqtWk`5g>xEt*!kU<{Q^3 z09i9)h(5&6-yk5agn-7z#(>}NKVfHsBkO%RdSZ9UeHTA(QT}N&EK4&W7!3LXfxroX zBW8dVc%Q|uNoGTw=aad)xd-FpCPvm|fTcsX)n=g7)%4~*OR zHbJ%*W$;V`BKW-+I0g6?83SveQ(yq!=K$3^GBWZIe6c!6U#0}G%lpx6xskRmp@=Wn zrl+U-N^OknLYflL*4B0g#&==ZV;6i46cJ_^6Rer8YBUd~AL`!0Ghi`ZI}{J%or!Xqg2Hqi;kplJPBd1xaavh&y$By2gWA;-Y({g z*+B~V4Dvsj?d>i4^uL%C0nCMN92V#PQkNJ^kEog$!|EOd&5YBwN+zYWTi{01k>}+2=9$%34FcOJuURYQ-R^qI2l_B`M zEOya^$$*im-DFA}GF(FcU3M;!oj+voR_eSvb9@7#dsn<0gn(aF*m#d2RRQ$vMt=Z) zz`-3Nc%IjB>?*%4sd6q93Tc0nlmGw#07*qoM6N<$f=6LV`wRO^BmjbwVMl6K9GI;~`A} zFNG-%$3!_)Cwyelc&|C({Bw7O4_XH7K5Weg*gweJVYptj^Um)qJ*P;oh6C*aSF$z; z`Dh3w%zM86z)_Em@~Z-eVi=m_y%l&90-GA*KIIwTEU-N&GdbLsRpCeGhFjcfRU3Yv znNxP5NkH^8n=m6s4a1S^^-aDBGu%JeF5mO?cx3^j;y#tFtka{O{Vkb$J)N=O27kKr z!LWeWuPmO~zU9|yS7urKNyGAi!31%!X4V9r3SK|s?~!-z*l`N1{Zlq)4Wm+`Z3vg{ zg1HGHO8ghL|HT@THKcLCX5m)}hcEKI#IGOuS|Lf}?FRbET`$f56`hndsygRuz$TfdG@Uk}i zd2NmV@khREO)7jY+>#LPztIr!cV>hwgPZEMxOtqb-djJ|5jOWgsZ|BPIHO;Z?YkWx z)gBmr6e+%Z`%brV=l#tobtPJF}Nuk<4>! zSl(ARH}12jLwUj1zen55RKXdKcep-grir zZwZ28SuuKyweO4Xt+;aBINd6s+;V9{?$;k*Z-nS4nAO*?&R}nT7N;Y!=GA7=N%6Ik zN-f`J%Pt65U&wRY>ff2R^$b>G(T@K+I>VkDJUJI>&|TH%eB+YrlIJ_R`tOR_?aKYZ zWgx<=exPE(gVKUB3N7_=k<>Pqn|P;9SrtAhOe{Ane25u4!Cs z@?0@X7x>5CQZ8XksrnSpk>I&#*0w#y3uZ0Rtz~D_x$3ic?F7cm7*p?aip(VP>?7-5 UIX-1!o5uhIp00i_>zopr01ZvWr2qf` diff --git a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java index d1a8eab1..6cf68aa9 100644 --- a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java +++ b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java @@ -112,7 +112,7 @@ public class ApplicationSettings { edit.putBoolean("server_ssltrustall_" + i, prefs.getBoolean("server_ssltrustall_" + (i + 1), false)); edit.putString("server_ssltrustkey_" + i, prefs.getString("server_ssltrustkey_" + (i + 1), null)); edit.putString("server_folder_" + i, prefs.getString("server_folder_" + (i + 1), null)); - edit.putBoolean("server_useauth_" + i, prefs.getBoolean("server_useauth_" + (i + 1), false)); + edit.putBoolean("server_useauth_" + i, prefs.getBoolean("server_useauth_" + (i + 1), true)); edit.putString("server_user_" + i, prefs.getString("server_user_" + (i + 1), null)); edit.putString("server_pass_" + i, prefs.getString("server_pass_" + (i + 1), null)); edit.putString("server_extrapass_" + i, prefs.getString("server_extrapass_" + (i + 1), null)); @@ -121,7 +121,7 @@ public class ApplicationSettings { edit.putString("server_ftpurl_" + i, prefs.getString("server_ftpurl_" + (i + 1), null)); edit.putString("server_ftppass_" + i, prefs.getString("server_ftppass_" + (i + 1), null)); edit.putString("server_timeout_" + i, prefs.getString("server_timeout_" + (i + 1), null)); - edit.putBoolean("server_alarmfinished_" + i, prefs.getBoolean("server_alarmfinished_" + (i + 1), false)); + edit.putBoolean("server_alarmfinished_" + i, prefs.getBoolean("server_alarmfinished_" + (i + 1), true)); edit.putBoolean("server_alarmfinished_" + i, prefs.getBoolean("server_alarmfinished_" + (i + 1), false)); } diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 8a208786..76ebe1da 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -100,6 +100,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi protected ApplicationSettings applicationSettings; @InstanceState boolean firstStart = true; + boolean skipNextOnNavigationItemSelectedCall = false; private IDaemonAdapter currentConnection = null; @InstanceState protected NavigationFilter currentFilter = null; @@ -154,7 +155,8 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi return; } // Set this as selection in the action bar spinner; we can use the server setting key since we have stable ids - getSupportActionBar().setSelectedNavigationItem(lastUsed.getOrder()); + getSupportActionBar().setSelectedNavigationItem(lastUsed.getOrder() + 1); + skipNextOnNavigationItemSelectedCall = true; // Handle any start up intents if (firstStart && getIntent() != null) { @@ -242,6 +244,10 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi */ @Override public boolean onNavigationItemSelected(int itemPosition, long itemId) { + if (skipNextOnNavigationItemSelectedCall) { + skipNextOnNavigationItemSelectedCall = false; + return false; + } Object item = navigationSpinnerAdapter.getItem(itemPosition); if (item instanceof SimpleListItem) { // A filter item was selected form the navigation spinner @@ -297,9 +303,8 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi if (fragmentDetails != null && fragmentDetails.getActivity() != null) { fragmentDetails.clear(); } - fragmentTorrents.updateIsLoading(true); updateFragmentVisibility(true); - refreshTorrents(); + refreshScreen(); return; } @@ -558,7 +563,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi @Background protected void updateTurtleMode(boolean enable) { DaemonTaskResult result = SetAlternativeModeTask.create(currentConnection, enable).execute(); - if (result instanceof GetStatsTaskSuccessResult) { + if (result instanceof DaemonTaskSuccessResult) { // Success; no need to retrieve it again - just update the visual indicator onTurtleModeRetrieved(enable); } else { diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/core/src/org/transdroid/core/gui/TorrentsFragment.java index fa71b2e2..cebeab27 100644 --- a/core/src/org/transdroid/core/gui/TorrentsFragment.java +++ b/core/src/org/transdroid/core/gui/TorrentsFragment.java @@ -91,6 +91,7 @@ public class TorrentsFragment extends SherlockFragment { * Clears the currently visible list of torrents. */ public void clear() { + this.torrents = null; this.connectionErrorMessage = null; this.currentTextFilter = null; this.currentNavigationFilter = null;