From 0b064eb2723bf20f63d1a6f82d936cbbbdd75f8a Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 30 May 2020 20:27:11 -0400 Subject: [PATCH 01/24] Update gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 ++ gradlew.bat | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda8577df6c95960ba7077c43220e5bb2c0d9..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644 GIT binary patch delta 6447 zcmY*dbyQSczlH%shY+L(kQ}C6ise@?c@F%#`dE9xT=qM=Dm?$VxD1hrECD1a#01Q8o zMyT3}z+1K>hPE%4doH=x5X;^NP(OFD5GByp;5FQ^bpzkBa(;eudMu7Iyv$DE+N=>p z{3Y5_BP>F3)tXW*Styc(Ji3jnK-giGA_&42fsbZ@#+e+ly3w0VmLC;LA)h1UY(ChA zfwqQ?-@}@S93F|exOv;Se;P|SrYvEG(8q&|ltqvQHO9KgCSwM!Y+#d5eIRq$Mi`pU__N$FTxW@KAWIw= zayY6@9EyxG<_tr&{Wi87m5*mf=u&=;eL1gf{Mt)q8Drick8CcxzLW>cG~TbW)|$*D zYMc|5eZNNzt7O_C1LqgaI`Z0B+2#;3yO;E7N4oMY@~7$4;MRonU+Ca z#*cD!7$u9pZ|3f!-_6rpN}XhAWd`1qiR{e*1CJK1dvBsjUyY@BuT|;EAz}*0uSwT_ zq(g0jXTAK4wsQ>kIKEfRQZw^GIKNRZmV)b;c*Kpc?IvNuq{+eCM4%IBoRUk!JeJ4IVH!pLl+5gQn^$0Fw(WROw~SclOYWbMmvR+x&lYa zrU`5lck*s2zl;n6HEa_E|Btu!_BeeF8T=~0Z-pdJsKtN8nr88*8loznbI`@@8U-bc zCE&MaHH#?LN;6&wU%>->{X&6n*c6ECkP#Bn{lafo9KW+AKK>>f)YfzG#t`XCsl$WX zeS|50l&G{J6yrdD0#njv3|C}K(~azN%1+c#*-JXtZd=Rs-zr)f{Mneaqpgewz^3OM5FaDaH3?RpqMyL}=5sFu_zcDc^E~=$H zp`mutZ0ahrf32c`6ROBh&lI`>vuFJE*(NVpjr~^d53MZ0v$G#mHqBLpZ_=3?pNjHc zq`Dn6xbc32BSg`U@YE?)%%`LvRRWt@NnS4GSj=p><<_-c6l`myAJE0fSp^QbBfdS( zl>BC`;EiMtvPQ^FVSL|sjTc(?b%8Qt@%U>rt&`4_cYT+R`OvMomf#104S~4%y%G=i zSF$4cuIxlIe>@1E=sfXhVt@RqP-*grJnW~;iWiY{&Bqh7J|{vYQ!^1x4cnyGk6Wb9 zO0~}ejH&5@bEj&`2?Wl*cf=IV=$oa9rzh+#gN?j{IY z{cFM?b1*TT+&S2rOIFFvy{`FvX}_js+9rw1O*1ySv8Q}r2b0@*h|1Di0R1v* zVt4yRX`%ac3xeH;(y!FJ1wfX0u z(vEffdladd}+qfb##M5s|vX#V+!&>>0;o_Le@c)+7jDwJJ(9>+3CRkGH z##M)o)xY%3-ifK*iFpo7NiBT`wYVc=lYIZtKF{pxNfod2V)Ml&<=??l)7w5)Glopn z8#scqBz@^rE2-5aVDT_~Q#A7m4S6@B{QM6c_oY?)xk>z8r!qnbkvnqHoIRTMZijQ5 zv*ir-hjrA??C7S({;peDbjO+Kk0=tpoYQr7VQMJ*cR43?@CVMwg=}e<87k-T@wQ2`}bwe-}AAk?H=&0Yz~Zbk~bc>EP@tV zZ}M>Z2br)mwHOaQS1^~;AVlgQS(~eqTT3cQ)Jq8?bKk~$>tZSLgMW6sF{Os2*%OD^ z#@G{w=c@536Pgy5n{C*b?yf@Kd`v9zOG*56432l!^U3K)m1;qIzM*3ZS)XJnJ4THC z^e*Y&BQ)hyIA?LzXpqWK1`GN&gr?{?;qw?0wZ2-3WO3HI;)oY4YL?q5>F9QpzV?jw z%Ae1D+te?r(`vL~!tzayt@-830@#ZS)-KyoF0$s!Vw0Vud%!J!?moY0m8#gODn9F+ zY?TnBMwOKomVz60?|&V3HO!Z!cH+<9qbk>I-tT86n9=X9g`Zr=G+ zeJZH~&WtV__tcQ~B#c3;HnlwX+UoXIT>zqV;hho> zm(S|vbkcOsiPJd5fwJn%e%@Z(YNs#TqQ-MTQNPf9zDS)^#q=x)hn0wzK&7Tn_|BdK zx}|&Y!FqT|pVs!!ayLJ%C$M2LMR|s6aQ%QUi>oqMG=a-^oPaKfKR>DyX9dBV*%R!+ z%FvBF>KN67w@!4Lj7{*vhaGWkP344{vG@LFna%+6y+SB#;an8bz1SAoZg)%>it7$I$^*bWXoT6hbhk;!C7 z5tAKrT@VO5N!8a8G3=U4NL5yNqYdEsc2}2^o5ctj;Hrf0Dk~jL|srk z+XuB%H@ROKFqLw>LUu0bqRXw}B*R!OLo6|5*Q4|0dPlcG;>@4(_wZ})Yf&doH+L*RE=D|Z6RxTU#a|+qO_A4p z2U{|br!ER>QqRY>(awtH6L-S8zx$EeC$o;?KH-zEE{_f%M55>lLD!d9KbLpEyv&z3 zOD}@>1Exq4C9v6urtETRrtB>6m;qqJfh)6o@&+S>@D45s~ccePF=|y`U z-f~hKH|y8x$ovl1NJi3Qqom;ERzIG#^&!~fFQcyl0+H+;`yV@UyA|P*R^h1K*<8h{ zZqjSxw79HGC?HMzs;UY)%J2b0gXnQ=OY;dHMi3-zr7BZ6SnFxTu8VCoySbgs>l^A8 zmN&kvh~36=TRu2B!zInA7+dp6$aaef-&PgtbENZDyV(2Qh!`{>wDfZGw=1SFg*E{+ z#RVlY)C{0iP0+Q52$nQXhK{cVx<)i;=tyb=4mRyl7vX}F8Q%QL>_d6O7MM}r2)$$y+>m{$P8lbYz;fZ z3QWqj-`0^M+YpnVm!KE9$7?qn-uiDEF=*G=DW84fhX*c2c78!Mp!igEq_TE#1gLe8 zl$ro$nqM(yq&C?t-G#o9^eY1)Q9PX&YrAtOX|lboS9pTS>3XVy+T*%QF@Dx%R! zi~z%gEL!?kG{Q%?*cWYwt#5W}g>qQ?$$RX%E0(03W7ZERFNIOjpM5e?6J0JAro(i1 zsQeyE7G{}iSZNnP(n4FwvEp+ztGzd?jYx+(7Mk46X^c!>`oO7{i_yo>FV+t|SvS!} zBkOPHlUb!OPh1Y-8duD(b2u@P=5b8soW*+wnMY4Q8Eq!-L)~5b=n{68|ISew8k>Nt zjw!awOP?W8P1$OO`+#?*f{M(%*J)%E_^tKqR(nv#swuRijXecgwQacnz4TE8 z=2-p0u+VG&&^ePGuUHKIgI+h>XY*ZqAI5N*4Wc%8CXbXf57?Mpl#k^M=OHx26*X=b z@XIHOwsp{@XZ?Foo*@>FnvH!0EQsZ*BR?l&zm|TjE+bDiqA$Y2SY>Copx~1PHa4js z_!C`yon1&oi{Kr00~T|`DcYfvr^uu*F03OLS>^N@6Zi4VhFx(|WVY7whxD`RzX@{a zbt^j09cW#7p^J^3)}YLkrHR`G;mbL@W6__7SC=}Xh$OzjG!>tu=ubtG%LthmSDE)Y zfp>6T8@qS6C@y(<;eHyUqHzM9+%$!LWjRr*z1Qw1s?bAYrK7*KD*C^qP{W=T31H#9%+CXSZ;mJdIE6lN%IxBUk0hr5P})$QDM>4>ow%muHv z-zVTS+rI9+PV|%56*~qa^GKRWwz;dLtoUR%*1M}RGh$LcGlrHaAh-`>BW&!A6mvv( zo}57{BhH+Bqiza~XoxEIpXk_BGR8GzhcQwT4ND>~ahppmV*4SGve=@GE0zZGn}Z_l zMJ~Bi7prl4W<5m=nXZVtIYs=mwv2O*-UXG(Y9#Tfu8=c%NzSja+#d#gJ}FZhj)shN zMhx$^a#S-Ji`_niAxIQ^8YN)tqqJ!k5S_*BUFNY4F-4u9`G(W0v9;O*=f94+)C?7x zvYptQhDL9z*Ef*V5;DWma#Kwl4duDaGW=wP;`7wCjpnvd1`SO#b!fM0%!1J-u}iOT zS`t%%#@E|EzErxcRQ`fYJ)?gm)spx4eAd0@1P(T8Pr4n}5d$L~0>gytVD-^eF2bLx zW3i^+7-f{_=5Zq77xY&vCpL~@OTUZ`^myD;mRijH9fO>_Qdw^gurX%)NhZcgCIxgN z4yJcYrgaS}O8U(X^mwaTnrkxmt*ni+Cdmv>X$)_K4fl)^GtOUWQ~h>K$_^s;h!1Dw z*q&qAD_pNCM3lb9=U3Af`-?xuwb62P12trTb=MXKaYoNRHZPDJv9*`Aw)QF0Tb@g}XFL;| zdJF}(@e5r%*LCQBK*U(pdQRDeKE!)FF+}k{9Fz>A6zUP@OV+3DhvOQ zm{2a0QrQ^kn~?Df`@q(xA(yDoo!~Q+;;_*@_h(a`J~*mJkCa@npgsiRZAQ#pqSOZK z!muT4MNvG*<^MYIQN0h-W#UtDprj`i7Xxq=bTN{>rHH}V?ZdT~kd!O-X zt5JI4SH&YHnn(%JNKh$z*YZsO#t%LLA680?$^5V~dE8Pl^cPrXu++@2D?!)`KkPkM zE{Jaq+MNaAl)!{f!@ID?j@Fh)p!zU~?G%ODNge-447;DM8a%=PGRAB#D&LD5-=atG zY9Y3SF$2Xq8v`e8Rvmy3(wxGi--=L0eqRV6KFsU+waZV(WuPT00CKK)a--{eLpmBy zcXLs^*FtPQfeF;&p!YXTs3p9?U8Q0nzxqE+bM#Y7^_TmK zsw$bo4WCokyvS6N_0(KUJ2!8X|5~{<8pDd7rDt;^sCOx&=RxoN<`o-B}EwumojPl2bzq!x}k%%W5t9nTM1xeXi zQv;z_icyd<$#$rBJk9nk)8!h|c`$y~+NUVUGMRKk0aIBHQxP%YPu#d}ntgv1C_my; zpbt9K?YSK7jR%!jIUz+E3dnfbRMkv&7^h$B&oh5Ae2U{ka*7&~Z|XGk#69p1c_G1FC{&L1hn#)ZCmqpbHXC6uk;Obwn7kSJKaZ`H?u#%dz%W!fJP&`<51T`RomXjQ_%* zZ6iKVWhSW(o;7GYUuAwQxLzZTMt^H4@rorBp`tprXq9xsaKz)V<&_~zzsbGC#J2xC zQqiFYS<^~7D^Pcs?HzZm78=|`Ql?|`KIZR%#&qOMAEpStCrEMl8R0iZLR|#8%!;8p z0VGG*J(7WAxG~ij`ISsxDD--ge}1Dh3vAj>!wtQtec=#YCHNFKz$`Il6fa~c`rYYD z(xqyH;ETfFb?fK!?^*s3`))*65xs|5*^u3Snz(6t59|0kESGze=0W7f>LL{K_sC3& z*ardr??S+*s+p>{8sni`20|xZQ#^D^AQTjp`=*)izGeFN$qoSHK6K7(lg#A*T_gM( zK|#q5@BmyU)j&wqjB*=s29ufgV)YL%VJRV>@1p)anJxE7WkARdZ36Lb~f2b6Q zlm7uK{1gU}2|U1INlYN^Cl9Dh;{WL3PjQf^)PE=rpfSw?($jsQrq#T^it69uKY15Tb~K=hm} zh{fw3iUZN>cmUlz1T^;!pw6KHjOL|4uKo}3i|5k^cjn$5g+E9&YZL(c0t7^Yyr*;k z{39mNJB|kkA^-oNpr8j6hJ*m~3oM}A&ow%Xk22_5P%a?j<^aqv(ILmiH2Q>4Owl^89`~3rMHp zp3(w1Yh0kR@38~4fWByT)-r6kJki5KxqsSQ->5QD8+n7Lblrq&rqbQu<4GcZbwU*DehL0!uF< zAtALa2-nN~-E+^Kf9CT%^Pcydcg~!dGjHY)VIP{X+Mk5X+Z1~yNkl;K;}!vd91tr< z3$)!P0ZK`15GdXAY=~6eS|ICMe*_|EtvP9boO{_-?eWIq(~Zo-^Ni?kUPq%Frv%84 zr)oV1Do+g^<-_H;g&&6jZW30jA}03FK{ok6%fnpg;T?i6z?Ni4>j&X84{fZopFMV_ zPgq3;2ochOBOr>*RYtVW6qFYa2RCa+Rij=CocWr`A#j^WVQcy=l`bl)`?rJh=2@6e z5{>%T3cj@IohTK=HSz{HCTuU>e9Jdy(opO40;jY>4CYhDaoW$2zlNl%@5(Qiu=y0y zcPW^JHHod;>lqb~jFKYaMy2xYMtqcZ)tr_RM@6k9lIwWE8QrU-RZ^X=V;RcRRkvfh zd1>Ux5k>B6Zog!6HSDMhQY$F;vke(i*FG4;(;LQ}mHEaN8B^s8K(WGkdBU85Nh-nw z3TtcD!M5Wr+_o`vA0(6W&{4w4+nrWDTW1^{ z`epH{pQuSybd8I*sYD3SJ~2ag z)Yl_lSuF&Mbw4X`D?Zu`D`om|Xx`05WdlZ9t=JoV-6wy-R)lz9Vmu3c>A*fG30~0(?uQ5FkJ%zGK6$qDU~&hJ-V3Gc6s?!hhw*e)&1k)r=FnmzLWcywDn{+ksed*I9(B{*s3K(%lJ)U)|9X0a^E2 z?>RlLCvy+s4faLC0}D1!+cYzr%>h-s0|&9TBc1a9Zj|0mYS(5 zrQ~xRl7za1>q_E^{8c1q74LqFM-}HUQKs z-HX=BqDsXVjC!$_)l0!SF$o_V=RXM+z&V&q6#jU#AuF*Ji7|_5#Z1IhRaGYUxFADf zpXVNXi^mIuN^VZCEy?r%N`o=v9TuU`3mG^fHWsJ7ia5E@h3U;R^8nN0<6mS@yNZ|*5X zjEnxhb4H)?Mxy|QSTBrESL0adG6`arE$lH-Quq8IpQfLyXQ6-~q4$o-rhCpAt($tI zaQa-ZZM^S!;$?}%kABf#XFUWGO|RZjOJYN?9`~l2FNCPG(y>&9>G2l#+5fWW;j7y+ zQId*;#2h|q8>}2c^sysZFYgKl&gLAc8b;;_h%M^v5(yp^hO`DU#mFTN zZo|S}wZuF&o_J(DA!5AX>d=y}Iw7%z*yBr$?F*l*`ncP=hjAJ8zx2t%b$OWhk#*>L zp`+b!2vJ%5!5Pm;TXyhUy>17398}g9$AA1ssrPvPv44N`QtuuEE{>Jfe<@nFgB5?k zeEE{>t*#8BJh%#1a}!~{TtS;f#A-UQO!fR1zuQA~$WHb8_sW<`I zOQt1l>b3%|CE-m#+H%q)ASiMAt&ke3SnvD{cC0Ff;U-w5o;8ioQdl~qkLfEQ-TaIu~%rf%rG#UXd z#FXb(La?+7@`V^U+FMI3**T4yDFF#ZXU;?IM6Bw#p@kx86Xq&q-1cybR(211`S}V* znO%<4o*ixUE0Pbh+Yz&y$*tl-EYXj4#@j5-Wj6CQ7slhaV>Bq)HZf-lb{<_}t>aYl z&=`I3F_+?^Q~lAB&dSS|O^qS%5er4X>)d^YqM{p>F_t3F+O*!(aZ;%_yJJ}DE$sT^ zD?V+F1o)k|;MJA7`df*pD~TA{i+^wLEi5h3gr(29e5~cw@g{21H}^GSsQD@#%k03a zK9?s{0JjBaTq z%7|3eul{k|8$TQf8qMtCiY(ub>dVMH!d3$^aEg9r8e~r>3sXIyah&#Of9~35eqFVQ>knQg8ZBr~gYpRT*COY|4$vZssNa2NxUeYfsm!1qND_;I$wR~eah0d%+M7?x^JA+$)Ce~Rg zeqN7OxBK8sNnuySGL7AXp>`pLB^Uz@)H+Fq#6*xz^WQ%C8FYh2c}ibM$objs+y-d? zrX=r$2HB8GQAT(a-w^I+Es60?fl37;e}5$RjTuFMKXp%mne_VmrD+=0@u#&VHEO>T z0+aDh{lgzr?z>~c5JWEZg`onQ5xvC~Pg`I34~`FcnLIpC<-1wExH5^!-;y8S-GaK$ zqV%<$D)?4;qGGHu8a=-ztvXSqxh#zCt;e8A_h?gwd4CR;I%At`%CO^gi0;$9($Z`nsRqjuU6#in|WCc2vnFl7_u}-ps18Z*4Id%R4g&)zX z=u-}T0Ym3Y-i-H&S?xF}yw?AdonDV+mwfb*odRY)h;UL3);X$Jjcc$Zn&D^A3CtT} z(yDV3RddXi$VJUPVhedH^S0)1&)Bbgt@+Paok?^h;$k*W0Cbh`vG2mpVU2}c99a5HuH!aSi! z`nGbfL^TymSO0$QBNCccZm*uW{Nh09Z~MGCeOOU2RMqHJ-N&DuF-2n_ObxbNZG*JV zbI(4ArNKZ@CUt-@eo_k@7Mxy(MarP*DVP^#5Z;ZCqEYjzxIeI@q|R4zFEvIRGSVU% z$duRe?0xKK+(*?VWjN^l{Is8>%$ zZ+M=HCS<3MQ`&8i7~}*7hNPrD|Jpj|yihO~({IdOBM?%{!ygU%^BJyBmS%6`!UkVo zL^v<&C;4Th7tx1l!)WXNrYFSMljXe=FPsxEl#gW6l0I%9R?<>^G5~ze5H_V;gf+ny zkoSHZ-~~LeKBBjvGOTE0$zT3w3P}2At4ce)1Y^c=mw9(lJ+3FzO|?53ToOlD?jbsQ z5vy<+b*YLnYm1m9*uo+Hv$3$6AsTswxYOo$!QDU1@_I;r+|0PE$m%;+gL_=h`{M0G z<%5f$DRD1rkyN$KcaWOd?Z>Vcr0Itq->o9Q2%tOr{?NT>&{g$V>kWg|J-0^vg*>mq zXDCk~jYn^7od`Ep|5+kxII7RTuS?Tx=nETO{85~G=6slBjlci%kz`5LkHx;b8HlZh zw*1dWnq*D}N{}lP?*^3Sl#PuDO{Q#n_};J|DU39cPe7s2pX@nCXO~n(FReYqJ3s!S zxpR+QJYxy(_V`@?XTfn8#(w-Z6!{lnk#x%5?42|OsX85_8tK`R_Ov3I#G8T%~|m5^dSLk z=E+zY@@x=EdFQ?R+(^!|Odf9!syD1W>9@W&hWlp@K0RyhEXqPgul#0a-Iymp?(Z8+ zedpt^fW(v;4&6%_BXA z4ML%iVq3UBLjtrypnLM(5fbb$$>*yu%nuPX34Rq^>h*W~m(1Af3XeCtwBOBnb(dcg z+c1f(KCz$tT8{k$O(PYvpV-y?HCzAn)o{Gqea*A+gt|&S*q!p*I7C$ro)~UpMuq~z zD|2*bHB0PErq1`Q`F1;cdmrI%ATwI3T;F3jc(Op`_q zG9GZ(b!$5`zCYFbU0gY*arcOL7%Z11HI8N< zcq<&EOTU~%Z3Q#_Ew?K+2p9%*Mv-*1Nf&fk%@LxhKX;1l5O|Iu>j}ovw{mq96>@dX zRyxG|0z=J$nFIqD!E-Q&?67!glaAo1mOtCUh7{Ar?dWVzC&DU-cGcQD zdZs=K!wc!qJbJ4aoRX@L zBRa?Q9N7R5#0tl=(2)H*61@~nW?QcNN)aonJBtDj!>d+B8l-Vjc1vu()AGLsOg;z= z3z>Lgn+88SWz5<$r*2$j5F6$glpX51lvo`8iT|m8vPVVVa|jx z&hfX2>kf%tAM?<=>xP+`#7lZs61$5|7J_%%!KyPj!t#T}j$H#+@?leTQwL&WsN$BN zuXS}6RGLD|V8HiN%M-zT^@+Hmns8IP+?%IVh@_upzIr!I+-a7r=-%NBXw*Op0`LK3 zG5fdG`C@Axy?d+8VQLq(qkUTD+FNVrN5Q|J6R&jh2Lv)Ole+5pGloEZZQ79>m7YGM zSPJ1GRDQtW?r9jb{g**e3Mr>PHrRWagZ|ku4kjL;JOdL~Id05kc*CA+ui@= zieS-e>hskR-1I9Sx7b4i6p>2LP#vgtG6;8vGL>E3$NPQ$J2r~XGQDNg;Sw=& zC}lz+3@Sq%I2q-97R&9|8Ij2^?^DGQK_oiqZS2$!-rzVqn=~d~TS{n&I+svxt4dWO zT?K0)JEx>9E7saW8h!5+MmAkC`g~v*@ z6VKn0>eZdon>BH(O$mACnxk3D?vSlCFFnvZ#+&hUs)Wr!aP{<@|oc^G>bJk59^xhmz!RA%|K_$o)V`D@gVs>@bSmXVID_PQXp znfja8U01+t3V!o{8ZKi~G@#q$KrAH-Ks3$G{Qo}H|N1ijJMsgZDgOmM1O$Fi0>0CX zpbAzXhYbP@PV;~=*nn7eQGjoT2b9nGFNg-PpHT$a@?7JL7I&pmkmclS7#Y#zRYg_`D0h47O z&|%88tXNh8{Yk$@@*HA-B9r#tDkY$>!U#Ie`j1TupjRn@;(ykyyld-zJ{@qm!UG~I zxR#ZxV8CEi5JXV?ANc~bS9*;MYtkTvifc5iynmg!XpIr%SN*R#E?|3&2QVs~N02d=N!1;GdfNGr)gc$|K#-y*M=Ra9B4#cmk-naoQuS*cWnE3C4 F{|nTN-B$nr diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6623300be..21e622da6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d9..fbd7c5158 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9cc..5093609d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% From eb0379fae80f5f845137158e091ca09b676dbc65 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 30 May 2020 21:04:52 -0400 Subject: [PATCH 02/24] Fix failing build --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0dc9a03d8..865aaf411 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx3584m #https://github.com/TwidereProject/Twidere-Android/issues/963 -android.enableAapt2=false +# android.enableAapt2=false android.useAndroidX=true android.enableJetifier=true \ No newline at end of file From 86dcfde32113661fb7e75f7055db8013c6cf2d61 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 30 May 2020 21:12:29 -0400 Subject: [PATCH 03/24] Clean up gradle files a ton --- build.gradle | 50 ++--------- twidere.component.common/build.gradle | 34 ++++--- twidere.component.nyan/build.gradle | 5 ++ twidere/build.gradle | 123 ++++++++++++++------------ 4 files changed, 97 insertions(+), 115 deletions(-) diff --git a/build.gradle b/build.gradle index 82370fff7..81d6858d8 100644 --- a/build.gradle +++ b/build.gradle @@ -39,54 +39,18 @@ subprojects { buildscript { ext { kotlinVersion = '1.3.72' - pluginVersions = [ - AndroidSvgDrawable: '3.0.0', - PlayServices : '4.3.3', - ] - libVersions = [ + sharedVersions = [ Kotlin : "${kotlinVersion}", - SupportTest : '1.0.0', - MariotakuCommons : '0.9.20', - RestFu : '0.9.60', - ObjectCursor : '0.9.21', - PlayServices : '17.0.0', - MapsUtils : '0.6.2', - DropboxCoreSdk : '3.1.3', - GoogleDriveApi : 'v3-rev193-1.25.0', - Exoplayer : '2.11.4', - Toro : '2.1.0', + LoganSquare : '1.3.7', - IABv3 : '1.1.0', - Mime4J : '0.7.2', - OkHttp : '3.8.1', - Stetho : '1.5.0', - OSMDroid : '5.6.5', - LeakCanary : '2.1', - TwitterText : '1.14.7', - MediaViewerLibrary : '0.9.23', - MultiValueSwitch : '0.9.8', - PickNCrop : '0.9.27', - AndroidGIFDrawable : '1.2.6', - KPreferences : '0.9.7', - Kovenant : '3.3.0', + Jackson : '2.7.4', ParcelablePlease : '1.0.2', - Chameleon : '0.9.28', - UniqR : '0.9.4', - SQLiteQB : '0.9.15', - Glide : '4.11.0', - GlideOkHttp3 : '4.11.0', - GlideTransformations : '4.1.0', - AndroidImageCropper : '2.4.6', + ExportablePreferences: '0.9.7', - ACRA : '4.9.2', - AbstractTask : '0.9.5', - Dagger : '2.11', - StethoBeanShellREPL : '0.1', - MessageBubbleView : '3.5', + MariotakuCommons : '0.9.20', + ObjectCursor : '0.9.21', + RestFu : '0.9.60', ] - } - } - } diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index 8166c626e..dbe1794bd 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -58,12 +58,18 @@ android { versionCode projectVersionCode versionName projectVersionName } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { @@ -72,23 +78,23 @@ dependencies { /** Third-party dependencies **/ - implementation "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" - annotationProcessor "com.bluelinelabs:logansquare-compiler:${libVersions['LoganSquare']}" - implementation "com.fasterxml.jackson.core:jackson-core:2.7.4" - implementation "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}" - annotationProcessor "com.hannesdorfmann.parcelableplease:processor:${libVersions['ParcelablePlease']}" + implementation "com.bluelinelabs:logansquare:${sharedVersions['LoganSquare']}" + annotationProcessor "com.bluelinelabs:logansquare-compiler:${sharedVersions['LoganSquare']}" + implementation "com.fasterxml.jackson.core:jackson-core:${sharedVersions['Jackson']}" + implementation "com.hannesdorfmann.parcelableplease:annotation:${sharedVersions['ParcelablePlease']}" + annotationProcessor "com.hannesdorfmann.parcelableplease:processor:${sharedVersions['ParcelablePlease']}" /** Custom dependencies **/ - implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}" - implementation "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" - annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}" - implementation "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}" - annotationProcessor "com.github.mariotaku.ExportablePreferences:processor:${libVersions['ExportablePreferences']}" - implementation "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}" - implementation "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.ExportablePreferences:core:${sharedVersions['ExportablePreferences']}" + annotationProcessor "com.github.mariotaku.ExportablePreferences:processor:${sharedVersions['ExportablePreferences']}" + implementation "com.github.mariotaku.CommonsLibrary:logansquare:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:objectcursor:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.ObjectCursor:core:${sharedVersions['ObjectCursor']}" + annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${sharedVersions['ObjectCursor']}" + implementation "com.github.mariotaku.RestFu:library:${sharedVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:oauth:${sharedVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:oauth2:${sharedVersions['RestFu']}" } install { diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index c6e972da4..ba2fc3d17 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -29,6 +29,11 @@ android { minSdkVersion globalMinSdkVersion targetSdkVersion globalTargetSdkVersion } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/twidere/build.gradle b/twidere/build.gradle index 3aef52793..b711aa581 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -25,7 +25,7 @@ buildscript { if (enableGoogleVariant) { // START Non-FOSS component - classpath "com.google.gms:google-services:${pluginVersions['PlayServices']}" + classpath 'com.google.gms:google-services:4.3.3' // END Non-FOSS component } } @@ -91,9 +91,6 @@ android { signingConfig signingConfigs.twidere } - multiDexEnabled true - minifyEnabled false - shrinkResources false resValue("bool", "debug", "true") } release { @@ -101,7 +98,6 @@ android { signingConfig signingConfigs.twidere } - multiDexEnabled true minifyEnabled false shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' @@ -145,7 +141,6 @@ android { exclude 'sdk-version.txt' exclude 'build-data.properties' } - } task buildTranslationArray { @@ -153,16 +148,16 @@ task buildTranslationArray { foundLocales.append("new String[]{") fileTree("src/main/res-localized").visit { FileVisitDetails details -> - if(details.file.path.endsWith("strings.xml")){ - def languageCode = details.file.parentFile.name.replaceAll('values-','').replaceAll('-r','-') - languageCode = (languageCode == "values") ? "en" : languageCode; + if (details.file.path.endsWith("strings.xml")) { + def languageCode = details.file.parentFile.name.replaceAll('values-', '').replaceAll('-r', '-') + languageCode = (languageCode == "values") ? "en" : languageCode foundLocales.append("\"").append(languageCode).append("\"").append(",") } } foundLocales.append("}") //Don't forget to remove the trailing comma - def foundLocalesString = foundLocales.toString().replaceAll(',}','}') + def foundLocalesString = foundLocales.toString().replaceAll(',}', '}') android.defaultConfig.buildConfigField "String[]", "TRANSLATION_ARRAY", foundLocalesString } @@ -175,12 +170,25 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } } +ext { + libVersions = [ + Kovenant : '3.3.0', + Mime4J : '0.7.2', + Dagger : '2.11', + Exoplayer : '2.11.4', + Glide : '4.11.0', + MediaViewerLibrary: '0.9.23', + PlayServices : '17.0.0', + Stetho : '1.5.0', + ] +} + dependencies { implementation project(':twidere.component.common') implementation project(':twidere.component.nyan') /** Kotlin **/ - implementation "org.jetbrains.kotlin:kotlin-stdlib:${libVersions['Kotlin']}" + implementation "org.jetbrains.kotlin:kotlin-stdlib:${sharedVersions['Kotlin']}" implementation "nl.komponents.kovenant:kovenant:${libVersions['Kovenant']}" implementation "nl.komponents.kovenant:kovenant-android:${libVersions['Kovenant']}" implementation "nl.komponents.kovenant:kovenant-combine:${libVersions['Kovenant']}" @@ -193,20 +201,20 @@ dependencies { implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core:1.2.0' + implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01' implementation 'androidx.exifinterface:exifinterface:1.1.0' - implementation "androidx.preference:preference:1.1.1" implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.android.material:material:1.1.0' - implementation "androidx.core:core-ktx:1.2.0" /** Third-party dependencies **/ compileOnly 'javax.annotation:jsr250-api:1.0' - implementation "com.twitter:twitter-text:${libVersions['TwitterText']}" + implementation 'com.twitter:twitter-text:1.14.7' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' implementation 'com.squareup:otto:1.3.8' implementation 'dnsjava:dnsjava:2.1.8' @@ -214,18 +222,18 @@ dependencies { implementation 'com.rengwuxian.materialedittext:library:2.1.4' implementation 'com.pnikosis:materialish-progress:1.7' implementation 'com.github.uucky:ColorPicker-Android:0.9.7@aar' - implementation "pl.droidsonroids.gif:android-gif-drawable:${libVersions['AndroidGIFDrawable']}" + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.6' implementation 'com.sprylab.android.texturevideoview:texturevideoview:1.2.1' implementation 'com.squareup:pollexor:2.0.4' implementation "org.apache.james:apache-mime4j-core:${libVersions['Mime4J']}" implementation "org.apache.james:apache-mime4j-storage:${libVersions['Mime4J']}" - implementation "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}" - kapt "com.bluelinelabs:logansquare-compiler:${libVersions['LoganSquare']}" - implementation "com.fasterxml.jackson.core:jackson-core:2.7.4" - implementation "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}" - kapt "com.hannesdorfmann.parcelableplease:processor:${libVersions['ParcelablePlease']}" - implementation "com.squareup.okhttp3:okhttp:${libVersions['OkHttp']}" - implementation "com.squareup.okio:okio:2.4.3" + implementation "com.bluelinelabs:logansquare:${sharedVersions['LoganSquare']}" + kapt "com.bluelinelabs:logansquare-compiler:${sharedVersions['LoganSquare']}" + implementation "com.fasterxml.jackson.core:jackson-core:${sharedVersions['Jackson']}" + implementation "com.hannesdorfmann.parcelableplease:annotation:${sharedVersions['ParcelablePlease']}" + kapt "com.hannesdorfmann.parcelableplease:processor:${sharedVersions['ParcelablePlease']}" + implementation 'com.squareup.okhttp3:okhttp:3.8.1' + implementation 'com.squareup.okio:okio:2.4.3' implementation 'com.lnikkila:extendedtouchview:0.1.1' implementation "com.google.dagger:dagger:${libVersions['Dagger']}" kapt "com.google.dagger:dagger-compiler:${libVersions['Dagger']}" @@ -236,56 +244,55 @@ dependencies { implementation "com.google.android.exoplayer:exoplayer-ui:${libVersions['Exoplayer']}" implementation "com.google.android.exoplayer:extension-okhttp:${libVersions['Exoplayer']}" implementation "com.github.bumptech.glide:glide:${libVersions['Glide']}" - implementation "com.github.bumptech.glide:okhttp3-integration:${libVersions['GlideOkHttp3']}@aar" + implementation "com.github.bumptech.glide:okhttp3-integration:${libVersions['Glide']}@aar" kapt "com.github.bumptech.glide:compiler:${libVersions['Glide']}" - implementation "jp.wasabeef:glide-transformations:${libVersions['GlideTransformations']}" - implementation "com.theartofdev.edmodo:android-image-cropper:${libVersions['AndroidImageCropper']}" + implementation 'jp.wasabeef:glide-transformations:4.1.0' + implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.6' /** Custom dependencies **/ + implementation 'com.github.mariotaku:AbstractTask:0.9.5' implementation 'com.github.mariotaku:DragSortListView:0.6.1' - implementation "com.github.mariotaku:MessageBubbleView:${libVersions['MessageBubbleView']}" - implementation 'com.github.mariotaku:DragSortListView:0.6.1' - implementation "com.github.mariotaku.MediaViewerLibrary:base:${libVersions['MediaViewerLibrary']}" - implementation "com.github.mariotaku.MediaViewerLibrary:subsample-image-view:${libVersions['MediaViewerLibrary']}" - implementation "com.github.mariotaku:SQLiteQB:${libVersions['SQLiteQB']}" - implementation "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" - kapt "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}" - implementation "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}" - implementation "com.github.mariotaku:AbstractTask:${libVersions['AbstractTask']}" - implementation "com.github.mariotaku.CommonsLibrary:parcel:${libVersions['MariotakuCommons']}" - implementation "com.github.mariotaku.CommonsLibrary:io:${libVersions['MariotakuCommons']}" - implementation "com.github.mariotaku.CommonsLibrary:text:${libVersions['MariotakuCommons']}" - implementation "com.github.mariotaku.CommonsLibrary:text-kotlin:${libVersions['MariotakuCommons']}" - implementation("com.github.mariotaku.CommonsLibrary:emojione-android:${libVersions['MariotakuCommons']}") { + implementation "com.github.mariotaku.ExportablePreferences:core:${sharedVersions['ExportablePreferences']}" + implementation("com.github.mariotaku.CommonsLibrary:emojione-android:${sharedVersions['MariotakuCommons']}") { exclude group: 'org.apache.commons', module: 'commons-text' } - implementation "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}" - implementation "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}" - implementation "com.github.mariotaku:KPreferences:${libVersions['KPreferences']}" - implementation "com.github.mariotaku.UniqR:android:${libVersions['UniqR']}" - implementation "com.github.mariotaku:PickNCrop:${libVersions['PickNCrop']}" - implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:okhttp3:${libVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:logansquare:${libVersions['RestFu']}" - implementation "com.github.Tlaster:Chameleon:${libVersions['Chameleon']}" + implementation "com.github.mariotaku.CommonsLibrary:io:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:logansquare:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:objectcursor:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:parcel:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:text:${sharedVersions['MariotakuCommons']}" + implementation "com.github.mariotaku.CommonsLibrary:text-kotlin:${sharedVersions['MariotakuCommons']}" + implementation 'com.github.mariotaku:KPreferences:0.9.7' + implementation "com.github.mariotaku.MediaViewerLibrary:base:${libVersions['MediaViewerLibrary']}" + implementation "com.github.mariotaku.MediaViewerLibrary:subsample-image-view:${libVersions['MediaViewerLibrary']}" + implementation 'com.github.mariotaku:MessageBubbleView:3.5' + implementation "com.github.mariotaku.ObjectCursor:core:${sharedVersions['ObjectCursor']}" + kapt "com.github.mariotaku.ObjectCursor:processor:${sharedVersions['ObjectCursor']}" + implementation 'com.github.mariotaku:PickNCrop:0.9.27' + implementation "com.github.mariotaku.RestFu:library:${sharedVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:logansquare:${sharedVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:oauth:${sharedVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:oauth2:${sharedVersions['RestFu']}" + implementation "com.github.mariotaku.RestFu:okhttp3:${sharedVersions['RestFu']}" + implementation 'com.github.mariotaku:SQLiteQB:0.9.15' + implementation 'com.github.mariotaku.UniqR:android:0.9.4' + implementation 'com.github.Tlaster:Chameleon:0.9.28' /** Flavor dependencies **/ - fdroidImplementation "org.osmdroid:osmdroid-android:${libVersions['OSMDroid']}" - fdroidImplementation "ch.acra:acra:${libVersions['ACRA']}" + fdroidImplementation 'org.osmdroid:osmdroid-android:5.6.5' + fdroidImplementation 'ch.acra:acra:4.9.2' if (enableGoogleVariant) { // START Non-FOSS component googleImplementation "com.google.android.gms:play-services-ads:${libVersions['PlayServices']}" googleImplementation "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}" googleImplementation "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}" - googleImplementation "com.google.maps.android:android-maps-utils:${libVersions['MapsUtils']}" - googleImplementation "com.anjlab.android.iab.v3:library:${libVersions['IABv3']}" - googleImplementation "com.dropbox.core:dropbox-core-sdk:${libVersions['DropboxCoreSdk']}" - googleImplementation("com.google.apis:google-api-services-drive:${libVersions['GoogleDriveApi']}") { + googleImplementation 'com.google.maps.android:android-maps-utils:0.6.2' + googleImplementation 'com.anjlab.android.iab.v3:library:1.1.0' + googleImplementation 'com.dropbox.core:dropbox-core-sdk:3.1.3' + googleImplementation('com.google.apis:google-api-services-drive:v3-rev193-1.25.0') { exclude group: 'org.apache.httpcomponents' } implementation 'com.google.guava:guava:28.2-android' @@ -294,8 +301,8 @@ dependencies { debugImplementation "com.facebook.stetho:stetho:${libVersions['Stetho']}" debugImplementation "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}" - debugImplementation "com.github.mariotaku:StethoBeanShellREPL:${libVersions['StethoBeanShellREPL']}" - debugImplementation "com.squareup.leakcanary:leakcanary-android:${libVersions['LeakCanary']}" + debugImplementation 'com.github.mariotaku:StethoBeanShellREPL:0.1' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.1' debugImplementation('com.jayway.jsonpath:json-path:2.2.0') { exclude group: 'net.minidev', module: 'json-smart' } From 3f74f2e21ed63d1ada614efc23494dbe4f7c39b9 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 30 May 2020 21:12:53 -0400 Subject: [PATCH 04/24] Update plugins and Studio --- build.gradle | 2 +- twidere.component.common/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 81d6858d8..8f45e9677 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index dbe1794bd..d291b32c6 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -38,8 +38,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' } } From 44e8b40b69efd77e828348b9c4d1c16651874692 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 00:28:24 -0400 Subject: [PATCH 05/24] Update a bunch of dependencies --- twidere/build.gradle | 40 +++++++++---------- .../twidere/activity/ImageCropperActivity.kt | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index b711aa581..49b7e9387 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -174,12 +174,12 @@ ext { libVersions = [ Kovenant : '3.3.0', Mime4J : '0.7.2', - Dagger : '2.11', + Dagger : '2.28', Exoplayer : '2.11.4', Glide : '4.11.0', MediaViewerLibrary: '0.9.23', PlayServices : '17.0.0', - Stetho : '1.5.0', + Stetho : '1.5.1', ] } @@ -202,11 +202,11 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core:1.2.0' implementation 'androidx.core:core-ktx:1.2.0' - implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01' - implementation 'androidx.exifinterface:exifinterface:1.1.0' + implementation 'androidx.drawerlayout:drawerlayout:1.1.0-rc01' + implementation 'androidx.exifinterface:exifinterface:1.2.0' implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.palette:palette-ktx:1.0.0' implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.android.material:material:1.1.0' @@ -217,12 +217,12 @@ dependencies { implementation 'com.twitter:twitter-text:1.14.7' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' implementation 'com.squareup:otto:1.3.8' - implementation 'dnsjava:dnsjava:2.1.8' - implementation 'com.commonsware.cwac:layouts:0.4.3' + implementation 'dnsjava:dnsjava:2.1.9' + implementation 'com.commonsware.cwac:layouts:0.4.5' implementation 'com.rengwuxian.materialedittext:library:2.1.4' implementation 'com.pnikosis:materialish-progress:1.7' implementation 'com.github.uucky:ColorPicker-Android:0.9.7@aar' - implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.6' + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15' implementation 'com.sprylab.android.texturevideoview:texturevideoview:1.2.1' implementation 'com.squareup:pollexor:2.0.4' implementation "org.apache.james:apache-mime4j-core:${libVersions['Mime4J']}" @@ -232,14 +232,14 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-core:${sharedVersions['Jackson']}" implementation "com.hannesdorfmann.parcelableplease:annotation:${sharedVersions['ParcelablePlease']}" kapt "com.hannesdorfmann.parcelableplease:processor:${sharedVersions['ParcelablePlease']}" - implementation 'com.squareup.okhttp3:okhttp:3.8.1' - implementation 'com.squareup.okio:okio:2.4.3' + implementation 'com.squareup.okhttp3:okhttp:3.12.12' + implementation 'com.squareup.okio:okio:2.6.0' implementation 'com.lnikkila:extendedtouchview:0.1.1' implementation "com.google.dagger:dagger:${libVersions['Dagger']}" kapt "com.google.dagger:dagger-compiler:${libVersions['Dagger']}" - implementation 'org.attoparser:attoparser:2.0.4.RELEASE' - implementation 'com.getkeepsafe.taptargetview:taptargetview:1.9.1' - implementation 'net.ypresto.androidtranscoder:android-transcoder:0.2.0' + implementation 'org.attoparser:attoparser:2.0.5.RELEASE' + implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0' + implementation 'net.ypresto.androidtranscoder:android-transcoder:0.3.0' implementation "com.google.android.exoplayer:exoplayer-core:${libVersions['Exoplayer']}" implementation "com.google.android.exoplayer:exoplayer-ui:${libVersions['Exoplayer']}" implementation "com.google.android.exoplayer:extension-okhttp:${libVersions['Exoplayer']}" @@ -247,7 +247,7 @@ dependencies { implementation "com.github.bumptech.glide:okhttp3-integration:${libVersions['Glide']}@aar" kapt "com.github.bumptech.glide:compiler:${libVersions['Glide']}" implementation 'jp.wasabeef:glide-transformations:4.1.0' - implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.6' + implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' /** Custom dependencies **/ @@ -263,7 +263,7 @@ dependencies { implementation "com.github.mariotaku.CommonsLibrary:parcel:${sharedVersions['MariotakuCommons']}" implementation "com.github.mariotaku.CommonsLibrary:text:${sharedVersions['MariotakuCommons']}" implementation "com.github.mariotaku.CommonsLibrary:text-kotlin:${sharedVersions['MariotakuCommons']}" - implementation 'com.github.mariotaku:KPreferences:0.9.7' + implementation 'com.github.mariotaku:KPreferences:0.9.8' implementation "com.github.mariotaku.MediaViewerLibrary:base:${libVersions['MediaViewerLibrary']}" implementation "com.github.mariotaku.MediaViewerLibrary:subsample-image-view:${libVersions['MediaViewerLibrary']}" implementation 'com.github.mariotaku:MessageBubbleView:3.5' @@ -282,7 +282,7 @@ dependencies { /** Flavor dependencies **/ fdroidImplementation 'org.osmdroid:osmdroid-android:5.6.5' - fdroidImplementation 'ch.acra:acra:4.9.2' + fdroidImplementation 'ch.acra:acra:4.11' if (enableGoogleVariant) { // START Non-FOSS component @@ -292,7 +292,7 @@ dependencies { googleImplementation 'com.google.maps.android:android-maps-utils:0.6.2' googleImplementation 'com.anjlab.android.iab.v3:library:1.1.0' googleImplementation 'com.dropbox.core:dropbox-core-sdk:3.1.3' - googleImplementation('com.google.apis:google-api-services-drive:v3-rev193-1.25.0') { + googleImplementation('com.google.apis:google-api-services-drive:v3-rev195-1.25.0') { exclude group: 'org.apache.httpcomponents' } implementation 'com.google.guava:guava:28.2-android' @@ -301,9 +301,9 @@ dependencies { debugImplementation "com.facebook.stetho:stetho:${libVersions['Stetho']}" debugImplementation "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}" - debugImplementation 'com.github.mariotaku:StethoBeanShellREPL:0.1' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.1' - debugImplementation('com.jayway.jsonpath:json-path:2.2.0') { + debugImplementation 'com.github.mariotaku:StethoBeanShellREPL:0.5' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3' + debugImplementation('com.jayway.jsonpath:json-path:2.4.0') { exclude group: 'net.minidev', module: 'json-smart' } // Stetho dependency, see https://g.co/androidstudio/app-test-app-conflict diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt index 914b8cb6c..c092e3d62 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt @@ -171,7 +171,7 @@ class ImageCropperActivity : BaseActivity(), CropImageView.OnSetImageUriComplete private fun getResultIntent(uri: Uri?, error: Exception?, sampleSize: Int): Intent { val result = CropImage.ActivityResult(cropImageView.imageUri, uri, error, cropImageView.cropPoints, cropImageView.cropRect, cropImageView.rotatedDegrees, - sampleSize) + cropImageView.wholeImageRect, sampleSize) val intent = Intent() intent.putExtra(CropImage.CROP_IMAGE_EXTRA_RESULT, result) return intent From 95f407ee2b6797d362a4d929801280d06795f285 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 00:32:22 -0400 Subject: [PATCH 06/24] Add compile encoding option to prevent possible strange xml malformation --- twidere.component.common/build.gradle | 1 + twidere.component.nyan/build.gradle | 1 + twidere/build.gradle | 1 + 3 files changed, 3 insertions(+) diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index d291b32c6..0a025df0e 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -67,6 +67,7 @@ android { } compileOptions { + encoding = 'UTF-8' sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index ba2fc3d17..afe678fbf 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -31,6 +31,7 @@ android { } compileOptions { + encoding = 'UTF-8' sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } diff --git a/twidere/build.gradle b/twidere/build.gradle index 49b7e9387..cf2112520 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -111,6 +111,7 @@ android { } compileOptions { + encoding = 'UTF-8' sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } From 11a2d99c3958d5f8e888a66971bfa16bed7fe044 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 01:54:57 -0400 Subject: [PATCH 07/24] Use require instead of get for better error messages --- .../twidere/activity/ComposeActivity.kt | 8 ++++---- .../twidere/activity/HomeActivity.kt | 2 +- .../activity/InvalidAccountAlertActivity.kt | 2 +- .../twidere/activity/SettingsActivity.kt | 2 +- .../twidere/activity/SignInActivity.kt | 12 +++++------ .../TrendsLocationSelectorActivity.kt | 4 ++-- .../twidere/adapter/StatusDetailsAdapter.kt | 2 +- .../fragment/APIEditorDialogFragment.kt | 14 ++++++------- .../twidere/fragment/AbsActivitiesFragment.kt | 2 +- .../fragment/AbsContentListViewFragment.kt | 4 ++-- .../AbsContentRecyclerViewFragment.kt | 8 ++++---- .../fragment/AbsMediaStatusesFragment.kt | 2 +- .../twidere/fragment/AbsStatusesFragment.kt | 4 ++-- .../fragment/AbsToolbarTabPagesFragment.kt | 4 ++-- .../AbsUserMuteBlockDialogFragment.kt | 2 +- .../fragment/AccountsDashboardFragment.kt | 8 ++++---- .../fragment/AccountsManagerFragment.kt | 6 +++--- .../fragment/AddStatusFilterDialogFragment.kt | 2 +- .../twidere/fragment/BaseDialogFragment.kt | 2 +- .../twidere/fragment/BaseFragment.kt | 2 +- .../twidere/fragment/BaseWebViewFragment.kt | 2 +- .../fragment/ColorPickerDialogFragment.kt | 4 ++-- .../fragment/CreateUserListDialogFragment.kt | 2 +- .../fragment/CursorActivitiesFragment.kt | 2 +- .../fragment/CursorStatusesFragment.kt | 2 +- .../twidere/fragment/CustomTabsFragment.kt | 8 ++++---- .../fragment/DateTimePickerDialogFragment.kt | 2 +- .../DeleteUserListMembersDialogFragment.kt | 2 +- .../DestroyFriendshipDialogFragment.kt | 2 +- .../DestroySavedSearchDialogFragment.kt | 2 +- .../fragment/DestroyUserListDialogFragment.kt | 2 +- ...stroyUserListSubscriptionDialogFragment.kt | 2 +- .../fragment/EditAltTextDialogFragment.kt | 6 +++--- .../fragment/EditUserListDialogFragment.kt | 2 +- .../fragment/ExtensionsListFragment.kt | 6 +++--- ...ExtraFeaturesIntroductionDialogFragment.kt | 6 +++--- .../twidere/fragment/GroupFragment.kt | 2 +- .../fragment/HostMappingsListFragment.kt | 6 +++--- .../twidere/fragment/ItemsListFragment.kt | 4 ++-- .../twidere/fragment/MessageDialogFragment.kt | 4 ++-- .../fragment/ParcelableGroupsFragment.kt | 2 +- .../fragment/ParcelableUserListsFragment.kt | 2 +- .../fragment/ParcelableUsersFragment.kt | 2 +- .../fragment/PermissionRequestDialog.kt | 8 ++++---- .../PhishingLinkWarningDialogFragment.kt | 2 +- .../fragment/SavedSearchesListFragment.kt | 2 +- .../SensitiveContentWarningDialogFragment.kt | 2 +- .../fragment/SetUserNicknameDialogFragment.kt | 2 +- .../ThemedPreferenceDialogFragmentCompat.kt | 2 +- .../fragment/TrendsSuggestionsFragment.kt | 4 ++-- .../twidere/fragment/UserFragment.kt | 20 +++++++++---------- .../twidere/fragment/UserListFragment.kt | 6 +++--- .../fragment/UserListMembershipsFragment.kt | 2 +- .../fragment/UserListSubscriptionsFragment.kt | 2 +- .../fragment/UserListsOwnershipsFragment.kt | 4 ++-- .../fragment/UserProfileEditorFragment.kt | 12 +++++------ .../twidere/fragment/UserQrDialogFragment.kt | 6 +++--- .../fragment/drafts/DraftsListFragment.kt | 6 +++--- .../fragment/filter/AddEditItemFragment.kt | 10 +++++----- .../fragment/filter/BaseFiltersFragment.kt | 2 +- .../filter/BaseFiltersImportFragment.kt | 6 +++--- .../fragment/filter/FilteredUsersFragment.kt | 4 ++-- .../filter/FiltersSubscriptionsFragment.kt | 14 ++++++------- .../fragment/media/ExoPlayerPageFragment.kt | 6 +++--- .../fragment/media/ImagePageFragment.kt | 2 +- .../fragment/media/VideoPageFragment.kt | 6 +++--- .../MessageConversationInfoFragment.kt | 20 +++++++++---------- .../message/MessageNewConversationFragment.kt | 2 +- .../message/MessagesConversationFragment.kt | 6 +++--- .../message/MessagesEntriesFragment.kt | 4 ++-- .../fragment/search/MastodonSearchFragment.kt | 2 +- .../AbsSimpleStatusOperationDialogFragment.kt | 2 +- .../status/AbsStatusDialogFragment.kt | 4 ++-- .../status/BlockStatusUsersDialogFragment.kt | 4 ++-- .../status/MuteStatusUsersDialogFragment.kt | 4 ++-- .../status/PinStatusDialogFragment.kt | 2 +- .../status/RetweetQuoteDialogFragment.kt | 2 +- .../twidere/fragment/status/StatusFragment.kt | 10 +++++----- .../TranslationDestinationDialogFragment.kt | 2 +- .../status/UnpinStatusDialogFragment.kt | 2 +- .../statuses/GroupTimelineFragment.kt | 2 +- .../statuses/MediaStatusesSearchFragment.kt | 2 +- .../statuses/StatusesSearchFragment.kt | 8 ++++---- .../statuses/UserFavoritesFragment.kt | 2 +- .../statuses/UserListTimelineFragment.kt | 2 +- .../fragment/statuses/UserMentionsFragment.kt | 2 +- .../fragment/statuses/UserTimelineFragment.kt | 2 +- .../fragment/sync/SyncSettingsFragment.kt | 4 ++-- .../preference/ColorPickerPreference.kt | 2 +- .../premium/SyncStatusViewController.kt | 6 +++--- 90 files changed, 197 insertions(+), 197 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt index 258354b19..a57fde2cf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -1839,8 +1839,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val context = activity!! - val builder = AlertDialog.Builder(context!!) + val context = requireActivity() + val builder = AlertDialog.Builder(requireContext()) builder.setMessage(R.string.quote_protected_status_warning_message) builder.setPositiveButton(R.string.send_anyway, this) builder.setNegativeButton(android.R.string.cancel, null) @@ -1873,8 +1873,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val context = activity!! - val builder = AlertDialog.Builder(context!!) + val context = requireActivity() + val builder = AlertDialog.Builder(requireContext()) builder.setMessage(getString(R.string.message_format_compose_message_convert_to_status, "@$screenName")) builder.setPositiveButton(R.string.action_send, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index eca60ca7f..08ea82c6c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -1070,7 +1070,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp class AutoRefreshConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.auto_refresh) builder.setMessage(R.string.message_auto_refresh_confirm) builder.setPositiveButton(android.R.string.ok) { _, _ -> diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt index 51d90f0b3..b3c48ee0d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/InvalidAccountAlertActivity.kt @@ -30,7 +30,7 @@ class InvalidAccountAlertActivity : FragmentActivity() { class InvalidAccountAlertDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.title_error_invalid_account) builder.setMessage(R.string.message_error_invalid_account) builder.setPositiveButton(android.R.string.ok) { _, _ -> diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt index 7216b56a1..c0b2863fa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt @@ -388,7 +388,7 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF class RestartConfirmDialogFragment : BaseDialogFragment(), DialogInterface.OnClickListener { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(activity!!) + val builder = AlertDialog.Builder(requireActivity()) if (arguments?.getBoolean(EXTRA_SHOULD_TERMINATE) == true) { builder.setMessage(R.string.app_terminate_confirm) builder.setNegativeButton(R.string.action_dont_terminate, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt index 09f6c1e54..de95a88c3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt @@ -573,13 +573,13 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, class SignInTypeChooserDialogFragment : BaseDialogFragment(), LoaderManager.LoaderCallbacks> { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_expandable_list) val dialog = builder.create() dialog.onShow { it.applyTheme() val listView = it.expandableList - val adapter = LoginTypeAdapter(context!!) + val adapter = LoginTypeAdapter(requireContext()) listView.setAdapter(adapter) listView.setOnGroupClickListener { _, _, groupPosition, _ -> val type = adapter.getGroup(groupPosition) @@ -623,7 +623,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, AccountType.MASTODON, AccountType.STATUSNET) val result = supportedAccountTypes.mapNotNullTo(ArrayList()) { type -> if (type == AccountType.MASTODON) return@mapNotNullTo LoginType(type, - listOf(CustomAPIConfig.mastodon(context!!))) + listOf(CustomAPIConfig.mastodon(requireContext()))) return@mapNotNullTo configGroup[type]?.let { list -> LoginType(type, list.sortedBy { !it.isDefault }) } @@ -632,7 +632,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return DefaultAPIConfigLoader(context!!) + return DefaultAPIConfigLoader(requireContext()) } override fun onLoaderReset(loader: Loader>) { @@ -694,7 +694,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, var challengeType: String? = null override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.login_verification) builder.setView(R.layout.dialog_login_verification_code) builder.positive(android.R.string.ok, this::performVerification) @@ -753,7 +753,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, class PasswordSignInDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_password_sign_in) builder.positive(R.string.action_sign_in, this::onPositiveButton) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt index 976364e32..0b904299e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt @@ -93,7 +93,7 @@ class TrendsLocationSelectorActivity : BaseActivity() { private val list: Array get() = arguments?.getTypedArray(EXTRA_DATA) ?: emptyArray() override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val selectorBuilder = AlertDialog.Builder(context!!) + val selectorBuilder = AlertDialog.Builder(requireContext()) selectorBuilder.setTitle(R.string.trends_location) selectorBuilder.setView(R.layout.dialog_expandable_list) selectorBuilder.setNegativeButton(android.R.string.cancel, null) @@ -101,7 +101,7 @@ class TrendsLocationSelectorActivity : BaseActivity() { dialog.onShow { it.applyTheme() val listView = it.expandableList - val adapter = ExpandableTrendLocationsListAdapter(context!!) + val adapter = ExpandableTrendLocationsListAdapter(requireContext()) adapter.data = list listView.setAdapter(adapter) listView.setOnGroupClickListener(ExpandableListView.OnGroupClickListener { _, _, groupPosition, _ -> diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt index 693423eac..4961d3906 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -51,7 +51,7 @@ import org.mariotaku.twidere.view.holder.status.DetailStatusViewHolder class StatusDetailsAdapter( val fragment: StatusFragment -) : LoadMoreSupportAdapter(fragment.context!!, fragment.requestManager), +) : LoadMoreSupportAdapter(fragment.requireContext(), fragment.requestManager), IStatusesAdapter>, IItemCountsAdapter { override val twidereLinkify: TwidereLinkify diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt index 2a9132c74..ae6d81f37 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt @@ -43,7 +43,7 @@ class APIEditorDialogFragment : BaseDialogFragment() { private lateinit var apiConfig: CustomAPIConfig override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_api_editor) builder.setPositiveButton(R.string.action_save) { _, _ -> val targetFragment = this.targetFragment @@ -76,8 +76,8 @@ class APIEditorDialogFragment : BaseDialogFragment() { accountTypeSpinner.adapter = AccountTypeSpinnerAdapter(this) - editConsumerKey.addValidator(ConsumerKeySecretValidator(context!!.getString(R.string.invalid_consumer_key))) - editConsumerSecret.addValidator(ConsumerKeySecretValidator(context!!.getString(R.string.invalid_consumer_secret))) + editConsumerKey.addValidator(ConsumerKeySecretValidator(requireContext().getString(R.string.invalid_consumer_key))) + editConsumerSecret.addValidator(ConsumerKeySecretValidator(requireContext().getString(R.string.invalid_consumer_secret))) editNoVersionSuffix.setOnCheckedChangeListener { _, _ -> editNoVersionSuffixChanged = true } editAuthType.setOnCheckedChangeListener { _, checkedId -> @@ -145,8 +145,8 @@ class APIEditorDialogFragment : BaseDialogFragment() { private lateinit var adapter: ArrayAdapter override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - adapter = CustomAPIConfigArrayAdapter(context!!) - val builder = AlertDialog.Builder(context!!) + adapter = CustomAPIConfigArrayAdapter(requireContext()) + val builder = AlertDialog.Builder(requireContext()) builder.setAdapter(adapter, this) loaderManager.initLoader(0, null, this) val dialog = builder.create() @@ -162,7 +162,7 @@ class APIEditorDialogFragment : BaseDialogFragment() { } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return DefaultAPIConfigLoader(context!!) + return DefaultAPIConfigLoader(requireContext()) } override fun onLoadFinished(loader: Loader>, data: List) { @@ -189,7 +189,7 @@ class APIEditorDialogFragment : BaseDialogFragment() { private class AccountTypeSpinnerAdapter( fragment: APIEditorDialogFragment - ) : BaseArrayAdapter(fragment.context!!, R.layout.support_simple_spinner_dropdown_item, + ) : BaseArrayAdapter(fragment.requireContext(), R.layout.support_simple_spinner_dropdown_item, requestManager = fragment.requestManager) { init { add(AccountType.TWITTER) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt index ac0ef2730..cd5d4bc6d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt @@ -185,7 +185,7 @@ abstract class AbsActivitiesFragment protected constructor() : override fun onCreateLoader(id: Int, args: Bundle?): Loader> { val fromUser = args?.getBoolean(EXTRA_FROM_USER) args?.remove(EXTRA_FROM_USER) - return onCreateActivitiesLoader(activity!!, args!!, fromUser!!) + return onCreateActivitiesLoader(requireActivity(), args!!, fromUser!!) } protected fun saveReadPosition() { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt index 96e9d0cba..bcca505a2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt @@ -129,12 +129,12 @@ abstract class AbsContentListViewFragment : BaseFragment(), override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - val backgroundColor = ThemeUtils.getColorBackground(context!!) + val backgroundColor = ThemeUtils.getColorBackground(requireContext()) val colorRes = TwidereColorUtils.getContrastYIQ(backgroundColor, R.color.bg_refresh_progress_color_light, R.color.bg_refresh_progress_color_dark) swipeLayout.setOnRefreshListener(this) swipeLayout.setProgressBackgroundColorSchemeResource(colorRes) - adapter = onCreateAdapter(context!!, requestManager) + adapter = onCreateAdapter(requireContext(), requestManager) listView.setOnTouchListener { _, event -> if (event.actionMasked == MotionEvent.ACTION_DOWN) { updateRefreshProgressOffset() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt index 2da1262b4..a2d466535 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt @@ -182,13 +182,13 @@ abstract class AbsContentRecyclerViewFragment?> { val fromUser = args?.getBoolean(EXTRA_FROM_USER) args?.remove(EXTRA_FROM_USER) - return onCreateStatusesLoader(activity!!, args!!, fromUser!!) + return onCreateStatusesLoader(requireActivity(), args!!, fromUser!!) } final override fun onLoadFinished(loader: Loader?>, data: List?) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt index c05c0a967..55cc8e1e4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt @@ -239,7 +239,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment?> { val fromUser = args?.getBoolean(EXTRA_FROM_USER) args?.remove(EXTRA_FROM_USER) - return onCreateStatusesLoader(activity!!, args!!, fromUser!!) + return onCreateStatusesLoader(requireActivity(), args!!, fromUser!!) } override fun setUserVisibleHint(isVisibleToUser: Boolean) { @@ -562,7 +562,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment return MenuUtils.handleStatusClick(activity!!, this, fragmentManager!!, + else -> return MenuUtils.handleStatusClick(requireActivity(), this, requireFragmentManager(), preferences, userColorNameManager, twitterWrapper, status, item) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt index a8d981b07..2baa1577b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt @@ -47,7 +47,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) val activity = activity - pagerAdapter = SupportTabsAdapter(activity!!, childFragmentManager, null) + pagerAdapter = SupportTabsAdapter(requireActivity(), childFragmentManager, null) viewPager.adapter = pagerAdapter viewPager.offscreenPageLimit = 2 viewPager.addOnPageChangeListener(this) @@ -149,7 +149,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte if (height != 0) { insets.top = height } else { - insets.top = ThemeUtils.getActionBarHeight(context!!) + insets.top = ThemeUtils.getActionBarHeight(requireContext()) } return true } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt index ad7a2550e..313347bc0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsUserMuteBlockDialogFragment.kt @@ -48,7 +48,7 @@ abstract class AbsUserMuteBlockDialogFragment : BaseDialogFragment(), DialogInte } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(getTitle(user)) builder.setView(R.layout.dialog_block_mute_filter_user_confirm) builder.setPositiveButton(getPositiveButtonTitle(user), this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt index 5d97ab4ed..db5848565 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt @@ -259,7 +259,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return AccountsInfoLoader(activity!!, accountsAdapter.accounts == null) + return AccountsInfoLoader(requireActivity(), accountsAdapter.accounts == null) } @@ -538,10 +538,10 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, } else if (user.account_color != 0) { ColorDrawable(user.account_color) } else { - ColorDrawable(Chameleon.getOverrideTheme(activity!!, activity).colorPrimary) + ColorDrawable(Chameleon.getOverrideTheme(requireActivity(), activity).colorPrimary) } - requestManager.loadProfileBanner(context!!, account.user, width).fallback(fallbackBanner) + requestManager.loadProfileBanner(requireContext(), account.user, width).fallback(fallbackBanner) .into(bannerView) } @@ -557,7 +557,7 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, } else { "${if (showType) account.type else ""}@${account.user.screen_name}" } - requestManager.loadProfileImage(context!!, account, preferences[profileImageStyleKey], + requestManager.loadProfileImage(requireContext(), account, preferences[profileImageStyleKey], accountProfileImageView.cornerRadius, accountProfileImageView.cornerRadiusRatio, ProfileImageSize.REASONABLY_SMALL).placeholder(profileImageSnapshot).into(accountProfileImageView) //TODO complete border color diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt index ab35857b5..052d6953c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt @@ -60,7 +60,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • @@ -158,7 +158,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • > { - return AccountDetailsLoader(context!!) + return AccountDetailsLoader(requireContext()) } override fun onLoaderReset(loader: Loader>) { @@ -227,7 +227,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • ? = null override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) filterItems = filterItemsInfo val entries = arrayOfNulls(filterItems!!.size) val nameFirst = preferences[nameFirstKey] diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt index 14a33c6e9..6e6b72863 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt @@ -63,7 +63,7 @@ open class BaseDialogFragment : DialogFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestManager = Glide.with(context!!)// TODO: Upgrade Glide usage + requestManager = Glide.with(requireContext())// TODO: Upgrade Glide usage } override fun onStart() { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt index dd2930912..06953601e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseFragment.kt @@ -102,7 +102,7 @@ open class BaseFragment : Fragment(), IBaseFragment { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestManager = Glide.with(context!!)// TODO: Upgrade Glide usage + requestManager = Glide.with(requireContext())// TODO: Upgrade Glide usage } override fun onStart() { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt index ec93e57b0..14ad0d0ad 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseWebViewFragment.kt @@ -48,7 +48,7 @@ open class BaseWebViewFragment : BaseFragment() { protected fun createWebViewClient(): WebViewClient { - return DefaultWebViewClient(activity!!) + return DefaultWebViewClient(requireActivity()) } /** diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt index 7783736d5..aa62fa2e8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt @@ -68,7 +68,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL } val activity = activity - val builder = AlertDialog.Builder(activity!!) + val builder = AlertDialog.Builder(requireActivity()) builder.setView(me.uucky.colorpicker.R.layout.cp__dialog_color_picker) builder.setPositiveButton(android.R.string.ok, this) if (args!!.getBoolean(EXTRA_CLEAR_BUTTON, false)) { @@ -82,7 +82,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL val showAlphaSlider = args.getBoolean(EXTRA_ALPHA_SLIDER, true) for (presetColor in PRESET_COLORS) { - controller!!.addColor(ContextCompat.getColor(context!!, presetColor)) + controller!!.addColor(ContextCompat.getColor(requireContext(), presetColor)) } controller!!.setAlphaEnabled(showAlphaSlider) controller!!.setInitialColor(color) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt index ace3fe233..7086fbaa5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CreateUserListDialogFragment.kt @@ -38,7 +38,7 @@ import org.mariotaku.twidere.util.ParseUtils class CreateUserListDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_user_list_detail_editor) builder.setTitle(R.string.new_user_list) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt index cff0549e7..c824d0d08 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorActivitiesFragment.kt @@ -59,7 +59,7 @@ import org.mariotaku.twidere.util.Utils abstract class CursorActivitiesFragment : AbsActivitiesFragment() { override val accountKeys: Array - get() = Utils.getAccountKeys(context!!, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context!!) + get() = Utils.getAccountKeys(requireContext(), arguments) ?: DataStoreUtils.getActivatedAccountKeys(requireContext()) abstract val contentUri: Uri diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt index 52311562e..0fae563f0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt @@ -70,7 +70,7 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { get() = false override val accountKeys: Array - get() = Utils.getAccountKeys(context!!, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context!!) + get() = Utils.getAccountKeys(requireContext(), arguments) ?: DataStoreUtils.getActivatedAccountKeys(requireContext()) abstract val errorInfoKey: String abstract val isFilterEnabled: Boolean diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt index 1bc4678fb..097c55387 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CustomTabsFragment.kt @@ -93,7 +93,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - adapter = CustomTabsAdapter(context!!) + adapter = CustomTabsAdapter(requireContext()) listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE_MODAL listView.setMultiChoiceModeListener(this) listView.onItemClickListener = OnItemClickListener { _, _, position, _ -> @@ -130,7 +130,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - return CursorLoader(activity!!, Tabs.CONTENT_URI, Tabs.COLUMNS, null, null, Tabs.DEFAULT_SORT_ORDER) + return CursorLoader(requireActivity(), Tabs.CONTENT_URI, Tabs.COLUMNS, null, null, Tabs.DEFAULT_SORT_ORDER) } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { @@ -138,7 +138,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice val context = this.context val accounts = AccountUtils.getAllAccountDetails(AccountManager.get(context), false) val itemAdd = menu.findItem(R.id.add_submenu) - val theme = Chameleon.getOverrideTheme(context!!, context) + val theme = Chameleon.getOverrideTheme(requireContext(), context) if (itemAdd != null && itemAdd.hasSubMenu()) { val subMenu = itemAdd.subMenu subMenu.clear() @@ -394,7 +394,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_custom_tab_editor) builder.setPositiveButton(R.string.action_save, null) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt index 279a8e056..18db4ef16 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DateTimePickerDialogFragment.kt @@ -44,7 +44,7 @@ class DateTimePickerDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_date_time_picker) builder.setNegativeButton(android.R.string.cancel, null) builder.setPositiveButton(android.R.string.ok, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt index afc2b1666..273c1c2e0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.kt @@ -50,7 +50,7 @@ class DeleteUserListMembersDialogFragment : BaseDialogFragment(), DialogInterfac } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val users = users val userList = userList if (users == null || userList == null) throw NullPointerException() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt index 4157cb1fe..ebb6e17cc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.kt @@ -48,7 +48,7 @@ class DestroyFriendshipDialogFragment : BaseDialogFragment(), DialogInterface.On } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val nameFirst = preferences[nameFirstKey] val displayName = userColorNameManager.getDisplayName(user, nameFirst) builder.setTitle(getString(R.string.unfollow_user, displayName)) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt index d5f9fa4d7..895e4e50b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.kt @@ -48,7 +48,7 @@ class DestroySavedSearchDialogFragment : BaseDialogFragment(), DialogInterface.O override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val name = searchName builder.setTitle(getString(R.string.destroy_saved_search, name)) builder.setMessage(getString(R.string.destroy_saved_search_confirm_message, name)) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt index 1409d68f1..73c08ca6e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.kt @@ -46,7 +46,7 @@ class DestroyUserListDialogFragment : BaseDialogFragment(), DialogInterface.OnCl override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val userList = userList builder.setTitle(getString(R.string.delete_user_list, userList.name)) builder.setMessage(getString(R.string.delete_user_list_confirm_message, userList.name)) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt index a0c51fcf9..182e062d1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.kt @@ -47,7 +47,7 @@ class DestroyUserListSubscriptionDialogFragment : BaseDialogFragment(), DialogIn override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val userList = userList if (userList != null) { builder.setTitle(getString(R.string.unsubscribe_from_user_list, userList.name)) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt index f80d76ecb..c05ede01a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditAltTextDialogFragment.kt @@ -36,11 +36,11 @@ import org.mariotaku.twidere.extension.applyTheme class EditAltTextDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.edit_description) builder.setView(R.layout.dialog_compose_edit_alt_text) builder.setNegativeButton(android.R.string.cancel, null) - val position = arguments!!.getInt(EXTRA_POSITION) + val position = requireArguments().getInt(EXTRA_POSITION) builder.setPositiveButton(android.R.string.ok) { dialog, _ -> val altText = (dialog as Dialog).editText.string callback?.onSetAltText(position, altText) @@ -51,7 +51,7 @@ class EditAltTextDialogFragment : BaseDialogFragment() { val dialog = builder.create() dialog.applyOnShow { applyTheme() - editText.setText(arguments!!.getString(EXTRA_TEXT)) + editText.setText(requireArguments().getString(EXTRA_TEXT)) } return dialog } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt index ca89f7605..75226fdbc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt @@ -40,7 +40,7 @@ class EditUserListDialogFragment : BaseDialogFragment() { private val listId: String by lazy { arguments?.getString(EXTRA_LIST_ID)!! } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_user_list_detail_editor) builder.setTitle(R.string.title_user_list) builder.positive(android.R.string.ok, this::onPositiveClick) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt index df3ec1f1c..28b50c5d7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt @@ -57,11 +57,11 @@ class ExtensionsListFragment : AbsContentListViewFragment(), } override fun onCreateAdapter(context: Context, requestManager: RequestManager): ExtensionsAdapter { - return ExtensionsAdapter(activity!!, requestManager) + return ExtensionsAdapter(requireActivity(), requestManager) } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { - return ExtensionsListLoader(activity!!) + return ExtensionsListLoader(requireActivity()) } override fun onLoadFinished(loader: Loader>, data: List) { @@ -128,7 +128,7 @@ class ExtensionsListFragment : AbsContentListViewFragment(), if (info.settings != null) { intent.setClassName(info.packageName, info.settings) } else { - val pm = activity!!.packageManager + val pm = requireActivity().packageManager val activities = pm.queryIntentActivities(intent, 0) if (activities.isEmpty()) { return false diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt index ae8508b55..e540e3651 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtraFeaturesIntroductionDialogFragment.kt @@ -32,7 +32,7 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { val requestCode: Int get() = arguments?.getInt(EXTRA_REQUEST_CODE, 0) ?: 0 override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.title_extra_features) builder.setView(R.layout.dialog_extra_features_introduction) builder.setPositiveButton(R.string.action_purchase) { _, _ -> @@ -42,7 +42,7 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { builder.setNegativeButton(R.string.action_later) { _, _ -> onDialogCancelled() } - val restorePurchaseIntent = extraFeaturesService.createRestorePurchaseIntent(context!!, feature) + val restorePurchaseIntent = extraFeaturesService.createRestorePurchaseIntent(requireContext(), feature) if (restorePurchaseIntent != null) { builder.setNeutralButton(R.string.action_restore_purchase) { _, _ -> startActivityForResultOnTarget(restorePurchaseIntent) @@ -56,7 +56,7 @@ class ExtraFeaturesIntroductionDialogFragment : BaseDialogFragment() { } else { View.GONE } - val description = ExtraFeaturesService.getIntroduction(context!!, feature) + val description = ExtraFeaturesService.getIntroduction(requireContext(), feature) val featureIcon = it.featureIcon val featureDescription = it.featureDescription featureIcon.setImageResource(description.icon) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt index 91bf87764..492d90c8d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt @@ -53,7 +53,7 @@ class GroupFragment : AbsToolbarTabPagesFragment(), LoaderCallbacks?> { - return ItemsLoader(context!!, arguments!!) + return ItemsLoader(requireContext(), requireArguments()) } final override fun onLoadFinished(loader: Loader?>, data: List?) { @@ -176,7 +176,7 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment?> { val fromUser = args?.getBoolean(EXTRA_FROM_USER) args?.remove(EXTRA_FROM_USER) - return onCreateUserListsLoader(activity!!, args!!, fromUser!!) + return onCreateUserListsLoader(requireActivity(), args!!, fromUser!!) } override fun onLoaderReset(loader: Loader?>) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt index 0feac0981..ba8754e7f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt @@ -137,7 +137,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< override fun onCreateLoader(id: Int, args: Bundle?): Loader> { val fromUser = args?.getBoolean(EXTRA_FROM_USER) args?.remove(EXTRA_FROM_USER) - return onCreateUserListsLoader(activity!!, args!!, fromUser!!) + return onCreateUserListsLoader(requireActivity(), args!!, fromUser!!) } override fun onLoaderReset(loader: Loader>) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt index 075a55568..6784a1126 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt @@ -124,7 +124,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment?> { val fromUser = args?.getBoolean(EXTRA_FROM_USER) args?.remove(EXTRA_FROM_USER) - return onCreateUsersLoader(activity!!, args!!, fromUser!!).apply { + return onCreateUsersLoader(requireActivity(), args!!, fromUser!!).apply { if (this is AbsRequestUsersLoader) { pagination = args.getParcelable(EXTRA_PAGINATION) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PermissionRequestDialog.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PermissionRequestDialog.kt index a058065ed..e82845268 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PermissionRequestDialog.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PermissionRequestDialog.kt @@ -18,10 +18,10 @@ import org.mariotaku.twidere.extension.onShow class PermissionRequestDialog : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) - val permissions = arguments!!.getStringArray(EXTRA_PERMISSIONS).orEmpty() - val requestCode = arguments!!.getInt(EXTRA_REQUEST_CODE) - builder.setMessage(arguments!!.getString(EXTRA_MESSAGE)) + val builder = AlertDialog.Builder(requireContext()) + val permissions = requireArguments().getStringArray(EXTRA_PERMISSIONS).orEmpty() + val requestCode = requireArguments().getInt(EXTRA_REQUEST_CODE) + builder.setMessage(requireArguments().getString(EXTRA_MESSAGE)) builder.setPositiveButton(android.R.string.ok) { _, _ -> activity?.let { ActivityCompat.requestPermissions(it, permissions, requestCode) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt index 464d94dda..e7c8bab2f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/PhishingLinkWarningDialogFragment.kt @@ -47,7 +47,7 @@ class PhishingLinkWarningDialogFragment : BaseDialogFragment(), OnClickListener } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(android.R.string.dialog_alert_title) builder.setView(R.layout.dialog_phishing_link_warning) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt index b483dca28..76549415b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SavedSearchesListFragment.kt @@ -75,7 +75,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment?> { - return SavedSearchesLoader(activity!!, accountKey) + return SavedSearchesLoader(requireActivity(), accountKey) } override fun onItemLongClick(view: AdapterView<*>, child: View, position: Int, id: Long): Boolean { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt index a0907a50a..f5c7178be 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.kt @@ -55,7 +55,7 @@ class SensitiveContentWarningDialogFragment : BaseDialogFragment(), DialogInterf override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(android.R.string.dialog_alert_title) builder.setMessage(R.string.sensitive_content_warning) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt index 4f8eb43e6..4376dfb5b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.kt @@ -57,7 +57,7 @@ class SetUserNicknameDialogFragment : BaseDialogFragment(), OnClickListener { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val nick = arguments?.getString(EXTRA_NAME) val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.title_set_nickname) builder.setPositiveButton(android.R.string.ok, this) if (!nick.isNullOrEmpty()) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt index 1329328aa..f9e6babba 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ThemedPreferenceDialogFragmentCompat.kt @@ -29,7 +29,7 @@ abstract class ThemedPreferenceDialogFragmentCompat : PreferenceDialogFragmentCo val context = context val preference = preference onClick(null, DialogInterface.BUTTON_NEGATIVE) - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) .setTitle(preference.dialogTitle) .setIcon(preference.dialogIcon) .setPositiveButton(preference.positiveButtonText, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt index 87ce0ae8b..31a22e5b8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/TrendsSuggestionsFragment.kt @@ -73,7 +73,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L } override fun onCreateAdapter(context: Context, requestManager: RequestManager): TrendsAdapter { - return TrendsAdapter(activity!!) + return TrendsAdapter(requireActivity()) } override fun onCreateLoader(id: Int, args: Bundle?): Loader { @@ -81,7 +81,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L val loaderWhere = Expression.and(Expression.equalsArgs(CachedTrends.ACCOUNT_KEY), Expression.equalsArgs(CachedTrends.WOEID)).sql val loaderWhereArgs = arrayOf(accountKey?.toString().orEmpty(), woeId.toString()) - return CursorLoader(activity!!, uri, CachedTrends.COLUMNS, loaderWhere, loaderWhereArgs, CachedTrends.TREND_ORDER) + return CursorLoader(requireActivity(), uri, CachedTrends.COLUMNS, loaderWhere, loaderWhereArgs, CachedTrends.TREND_ORDER) } override fun onItemClick(view: AdapterView<*>, child: View, position: Int, id: Long) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index 9b759e679..a4c016260 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -687,7 +687,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, if (profileBannerSpace.toolbarHeight == 0) { var toolbarHeight = toolbar.measuredHeight if (toolbarHeight == 0) { - toolbarHeight = ThemeUtils.getActionBarHeight(context!!) + toolbarHeight = ThemeUtils.getActionBarHeight(requireContext()) } profileBannerSpace.toolbarHeight = toolbarHeight } @@ -813,7 +813,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, menu.setItemAvailability(R.id.block, !isMyself) menu.setItemAvailability(R.id.add_to_home_screen_submenu, - ShortcutManagerCompat.isRequestPinShortcutSupported(context!!)) + ShortcutManagerCompat.isRequestPinShortcutSupported(requireContext())) var canAddToList = false var canMute = false @@ -1634,7 +1634,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, return result } - val microBlog = MicroBlogAPIFactory.getInstance(fragment.context!!, accountKey) + val microBlog = MicroBlogAPIFactory.getInstance(fragment.requireContext(), accountKey) val ownedLists = ArrayList() val listMemberships = microBlog.getUserListOwnerMemberships(user.key.id) val paging = Paging() @@ -1669,7 +1669,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } }.failUi { val fragment = weakThis.get() ?: return@failUi - Toast.makeText(fragment.context, it.getErrorMessage(fragment.context!!), + Toast.makeText(fragment.context, it.getErrorMessage(fragment.requireContext()), Toast.LENGTH_SHORT).show() } } @@ -1803,10 +1803,10 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, class AddRemoveUserListDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val lists = arguments!!.getTypedArray(EXTRA_USER_LISTS) - val userKey = arguments!!.getParcelable(EXTRA_USER_KEY)!! - val accountKey = arguments!!.getParcelable(EXTRA_ACCOUNT_KEY)!! - val builder = AlertDialog.Builder(context!!) + val lists = requireArguments().getTypedArray(EXTRA_USER_LISTS) + val userKey = requireArguments().getParcelable(EXTRA_USER_KEY)!! + val accountKey = requireArguments().getParcelable(EXTRA_ACCOUNT_KEY)!! + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.title_add_or_remove_from_list) val entries = Array(lists.size) { idx -> lists[idx].name @@ -1866,7 +1866,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, states[pos] = checked } } - Toast.makeText(context, e.getErrorMessage(context!!), Toast.LENGTH_SHORT).show() + Toast.makeText(context, e.getErrorMessage(requireContext()), Toast.LENGTH_SHORT).show() } } d.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener { @@ -1874,7 +1874,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, df.arguments = Bundle { this[EXTRA_ACCOUNT_KEY] = accountKey } - df.show(fragmentManager!!, "create_user_list") + df.show(requireFragmentManager(), "create_user_list") } } return dialog diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt index 77b1561c9..7b865a83f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt @@ -316,7 +316,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, val listName = args.getString(EXTRA_LIST_NAME) val screenName = args.getString(EXTRA_SCREEN_NAME) val omitIntentExtra = args.getBoolean(EXTRA_OMIT_INTENT_EXTRA, true) - return ParcelableUserListLoader(activity!!, omitIntentExtra, arguments, accountKey, listId, + return ParcelableUserListLoader(requireActivity(), omitIntentExtra, arguments, accountKey, listId, listName, userKey, screenName) } @@ -401,8 +401,8 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, class UserListDetailsDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val userList = arguments!!.getParcelable(EXTRA_USER_LIST)!! - val builder = AlertDialog.Builder(context!!) + val userList = requireArguments().getParcelable(EXTRA_USER_LIST)!! + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(userList.name) builder.setMessage(userList.description) builder.setPositiveButton(android.R.string.ok, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt index f59cfcd9e..c59648800 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListMembershipsFragment.kt @@ -34,7 +34,7 @@ class UserListMembershipsFragment : ParcelableUserListsFragment() { val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) - return UserListMembershipsLoader(activity!!, accountKey, userKey, screenName, data).apply { + return UserListMembershipsLoader(requireActivity(), accountKey, userKey, screenName, data).apply { pagination = args.getParcelable(EXTRA_PAGINATION) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt index ad3246989..9a1ef7dee 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListSubscriptionsFragment.kt @@ -33,7 +33,7 @@ class UserListSubscriptionsFragment : ParcelableUserListsFragment() { val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) - return UserListSubscriptionsLoader(activity!!, accountKey, userKey, screenName, data).apply { + return UserListSubscriptionsLoader(requireActivity(), accountKey, userKey, screenName, data).apply { pagination = args.getParcelable(EXTRA_PAGINATION) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt index bdad370c1..5e3e7c25a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt @@ -47,7 +47,7 @@ class UserListsOwnershipsFragment : ParcelableUserListsFragment() { val accountKey = args.getParcelable(EXTRA_ACCOUNT_KEY) val userKey = args.getParcelable(EXTRA_USER_KEY) val screenName = args.getString(EXTRA_SCREEN_NAME) - return UserListOwnershipsLoader(activity!!, accountKey, userKey, screenName, data).apply { + return UserListOwnershipsLoader(requireActivity(), accountKey, userKey, screenName, data).apply { pagination = args.getParcelable(EXTRA_PAGINATION) } } @@ -82,7 +82,7 @@ class UserListsOwnershipsFragment : ParcelableUserListsFragment() { menu.setItemAvailability(R.id.new_user_list, true) } else { menu.setItemAvailability(R.id.new_user_list, screenName != null && - Utils.isMyAccount(activity!!, screenName)) + Utils.isMyAccount(requireActivity(), screenName)) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt index 988e61675..4d6e20150 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -132,7 +132,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, override fun onCreateLoader(id: Int, args: Bundle?): Loader> { progressContainer.visibility = View.VISIBLE editProfileContent.visibility = View.GONE - return ParcelableUserLoader(activity!!, accountKey, accountKey, null, arguments, false, false) + return ParcelableUserLoader(requireActivity(), accountKey, accountKey, null, arguments, false, false) } override fun onLoadFinished(loader: Loader>, @@ -175,7 +175,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - if (!Utils.isMyAccount(activity!!, accountKey)) { + if (!Utils.isMyAccount(requireActivity(), accountKey)) { activity?.finish() return } @@ -379,7 +379,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, private val linkColor: Int, private val backgroundColor: Int ) : AbsAccountRequestTask, - UserProfileEditorFragment>(fragment.context!!, accountKey) { + UserProfileEditorFragment>(fragment.requireContext(), accountKey) { init { this.callback = fragment @@ -490,7 +490,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, accountKey: UserKey, imageUri: Uri, deleteImage: Boolean - ) : UpdateProfileBannerImageTask(fragment.context!!, accountKey, imageUri, deleteImage) { + ) : UpdateProfileBannerImageTask(fragment.requireContext(), accountKey, imageUri, deleteImage) { init { callback = fragment @@ -513,7 +513,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, imageUri: Uri, tile: Boolean, deleteImage: Boolean - ) : UpdateProfileBackgroundImageTask(fragment.context!!, accountKey, imageUri, + ) : UpdateProfileBackgroundImageTask(fragment.requireContext(), accountKey, imageUri, tile, deleteImage) { init { @@ -538,7 +538,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, accountKey: UserKey, imageUri: Uri, deleteImage: Boolean - ) : UpdateProfileImageTask(fragment.context!!, accountKey, imageUri, deleteImage) { + ) : UpdateProfileImageTask(fragment.requireContext(), accountKey, imageUri, deleteImage) { init { callback = fragment diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt index 5c127cb02..78870607b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt @@ -120,17 +120,17 @@ class UserQrDialogFragment : BaseDialogFragment() { } val profileImageSize = getString(R.string.profile_image_size) val context = context?.applicationContext - val requestManager = Glide.with(context!!) + val requestManager = Glide.with(requireContext()) val user = this.user return task { try { - return@task requestManager.loadOriginalProfileImage(context!!, user, 0) + return@task requestManager.loadOriginalProfileImage(requireContext(), user, 0) .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() } catch (e: ExecutionException) { // Ignore } // Return fallback profile image - return@task requestManager.loadProfileImage(context!!, user, 0, size = profileImageSize) + return@task requestManager.loadProfileImage(requireContext(), user, 0, size = profileImageSize) .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt index 1a874a2f0..572d6634c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt @@ -111,7 +111,7 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa } override fun onCreateAdapter(context: Context, requestManager: RequestManager): DraftsAdapter { - return DraftsAdapter(activity!!, requestManager).apply { + return DraftsAdapter(requireActivity(), requestManager).apply { textSize = preferences[textSizeKey].toFloat() } } @@ -125,7 +125,7 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa Pair(Expression.inArgs(Drafts.ACTION_TYPE, actions.size).sql, actions) } else Pair(null, null) val orderBy = OrderBy(Drafts.TIMESTAMP, false).sql - return CursorLoader(activity!!, uri, cols, selection, selectionArgs, orderBy) + return CursorLoader(requireActivity(), uri, cols, selection, selectionArgs, orderBy) } override fun onLoadFinished(loader: Loader, cursor: Cursor?) { @@ -289,7 +289,7 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setMessage(R.string.delete_drafts_confirm) builder.setPositiveButton(android.R.string.ok, this) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt index 0ce37e5e9..cf5d579a8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt @@ -114,7 +114,7 @@ class AddEditItemFragment : BaseDialogFragment() { } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_filter_rule_editor) if (arguments?.getLong(EXTRA_ID, -1) ?: -1 >= 0) { @@ -129,10 +129,10 @@ class AddEditItemFragment : BaseDialogFragment() { applyTheme() window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) editText.setAdapter(when (contentUri) { - Filters.Sources.CONTENT_URI -> SourceAutoCompleteAdapter(activity!!) - Filters.Users.CONTENT_URI -> ComposeAutoCompleteAdapter(activity!!, requestManager).apply { + Filters.Sources.CONTENT_URI -> SourceAutoCompleteAdapter(requireActivity()) + Filters.Users.CONTENT_URI -> ComposeAutoCompleteAdapter(requireActivity(), requestManager).apply { val am = AccountManager.get(activity) - account = AccountUtils.getDefaultAccountDetails(activity!!, am, false) + account = AccountUtils.getDefaultAccountDetails(requireActivity(), am, false) } else -> null }) @@ -151,7 +151,7 @@ class AddEditItemFragment : BaseDialogFragment() { val df = ExtraFeaturesIntroductionDialogFragment.create( ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) df.setTargetFragment(this@AddEditItemFragment, REQUEST_CHANGE_SCOPE_PURCHASE) - df.show(fragmentManager!!, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) + df.show(requireFragmentManager(), ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt index 1c8b79746..b5ca06376 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt @@ -179,7 +179,7 @@ abstract class BaseFiltersFragment : AbsContentListViewFragment { val selection = Expression.isNull(Columns.Column(Filters.USER_KEY)) - return CursorLoader(activity!!, contentUri, contentColumns, selection.sql, null, sortOrder) + return CursorLoader(requireActivity(), contentUri, contentColumns, selection.sql, null, sortOrder) } override fun onLoadFinished(loader: Loader, data: Cursor?) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt index e8fc94cc8..87988005a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt @@ -130,7 +130,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment?> { val fromUser = args!!.getBoolean(EXTRA_FROM_USER) args.remove(EXTRA_FROM_USER) - return onCreateUsersLoader(context!!, args, fromUser) + return onCreateUsersLoader(requireContext(), args, fromUser) } override fun onLoaderReset(loader: Loader?>) { @@ -189,7 +189,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment if (!extraFeaturesService.isAdvancedFiltersEnabled) { - ExtraFeaturesIntroductionDialogFragment.show(fragmentManager!!, + ExtraFeaturesIntroductionDialogFragment.show(requireFragmentManager(), feature = ExtraFeaturesService.FEATURE_ADVANCED_FILTERS, requestCode = REQUEST_PURCHASE_EXTRA_FEATURES) return@listener false @@ -246,7 +246,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment { - return CursorLoader(activity!!, contentUri, contentColumns, null, null, sortOrder) + return CursorLoader(requireActivity(), contentUri, contentColumns, null, null, sortOrder) } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { @@ -218,7 +218,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { val am = AccountManager.get(fragment.context) val account = AccountUtils.getAccountDetails(am, accountKey, true) ?: throw AccountNotFoundException() - CreateUserMuteTask.muteUsers(fragment.context!!, account, items) + CreateUserMuteTask.muteUsers(fragment.requireContext(), account, items) }.alwaysUi { weakThis.get()?.dismissProgressDialog("export_to_muted") } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt index 3f24856d1..fffad9752 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt @@ -60,7 +60,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac super.onActivityCreated(savedInstanceState) setHasOptionsMenu(true) - adapter = FilterSubscriptionsAdapter(context!!) + adapter = FilterSubscriptionsAdapter(requireContext()) listView.adapter = adapter listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE_MODAL listView.setMultiChoiceModeListener(this) @@ -137,7 +137,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac R.id.refresh -> { executeAfterFragmentResumed { fragment -> ProgressDialogFragment.show(fragment.childFragmentManager, FRAGMENT_TAG_RREFRESH_FILTERS) - val task = RefreshFiltersSubscriptionsTask(fragment.context!!) + val task = RefreshFiltersSubscriptionsTask(fragment.requireContext()) val fragmentRef = WeakReference(fragment) task.callback = { fragmentRef.get()?.executeAfterFragmentResumed { fragment -> @@ -157,7 +157,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac } override fun onCreateLoader(id: Int, args: Bundle?): Loader { - val loader = CursorLoader(context!!) + val loader = CursorLoader(requireContext()) loader.uri = Filters.Subscriptions.CONTENT_URI loader.projection = Filters.Subscriptions.COLUMNS return loader @@ -233,7 +233,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac cursor.moveToFirst() while (!cursor.isAfterLast) { val subscription = indices.newObject(cursor) - subscription.instantiateComponent(context!!)?.deleteLocalData() + subscription.instantiateComponent(requireContext())?.deleteLocalData() cursor.moveToNext() } } @@ -284,7 +284,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac class AddUrlSubscriptionDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_add_filters_subscription) builder.setPositiveButton(R.string.action_add_filters_subscription) { dialog, _ -> dialog as AlertDialog @@ -293,10 +293,10 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac val subscription = FiltersSubscription() subscription.name = editName.text.toString() subscription.setupUrl(editUrl.text.toString()) - val component = subscription.instantiateComponent(context!!) ?: return@setPositiveButton + val component = subscription.instantiateComponent(requireContext()) ?: return@setPositiveButton component.firstAdded() val vc = ObjectCursor.valuesCreatorFrom(FiltersSubscription::class.java) - context!!.contentResolver.insert(Filters.Subscriptions.CONTENT_URI, vc.create(subscription)) + requireContext().contentResolver.insert(Filters.Subscriptions.CONTENT_URI, vc.create(subscription)) } builder.setNegativeButton(android.R.string.cancel, null) val dialog = builder.create() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt index 4ea334cf4..8c544df5f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt @@ -206,7 +206,7 @@ class ExoPlayerPageFragment : MediaViewerFragment(), IBaseFragment= 0) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt index 4e9da0c53..8e82518b8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt @@ -50,7 +50,7 @@ class ImagePageFragment : SubsampleImageViewerFragment() { get() = arguments?.getParcelable(EXTRA_ACCOUNT_KEY) private val sizedResultCreator: CacheDownloadLoader.ResultCreator by lazy { - return@lazy SizedResultCreator(context!!) + return@lazy SizedResultCreator(requireContext()) } private var mediaLoadState: Int = 0 diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt index 8edb7e955..c2073eed0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/VideoPageFragment.kt @@ -85,7 +85,7 @@ class VideoPageFragment : CacheDownloadMediaViewerFragment(), IBaseFragment { - return ConversationInfoLoader(context!!, accountKey, conversationId) + return ConversationInfoLoader(requireContext(), accountKey, conversationId) } override fun onLoaderReset(loader: Loader) { @@ -299,7 +299,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performDestroyConversation() { ProgressDialogFragment.show(childFragmentManager, "leave_conversation_progress") val weakThis = WeakReference(this) - val task = DestroyConversationTask(context!!, accountKey, conversationId) + val task = DestroyConversationTask(requireContext(), accountKey, conversationId) task.callback = callback@ { succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("leave_conversation_progress") { @@ -315,7 +315,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performClearMessages() { ProgressDialogFragment.show(childFragmentManager, "clear_messages_progress") val weakThis = WeakReference(this) - val task = ClearMessagesTask(context!!, accountKey, conversationId) + val task = ClearMessagesTask(requireContext(), accountKey, conversationId) task.callback = callback@ { succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("clear_messages_progress") { @@ -330,7 +330,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performAddParticipant(user: ParcelableUser) { ProgressDialogFragment.show(childFragmentManager, "add_participant_progress") val weakThis = WeakReference(this) - val task = AddParticipantsTask(context!!, accountKey, conversationId, listOf(user)) + val task = AddParticipantsTask(requireContext(), accountKey, conversationId, listOf(user)) task.callback = callback@ { succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("add_participant_progress") { @@ -343,7 +343,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performSetNotificationDisabled(disabled: Boolean) { ProgressDialogFragment.show(childFragmentManager, "set_notifications_disabled_progress") val weakThis = WeakReference(this) - val task = SetConversationNotificationDisabledTask(context!!, accountKey, conversationId, disabled) + val task = SetConversationNotificationDisabledTask(requireContext(), accountKey, conversationId, disabled) task.callback = callback@ { _ -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("set_notifications_disabled_progress") { @@ -457,7 +457,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, val fragment = weakThis.get() ?: throw InterruptedException() val account = AccountUtils.getAccountDetails(AccountManager.get(fragment.context), accountKey, true) ?: throw MicroBlogException("No account") - val microBlog = account.newMicroBlogInstance(fragment.context!!, cls = MicroBlog::class.java) + val microBlog = account.newMicroBlogInstance(fragment.requireContext(), cls = MicroBlog::class.java) return@task updateAction(fragment, account, microBlog) }.then { result -> val fragment = weakThis.get() ?: throw InterruptedException() @@ -736,7 +736,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val actions = arrayOf(Action(getString(R.string.action_edit_conversation_name), "name"), Action(getString(R.string.action_edit_conversation_avatar), "avatar")) - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setItems(actions.mapToArray(Action::title)) { _, which -> val action = actions[which] (parentFragment as MessageConversationInfoFragment).openEditAction(action.type) @@ -752,7 +752,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, class EditNameDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_edit_conversation_name) builder.setNegativeButton(android.R.string.cancel, null) builder.setPositiveButton(android.R.string.ok) { dialog, _ -> @@ -768,7 +768,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, class DestroyConversationConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setMessage(R.string.message_destroy_conversation_confirm) builder.setPositiveButton(R.string.action_leave_conversation) { _, _ -> (parentFragment as MessageConversationInfoFragment).performDestroyConversation() @@ -783,7 +783,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, class ClearMessagesConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setMessage(R.string.message_clear_messages_confirm) builder.setPositiveButton(R.string.action_clear_messages) { _, _ -> (parentFragment as MessageConversationInfoFragment).performClearMessages() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt index 25480b318..bcfe87c1f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt @@ -207,7 +207,7 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks?>) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt index a00710cc2..b39a1d6f3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt @@ -278,7 +278,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment?> { - return ConversationLoader(context!!, accountKey, conversationId) + return ConversationLoader(requireContext(), accountKey, conversationId) } override fun onLoadFinished(loader: Loader?>, data: List?) { @@ -558,7 +558,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment?) -> Unit)?>(fragment.context!!, sources, types, copySrc, deleteSrc) { + ) : AbsAddMediaTask<((List?) -> Unit)?>(fragment.requireContext(), sources, types, copySrc, deleteSrc) { private val fragmentRef = WeakReference(fragment) @@ -581,7 +581,7 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment - ) : AbsDeleteMediaTask(fragment.context!!, + ) : AbsDeleteMediaTask(fragment.requireContext(), media.mapToArray { Uri.parse(it.uri) }) { init { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt index 84ce6f35c..fa171ce09 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt @@ -74,7 +74,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment by lazy { - Utils.getAccountKeys(context!!, arguments) ?: DataStoreUtils.getActivatedAccountKeys(context!!) + Utils.getAccountKeys(requireContext(), arguments) ?: DataStoreUtils.getActivatedAccountKeys(requireContext()) } private val errorInfoKey: String = ErrorInfoStore.KEY_DIRECT_MESSAGES @@ -157,7 +157,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment = this@MessagesEntriesFragment.accountKeys }) return true diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt index 5379df352..da50fc738 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/search/MastodonSearchFragment.kt @@ -35,6 +35,6 @@ class MastodonSearchFragment : ItemsListFragment() { get() = arguments?.getString(EXTRA_QUERY)!! override fun onCreateLoader(id: Int, args: Bundle?): Loader?> { - return MastodonSearchLoader(context!!, accountKey, query) + return MastodonSearchLoader(requireContext(), accountKey, query) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt index 4eee5bed0..84851c11c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsSimpleStatusOperationDialogFragment.kt @@ -46,7 +46,7 @@ abstract class AbsSimpleStatusOperationDialogFragment : BaseDialogFragment(), Di } final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(title) builder.setMessage(message) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt index 4ad04e48c..b42de4699 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/AbsStatusDialogFragment.kt @@ -68,12 +68,12 @@ abstract class AbsStatusDialogFragment : BaseDialogFragment() { private lateinit var adapter: DummyItemAdapter final override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = Builder(context!!) + val builder = Builder(requireContext()) val accountKey = this.accountKey builder.setupAlertDialog() - adapter = DummyItemAdapter(context!!, requestManager = requestManager) + adapter = DummyItemAdapter(requireContext(), requestManager = requestManager) adapter.showCardActions = false adapter.showCardNumbers = false adapter.showAccountsColor = true diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt index 4a2cd6d4a..7bea40eca 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt @@ -42,7 +42,7 @@ class BlockStatusUsersDialogFragment : BaseDialogFragment() { private val status: ParcelableStatus get() = arguments?.getParcelable(EXTRA_STATUS)!! override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val referencedUsers = status.referencedUsers val nameFirst = preferences[nameFirstKey] val displayNames = referencedUsers.map { @@ -50,7 +50,7 @@ class BlockStatusUsersDialogFragment : BaseDialogFragment() { }.toTypedArray() builder.setTitle(R.string.action_status_block_users) builder.setItems(displayNames) { _, which -> - CreateUserBlockDialogFragment.show(fragmentManager!!, referencedUsers[which]) + CreateUserBlockDialogFragment.show(requireFragmentManager(), referencedUsers[which]) } val dialog = builder.create() dialog.applyOnShow { applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt index 1dad27ccc..d93d6306c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt @@ -42,7 +42,7 @@ class MuteStatusUsersDialogFragment : BaseDialogFragment() { private val status: ParcelableStatus get() = arguments?.getParcelable(EXTRA_STATUS)!! override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val referencedUsers = status.referencedUsers val nameFirst = preferences[nameFirstKey] val displayNames = referencedUsers.map { @@ -50,7 +50,7 @@ class MuteStatusUsersDialogFragment : BaseDialogFragment() { }.toTypedArray() builder.setTitle(R.string.action_status_mute_users) builder.setItems(displayNames) { _, which -> - CreateUserMuteDialogFragment.show(fragmentManager!!, referencedUsers[which]) + CreateUserMuteDialogFragment.show(requireFragmentManager(), referencedUsers[which]) } val dialog = builder.create() dialog.onShow { it.applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/PinStatusDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/PinStatusDialogFragment.kt index 6ae94d09b..57bb93c1f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/PinStatusDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/PinStatusDialogFragment.kt @@ -35,7 +35,7 @@ class PinStatusDialogFragment : AbsSimpleStatusOperationDialogFragment() { get() = getString(R.string.message_pin_status_confirm) override fun onPerformAction(status: ParcelableStatus) { - val task = PinStatusTask(context!!, status.account_key, status.id) + val task = PinStatusTask(requireContext(), status.account_key, status.id) TaskStarter.execute(task) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt index 3e0848743..5dbb1f463 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/RetweetQuoteDialogFragment.kt @@ -316,7 +316,7 @@ class RetweetQuoteDialogFragment : AbsStatusDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val context = activity - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setMessage(R.string.quote_protected_status_warning_message) builder.setPositiveButton(R.string.send_anyway, this) builder.setNegativeButton(android.R.string.cancel, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt index 6eaa4319b..0cb6202d1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt @@ -372,7 +372,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks(EXTRA_ACCOUNT_KEY) val statusId = fragmentArgs.getString(EXTRA_STATUS_ID) - return ParcelableStatusLoader(activity!!, false, fragmentArgs, accountKey, statusId) + return ParcelableStatusLoader(requireActivity(), false, fragmentArgs, accountKey, statusId) } @@ -640,7 +640,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks @@ -648,7 +648,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks(fragment.context!!, status.account_key) { + AbsAccountRequestTask(fragment.requireContext(), status.account_key) { private val weakFragment = WeakReference(fragment) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt index 4e4585f87..36ea0e0d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt @@ -45,7 +45,7 @@ class TranslationDestinationDialogFragment : BaseDialogFragment() { private val currentIndex = AtomicInteger(-1) override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val languages = arguments?.getTypedArray(EXTRA_LANGUAGES)?.sortedArrayWith(LanguageComparator()) ?: emptyArray() val selectedLanguage = preferences[translationDestinationKey] ?: arguments?.getString(EXTRA_SELECTED_LANGUAGE) val selectedIndex = languages.indexOfFirst { selectedLanguage == it.code } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/UnpinStatusDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/UnpinStatusDialogFragment.kt index 49171f021..977c7d521 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/UnpinStatusDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/UnpinStatusDialogFragment.kt @@ -35,7 +35,7 @@ class UnpinStatusDialogFragment : AbsSimpleStatusOperationDialogFragment() { get() = getString(R.string.message_unpin_status_confirm) override fun onPerformAction(status: ParcelableStatus) { - val task = UnpinStatusTask(context!!, status.account_key, status.id) + val task = UnpinStatusTask(requireContext(), status.account_key, status.id) TaskStarter.execute(task) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt index 1afee2421..194e07459 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/GroupTimelineFragment.kt @@ -115,7 +115,7 @@ class GroupTimelineFragment : ParcelableStatusesFragment() { val groupName = args.getString(EXTRA_GROUP_NAME) val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return GroupTimelineLoader(activity!!, accountKey, groupId, groupName, adapterData, + return GroupTimelineLoader(requireActivity(), accountKey, groupId, groupName, adapterData, savedStatusesFileArgs, tabPosition, fromUser, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt index d1a9d1767..6f556dea1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt @@ -41,7 +41,7 @@ class MediaStatusesSearchFragment : AbsMediaStatusesFragment() { val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val makeGap = args.getBoolean(EXTRA_MAKE_GAP, true) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return MediaStatusesSearchLoader(activity!!, accountKey, query, adapter.getData(), null, tabPosition, + return MediaStatusesSearchLoader(requireActivity(), accountKey, query, adapter.getData(), null, tabPosition, fromUser, makeGap, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt index 90dc609df..83e9accb2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/StatusesSearchFragment.kt @@ -75,12 +75,12 @@ open class StatusesSearchFragment : ParcelableStatusesFragment() { Loader?> { refreshing = true val accountKey = Utils.getAccountKey(context, args) - val query = arguments!!.getString(EXTRA_QUERY) - val local = arguments!!.getBoolean(EXTRA_LOCAL, false) - val tabPosition = arguments!!.getInt(EXTRA_TAB_POSITION, -1) + val query = requireArguments().getString(EXTRA_QUERY) + val local = requireArguments().getBoolean(EXTRA_LOCAL, false) + val tabPosition = requireArguments().getInt(EXTRA_TAB_POSITION, -1) val makeGap = args.getBoolean(EXTRA_MAKE_GAP, true) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return TweetSearchLoader(activity!!, accountKey, query, adapterData, savedStatusesFileArgs, + return TweetSearchLoader(requireActivity(), accountKey, query, adapterData, savedStatusesFileArgs, tabPosition, fromUser, makeGap, local, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt index 4e3429493..a114cc50e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserFavoritesFragment.kt @@ -90,7 +90,7 @@ class UserFavoritesFragment : ParcelableStatusesFragment() { override fun notifyFavoriteTask(event: FavoriteTaskEvent) { if (event.action == FavoriteTaskEvent.Action.DESTROY && event.isSucceeded) { event.status?.let { status -> - val args = arguments!! + val args = requireArguments() val userKey = args.getParcelable(EXTRA_USER_KEY) if (status.account_key == userKey) { removeStatus(event.statusId) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt index 65073c1ba..33cd8ee27 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserListTimelineFragment.kt @@ -103,7 +103,7 @@ class UserListTimelineFragment : ParcelableStatusesFragment() { val screenName = args.getString(EXTRA_SCREEN_NAME) val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return UserListTimelineLoader(activity!!, accountKey, listId, userKey, screenName, listName, + return UserListTimelineLoader(requireActivity(), accountKey, listId, userKey, screenName, listName, adapterData, savedStatusesFileArgs, tabPosition, fromUser, loadingMore, extras) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt index cdae7b07b..2219ecba7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMentionsFragment.kt @@ -52,7 +52,7 @@ class UserMentionsFragment : StatusesSearchFragment() { val tabPosition = args.getInt(EXTRA_TAB_POSITION, -1) val makeGap = args.getBoolean(EXTRA_MAKE_GAP, true) val loadingMore = args.getBoolean(EXTRA_LOADING_MORE, false) - return UserMentionsLoader(activity!!, accountKey, screenName, adapterData, + return UserMentionsLoader(requireActivity(), accountKey, screenName, adapterData, savedStatusesFileArgs, tabPosition, fromUser, makeGap, false, loadingMore) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt index 0d1d93969..23cc6ac54 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt @@ -149,7 +149,7 @@ class UserTimelineFragment : ParcelableStatusesFragment() { class UserTimelineFilterDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val values = resources.getStringArray(R.array.values_user_timeline_filter) val checkedItems = BooleanArray(values.size) { val filter = preferences[userTimelineFilterKey] diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt index 771293b5e..7466f1a0b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/sync/SyncSettingsFragment.kt @@ -94,9 +94,9 @@ class SyncSettingsFragment : BasePreferenceFragment() { class DisconnectSyncConfirmDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) val providerInfo = kPreferences[dataSyncProviderInfoKey]!! - val entry = DataSyncProvider.Factory.getProviderEntry(context!!, providerInfo.type)!! + val entry = DataSyncProvider.Factory.getProviderEntry(requireContext(), providerInfo.type)!! builder.setMessage(getString(R.string.message_sync_disconnect_from_name_confirm, entry.name)) builder.setPositiveButton(R.string.action_sync_disconnect) { _, _ -> (parentFragment as SyncSettingsFragment).cleanupAndDisconnect() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt index 23ecc79c3..7eef95167 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt @@ -97,7 +97,7 @@ class ColorPickerPreference(context: Context, attrs: AttributeSet? = null) : override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val preference = preference as ColorPickerPreference val context = context - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(preference.dialogTitle) builder.setView(R.layout.cp__dialog_color_picker) builder.setPositiveButton(android.R.string.ok, this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt index 8441e3ecb..c3ea7d867 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/controller/premium/SyncStatusViewController.kt @@ -91,15 +91,15 @@ class SyncStatusViewController : PremiumDashboardActivity.ExtraFeatureViewContro class ConnectNetworkStorageSelectionDialogFragment : BaseDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val providers = DataSyncProvider.Factory.getSupportedProviders(context!!) + val providers = DataSyncProvider.Factory.getSupportedProviders(requireContext()) val itemNames = providers.mapToArray(SyncProviderEntry::name) - val builder = AlertDialog.Builder(context!!) + val builder = AlertDialog.Builder(requireContext()) builder.setTitle(R.string.title_dialog_sync_connect_to) builder.setItems(itemNames) { _, which -> val activity = activity as PremiumDashboardActivity activity.startActivityForControllerResult(providers[which].authIntent, - arguments!!.getInt(EXTRA_POSITION), REQUEST_CONNECT_NETWORK_STORAGE) + requireArguments().getInt(EXTRA_POSITION), REQUEST_CONNECT_NETWORK_STORAGE) } val dialog = builder.create() dialog.onShow { it.applyTheme() } From 26387e5f4440c8a5de99970395f27e82bc6564ba Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:02:32 -0400 Subject: [PATCH 08/24] Add missing super calls --- .../kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt | 1 + .../main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt | 1 + .../kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt | 1 + .../org/mariotaku/twidere/activity/PremiumDashboardActivity.kt | 1 + .../org/mariotaku/twidere/activity/QuickSearchBarActivity.kt | 1 + .../org/mariotaku/twidere/activity/UserListSelectorActivity.kt | 1 + .../twidere/activity/content/AbsStatusDialogActivity.kt | 1 + .../twidere/activity/shortcut/AbsShortcutCreatorActivity.kt | 1 + 8 files changed, 8 insertions(+) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt index a57fde2cf..cb704863f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -389,6 +389,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_TAKE_PHOTO, REQUEST_PICK_MEDIA -> { if (resultCode == Activity.RESULT_OK && data != null) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index 08ea82c6c..e7157b21e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -433,6 +433,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp } override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) val tabPosition = handleIntent(intent, false) if (tabPosition >= 0) { mainPager.currentItem = tabPosition.coerceInOr(0 until pagerAdapter.count, 0) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index df5f88f82..704718fbe 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -181,6 +181,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_SHARE_MEDIA -> { ShareProvider.clearTempFiles(this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt index 3214036d3..59d654751 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/PremiumDashboardActivity.kt @@ -89,6 +89,7 @@ class PremiumDashboardActivity : BaseActivity() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (resultCode) { REQUEST_PURCHASE_EXTRA_FEATURES -> { if (resultCode == Activity.RESULT_OK) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt index c52d5203f..675f58784 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt @@ -215,6 +215,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks< } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_SCAN_QR -> { if (resultCode == Activity.RESULT_OK && data != null) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt index 370f9a562..6d08fad0b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt @@ -135,6 +135,7 @@ class UserListSelectorActivity : BaseActivity(), } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_SELECT_USER -> { if (resultCode == Activity.RESULT_OK && data != null) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt index 519fe368f..1353c4a9a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt @@ -64,6 +64,7 @@ abstract class AbsStatusDialogActivity : BaseActivity() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_SELECT_ACCOUNT -> { if (resultCode == RESULT_OK && data != null) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt index 2c9cfeb17..7d206325a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsShortcutCreatorActivity.kt @@ -46,6 +46,7 @@ abstract class AbsShortcutCreatorActivity : BaseActivity() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) when (requestCode) { REQUEST_SELECT_ACCOUNT -> { if (resultCode != Activity.RESULT_OK || data == null) { From 6fc3aed8109c3a1b3b9f404a160087c4bab769f7 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:11:38 -0400 Subject: [PATCH 09/24] Replace Assertions with BuildConfig --- .../kotlin/org/mariotaku/twidere/fragment/UserFragment.kt | 3 ++- .../mariotaku/twidere/fragment/media/ImagePageFragment.kt | 5 +++-- .../org/mariotaku/twidere/menu/FavoriteItemProvider.kt | 3 ++- .../kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index a4c016260..e1520072f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -96,6 +96,7 @@ import org.mariotaku.microblog.library.mastodon.Mastodon import org.mariotaku.microblog.library.twitter.model.FriendshipUpdate import org.mariotaku.microblog.library.twitter.model.Paging import org.mariotaku.microblog.library.twitter.model.UserList +import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.Constants.* import org.mariotaku.twidere.R import org.mariotaku.twidere.activity.AccountSelectorActivity @@ -1130,7 +1131,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, return } val spec = pagerAdapter.get(viewPager.currentItem) - assert(spec.type != null) + if (BuildConfig.DEBUG && spec.type == null) { error("Assertion failed") } when (spec.type) { TAB_TYPE_STATUSES, TAB_TYPE_STATUSES_WITH_REPLIES -> { actionBar.subtitle = resources.getQuantityString(R.plurals.N_statuses, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt index 8e82518b8..d828c5251 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt @@ -31,6 +31,7 @@ import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder import org.mariotaku.ktextension.nextPowerOf2 import org.mariotaku.mediaviewer.library.CacheDownloadLoader import org.mariotaku.mediaviewer.library.subsampleimageview.SubsampleImageViewerFragment +import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.activity.MediaViewerActivity import org.mariotaku.twidere.model.ParcelableMedia @@ -96,7 +97,7 @@ class ImagePageFragment : SubsampleImageViewerFragment() { } override fun getImageSource(data: CacheDownloadLoader.Result): ImageSource { - assert(data.cacheUri != null) + if (BuildConfig.DEBUG && data.cacheUri == null) { error("Assertion failed") } if (data !is SizedResult) { return super.getImageSource(data) } @@ -108,7 +109,7 @@ class ImagePageFragment : SubsampleImageViewerFragment() { override fun getPreviewImageSource(data: CacheDownloadLoader.Result): ImageSource? { if (data !is SizedResult) return null - assert(data.cacheUri != null) + if (BuildConfig.DEBUG && data.cacheUri == null) { error("Assertion failed") } return ImageSource.uri(UriUtils.appendQueryParameters(data.cacheUri, QUERY_PARAM_PREVIEW, true)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt index 4c4bd3d77..c151b7b26 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/FavoriteItemProvider.kt @@ -29,6 +29,7 @@ import androidx.appcompat.widget.ActionMenuView import android.view.MenuItem import android.view.View import org.mariotaku.ktextension.weak +import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.extension.view.findItemView import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable.Style @@ -52,7 +53,7 @@ class FavoriteItemProvider(context: Context) : ActionProvider(context) { } fun init(menuBar: ActionMenuView, item: MenuItem) { - assert(MenuItemCompat.getActionProvider(item) === this) + if (BuildConfig.DEBUG && MenuItemCompat.getActionProvider(item) !== this) { error("Assertion failed") } val icon = ContextCompat.getDrawable(context, this.icon) val drawable = LikeAnimationDrawable(icon, defaultColor, activatedColor, if (useStar) Style.FAVORITE else Style.LIKE) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt index 483694cfd..913a931ce 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/RetweetItemProvider.kt @@ -24,6 +24,7 @@ import androidx.core.view.ActionProvider import androidx.core.view.MenuItemCompat import androidx.appcompat.widget.ActionMenuView import android.view.MenuItem +import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.extension.view.findItemView /** @@ -35,7 +36,7 @@ class RetweetItemProvider(context: Context) : ActionProvider(context) { override fun onCreateActionView() = null fun init(menuBar: ActionMenuView, item: MenuItem) { - assert(MenuItemCompat.getActionProvider(item) === this) + if (BuildConfig.DEBUG && MenuItemCompat.getActionProvider(item) !== this) { error("Assertion failed") } val menuView = menuBar.findItemView(item) menuView?.setOnLongClickListener { longClickListener?.invoke() == true } } From d6a60ba638e60726a7df59a70eab45daca3ed188 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:15:53 -0400 Subject: [PATCH 10/24] Delete obsolete sdk version checks --- .../org/mariotaku/twidere/util/support/ViewSupport.java | 8 +------- .../twidere/util/support/WebSettingsSupport.java | 2 -- .../org/mariotaku/twidere/activity/MediaViewerActivity.kt | 6 +----- .../twidere/fragment/media/ExoPlayerPageFragment.kt | 1 - .../src/main/kotlin/org/mariotaku/twidere/util/Utils.kt | 7 +------ twidere/src/main/res/values-v16/bools.xml | 6 ------ 6 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 twidere/src/main/res/values-v16/bools.xml diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java index 03d5920e1..94933afc4 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java @@ -47,13 +47,8 @@ public final class ViewSupport { } } - @SuppressWarnings("deprecation") public static void setBackground(final View view, final Drawable background) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { - view.setBackgroundDrawable(background); - } else { - ViewAccessorJB.setBackground(view, background); - } + ViewAccessorJB.setBackground(view, background); } public static void setButtonTintList(CompoundButton view, ColorStateList list) { @@ -130,7 +125,6 @@ public final class ViewSupport { } static void setBackground(final View view, final Drawable background) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return; view.setBackground(background); } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/WebSettingsSupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/WebSettingsSupport.java index ef601353f..90553f810 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/WebSettingsSupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/WebSettingsSupport.java @@ -29,14 +29,12 @@ public class WebSettingsSupport { } public static void setAllowUniversalAccessFromFileURLs(final WebSettings settings, final boolean flag) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return; WebSettingsAccessorSDK16.setAllowUniversalAccessFromFileURLs(settings, flag); } @TargetApi(Build.VERSION_CODES.JELLY_BEAN) private static class WebSettingsAccessorSDK16 { private static void setAllowUniversalAccessFromFileURLs(final WebSettings settings, final boolean flag) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return; settings.setAllowUniversalAccessFromFileURLs(flag); } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index 704718fbe..b81b7c08b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -451,11 +451,7 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos } private fun instantiateMediaViewerFragment(args: Bundle): MediaViewerFragment { - return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { - Fragment.instantiate(this, VideoPageFragment::class.java.name, args) as MediaViewerFragment - } else { - Fragment.instantiate(this, ExoPlayerPageFragment::class.java.name, args) as MediaViewerFragment - } + return Fragment.instantiate(this, ExoPlayerPageFragment::class.java.name, args) as MediaViewerFragment } private fun processShareIntent(intent: Intent) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt index 8c544df5f..15ed1c8c8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt @@ -204,7 +204,6 @@ class ExoPlayerPageFragment : MediaViewerFragment(), IBaseFragment - - - true - - \ No newline at end of file From 5072e34900da45ee550500c0099e3cdfa1086bc6 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:18:48 -0400 Subject: [PATCH 11/24] Remove redundant suppressions --- .../microblog/library/twitter/model/IDs$$JsonObjectMapper.java | 1 - .../java/org/mariotaku/twidere/annotation/FilterScope.java | 1 - .../main/java/org/mariotaku/twidere/model/ParcelableMedia.java | 1 - .../org/mariotaku/twidere/model/ParcelableMediaUpdate.java | 1 - .../java/org/mariotaku/twidere/model/ParcelableStatus.java | 3 --- .../org/mariotaku/twidere/model/ParcelableStatusUpdate.java | 1 - .../main/java/org/mariotaku/twidere/model/ParcelableTrend.java | 1 - .../fragment/ThemedListPreferenceDialogFragmentCompat.java | 1 - .../java/org/mariotaku/twidere/loader/ObjectCursorLoader.java | 1 - .../java/org/mariotaku/twidere/util/support/ViewSupport.java | 2 -- .../src/main/java/org/mariotaku/twidere/view/BirthdayView.java | 1 - .../org/oshkimaadziig/george/androidutils/SpanFormatter.java | 1 - 12 files changed, 15 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java index 2d3798f31..5c022bd21 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/IDs$$JsonObjectMapper.java @@ -37,7 +37,6 @@ import java.util.List; @Keep public class IDs$$JsonObjectMapper extends JsonMapper { - @SuppressWarnings("TryWithIdenticalCatches") @Override public IDs parse(JsonParser jsonParser) throws IOException { IDs instance = new IDs(); diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java index 2d0392831..0e7067f10 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/annotation/FilterScope.java @@ -56,6 +56,5 @@ public @interface FilterScope { // Contains all flags int ALL = 0xFFFFFFFF; - @SuppressWarnings("PointlessBitwiseExpression") int DEFAULT = ALL & ~(TARGET_NAME | TARGET_DESCRIPTION); } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java index 03c158424..dd63c2c80 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMedia.java @@ -40,7 +40,6 @@ import java.util.Arrays; @JsonObject @ParcelablePlease public class ParcelableMedia implements Parcelable { - @SuppressWarnings("NullableProblems") @NonNull @JsonField(name = "url") @ParcelableThisPlease diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java index 07d652e6a..4c1ea36bd 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableMediaUpdate.java @@ -31,7 +31,6 @@ import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease; @ParcelablePlease public class ParcelableMediaUpdate implements Parcelable { - @SuppressWarnings("NullableProblems") @NonNull @JsonField(name = "uri") public String uri; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java index 0239de25c..f27948213 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java @@ -75,13 +75,11 @@ public class ParcelableStatus implements Parcelable, Comparable extends FixedAsyncTaskLoader> { return new ObjectCursor<>(cursor, indices, mUseCache); } - @SuppressWarnings("TryWithIdenticalCatches") @NonNull private ObjectCursor.CursorIndices createIndices(final Cursor cursor) { return ObjectCursor.indicesFrom(cursor, mObjectClass); diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java index 94933afc4..4b2f2f6b2 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java @@ -136,10 +136,8 @@ public final class ViewSupport { static void setForeground(final View view, final Drawable foreground) { if (view instanceof FrameLayout) { - //noinspection RedundantCast ((FrameLayout) view).setForeground(foreground); } else if (view instanceof IForegroundView) { - //noinspection RedundantCast ((IForegroundView) view).setForeground(foreground); } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java b/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java index eaee40774..2ca8e382d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/BirthdayView.java @@ -83,7 +83,6 @@ public final class BirthdayView extends LayeredCanvasView { ((AnimatedBitmapLayer) layers[2]).setScale(Math.max(1, w / 160)); } - @SuppressWarnings("deprecation") @Override protected boolean fitSystemWindows(@NonNull Rect insets) { final int stripTop = Utils.INSTANCE.getInsetsTopWithoutActionBarHeight(getContext(), insets.top); diff --git a/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java b/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java index 07318b49c..6bd08caa8 100644 --- a/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java +++ b/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java @@ -33,7 +33,6 @@ import java.util.regex.Pattern; * * @author George T. Steel */ -@SuppressWarnings("IfCanBeSwitch") public class SpanFormatter { public static final Pattern FORMAT_SEQUENCE = Pattern.compile("%([0-9]+\\$| Date: Sun, 31 May 2020 02:21:59 -0400 Subject: [PATCH 12/24] Extract common parts from if statements --- .../org/mariotaku/twidere/view/HeaderDrawerLayout.java | 6 ++---- .../java/org/mariotaku/twidere/view/ShapedImageView.java | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java b/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java index f565663ac..97cf52fc3 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/HeaderDrawerLayout.java @@ -409,13 +409,11 @@ public class HeaderDrawerLayout extends ViewGroup { if (dy > 0 && mDrawer.canScrollCallback(-dy) && mDrawer.isTouchingScrollableContent()) { if (!mDrawer.isUsingDragHelper()) { // Scrolling up while list still has space to scroll, so make header still - mScrollingHeaderByHelper = false; - return current; } else { mDrawer.scrollByCallback(-dy); - mScrollingHeaderByHelper = false; - return current; } + mScrollingHeaderByHelper = false; + return current; } final int min = mDrawer.getHeaderTopMinimum(), max = mDrawer.getHeaderTopMaximum(); if (top < min && mDrawer.isTouchingScrollableContent() && mDrawer.isUsingDragHelper()) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java b/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java index 36870e253..82b92bfc0 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/ShapedImageView.java @@ -196,17 +196,14 @@ public class ShapedImageView extends AppCompatImageView { contentHeight = contentBottom - contentTop; final int size = Math.min(contentWidth, contentHeight); - if (OUTLINE_DRAW) { - drawShape(canvas, mDestination, 0, mBackgroundPaint); - super.onDraw(canvas); - } else { + if (!OUTLINE_DRAW) { if (mShadowBitmap != null && mDrawShadow) { canvas.drawBitmap(mShadowBitmap, contentLeft + (contentWidth - size) / 2 - mShadowRadius, contentTop + (contentHeight - size) / 2 - mShadowRadius, null); } - drawShape(canvas, mDestination, 0, mBackgroundPaint); - super.onDraw(canvas); } + drawShape(canvas, mDestination, 0, mBackgroundPaint); + super.onDraw(canvas); // Then draw the border. if (mBorderEnabled) { drawBorder(canvas, mDestination); From 634322af33ac4019b478d7d8785f3d6b661c2eba Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:22:44 -0400 Subject: [PATCH 13/24] Simplify an if --- .../org/mariotaku/twidere/model/tab/DrawableHolder.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java index 6249d6b75..7b5a61a04 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/DrawableHolder.java @@ -92,11 +92,7 @@ public abstract class DrawableHolder { } public static DrawableHolder parse(String str) { - DrawableHolder icon = builtin(str); - if (icon != null) { - return icon; - } - return null; + return builtin(str); } public static List builtins() { From df8a083ec7dda2afde688f2435ff02e32cd3642f Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:24:17 -0400 Subject: [PATCH 14/24] Replace switches with too few cases with ifs --- .../model/ResponseList$$JsonObjectMapper.java | 7 ++----- .../conversation/ConversationExtras.java | 6 ++---- ...xportImportTypeSelectorDialogFragment.java | 9 +++------ .../fragment/KeyboardShortcutsFragment.java | 17 ++++++----------- .../util/RecyclerViewNavigationHelper.java | 10 ++++------ .../media/preview/provider/ImgurProvider.java | 19 ++++++------------- 6 files changed, 23 insertions(+), 45 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java index 93a244b95..41dc3cff4 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/ResponseList$$JsonObjectMapper.java @@ -61,11 +61,8 @@ public final class ResponseList$$JsonObjectMapper extends JsonMapper instance, String fieldName, JsonParser jsonParser) throws IOException { - switch (fieldName) { - case "results": { - instance.addAll(m84ClassJsonMapper.parseList(jsonParser)); - break; - } + if ("results".equals(fieldName)) { + instance.addAll(m84ClassJsonMapper.parseList(jsonParser)); } } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java index 345db02fc..7f30d1c8c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/message/conversation/ConversationExtras.java @@ -35,10 +35,8 @@ import java.io.IOException; public abstract class ConversationExtras implements Parcelable { public static ConversationExtras parse(@NonNull final String extrasType, @Nullable final String json) throws IOException { if (json == null) return null; - switch (extrasType) { - case ExtrasType.TWITTER_OFFICIAL: { - return LoganSquare.parse(json, TwitterOfficialConversationExtras.class); - } + if (ExtrasType.TWITTER_OFFICIAL.equals(extrasType)) { + return LoganSquare.parse(json, TwitterOfficialConversationExtras.class); } return LoganSquare.parse(json, DefaultConversationExtras.class); } diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java index ab3f95d0a..1e6817c91 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/DataExportImportTypeSelectorDialogFragment.java @@ -66,12 +66,9 @@ public final class DataExportImportTypeSelectorDialogFragment extends BaseDialog @Override public final void onClick(final DialogInterface dialog, final int which) { - switch (which) { - case DialogInterface.BUTTON_POSITIVE: { - final int flags = getCheckedFlags(); - onPositiveButtonClicked(flags); - break; - } + if (which == DialogInterface.BUTTON_POSITIVE) { + final int flags = getCheckedFlags(); + onPositiveButtonClicked(flags); } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java index da22ce032..66fa84f94 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java @@ -66,12 +66,10 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.reset: { - final DialogFragment f = new ResetKeyboardShortcutConfirmDialogFragment(); - f.show(getFragmentManager(), "reset_keyboard_shortcut_confirm"); - return true; - } + if (item.getItemId() == R.id.reset) { + final DialogFragment f = new ResetKeyboardShortcutConfirmDialogFragment(); + f.show(getFragmentManager(), "reset_keyboard_shortcut_confirm"); + return true; } return super.onOptionsItemSelected(item); } @@ -132,11 +130,8 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements implements OnClickListener { @Override public void onClick(DialogInterface dialog, int which) { - switch (which) { - case DialogInterface.BUTTON_POSITIVE: { - keyboardShortcutsHandler.reset(); - break; - } + if (which == DialogInterface.BUTTON_POSITIVE) { + keyboardShortcutsHandler.reset(); } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java b/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java index 0d9fe69fb..3c1b0ff82 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/RecyclerViewNavigationHelper.java @@ -112,13 +112,11 @@ public class RecyclerViewNavigationHelper implements KeyboardShortcutCallback { public boolean handleKeyboardShortcutSingle(@NonNull KeyboardShortcutsHandler handler, int keyCode, @NonNull KeyEvent event, int metaState) { final String action = handler.getKeyAction(CONTEXT_TAG_NAVIGATION, keyCode, event, metaState); if (action == null) return false; - switch (action) { - case ACTION_NAVIGATION_TOP: { - if (iface != null) { - iface.scrollToStart(); - } - return true; + if (ACTION_NAVIGATION_TOP.equals(action)) { + if (iface != null) { + iface.scrollToStart(); } + return true; } return false; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java index 59ab2d90a..6c2a77f11 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/media/preview/provider/ImgurProvider.java @@ -15,12 +15,7 @@ public class ImgurProvider implements Provider { public boolean supports(@NonNull String link) { final String authority = UriUtils.getAuthority(link); if (authority == null) return false; - switch (authority) { - case "i.imgur.com": - return true; - default: - return false; - } + return "i.imgur.com".equals(authority); } @Nullable @@ -28,13 +23,11 @@ public class ImgurProvider implements Provider { public ParcelableMedia from(@NonNull String url) { final String authority = UriUtils.getAuthority(url); if (authority == null) return null; - switch (authority) { - case "i.imgur.com": { - final String path = UriUtils.getPath(url); - if (path == null) return null; - ParcelableMedia media = new ParcelableMedia(); - media.url = url; - } + if ("i.imgur.com".equals(authority)) { + final String path = UriUtils.getPath(url); + if (path == null) return null; + ParcelableMedia media = new ParcelableMedia(); + media.url = url; } return null; } From 65e46a8ee6d2502e3567cfa02c9dbbf1afaa5e67 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:28:38 -0400 Subject: [PATCH 15/24] Java 5 migration aid --- .../org/mariotaku/microblog/library/MicroBlogException.java | 2 +- .../org/apache/commons/text/translate/LookupTranslator.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java index ede08f180..284a05875 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/MicroBlogException.java @@ -206,7 +206,7 @@ public class MicroBlogException extends Exception implements TwitterResponse, Ht try { final String retryAfterStr = httpResponse.getHeader("Retry-After"); if (retryAfterStr != null) { - retryAfter = Integer.valueOf(retryAfterStr); + retryAfter = Integer.parseInt(retryAfterStr); } } catch (final NumberFormatException ignore) { } diff --git a/twidere/src/main/java/org/apache/commons/text/translate/LookupTranslator.java b/twidere/src/main/java/org/apache/commons/text/translate/LookupTranslator.java index c4d5e2ee6..fc02ac347 100644 --- a/twidere/src/main/java/org/apache/commons/text/translate/LookupTranslator.java +++ b/twidere/src/main/java/org/apache/commons/text/translate/LookupTranslator.java @@ -21,7 +21,6 @@ import java.io.Writer; import java.security.InvalidParameterException; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; /** @@ -59,10 +58,8 @@ public class LookupTranslator extends CharSequenceTranslator { this.prefixSet = new HashSet<>(); int currentShortest = Integer.MAX_VALUE; int currentLongest = 0; - Iterator> it = lookupMap.entrySet().iterator(); - while (it.hasNext()) { - Map.Entry pair = it.next(); + for (Map.Entry pair : lookupMap.entrySet()) { this.lookupMap.put(pair.getKey().toString(), pair.getValue().toString()); this.prefixSet.add(pair.getKey().charAt(0)); final int sz = pair.getKey().length(); From 67b0af9cb4307f17b01a74f6764d29e88aa7da33 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:29:10 -0400 Subject: [PATCH 16/24] Java 7 migration aid --- .../main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java index decef593e..2cd96943e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/ArrayAdapter.java @@ -101,7 +101,7 @@ public class ArrayAdapter extends BaseAdapter implements Filterable { * instantiating views. */ public ArrayAdapter(Context context, int resource) { - init(context, resource, new ArrayList()); + init(context, resource, new ArrayList<>()); } /** From 5bc9d6770eed0662e47c73d67aa3b05a1c9c5cb7 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:32:14 -0400 Subject: [PATCH 17/24] Java 8 migration aid --- .../twidere/model/ParcelableStatus.java | 9 +-- .../ExtendedDividerItemDecoration.java | 9 +-- .../fragment/FileSelectorDialogFragment.java | 22 +++----- .../fragment/KeyboardShortcutsFragment.java | 15 +---- ...medListPreferenceDialogFragmentCompat.java | 20 +++---- .../preference/MultiSelectListPreference.java | 7 +-- .../SettingsImportExportPreference.java | 15 +---- .../preference/ThemeBackgroundPreference.java | 56 ++++++++----------- .../twidere/util/AbsServiceInterface.java | 9 +-- .../SwipeDismissListViewTouchListener.java | 9 +-- 10 files changed, 52 insertions(+), 119 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java index f27948213..b83ac6790 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java @@ -20,7 +20,6 @@ package org.mariotaku.twidere.model; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.IntDef; import androidx.annotation.LongDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -52,13 +51,7 @@ import java.util.Comparator; @ParcelablePlease public class ParcelableStatus implements Parcelable, Comparable, Cloneable { - public static final Comparator REVERSE_COMPARATOR = new Comparator() { - - @Override - public int compare(final ParcelableStatus object1, final ParcelableStatus object2) { - return object2.compareTo(object1); - } - }; + public static final Comparator REVERSE_COMPARATOR = (object1, object2) -> object2.compareTo(object1); public static final Creator CREATOR = new Creator() { @Override public ParcelableStatus createFromParcel(Parcel source) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java index 595d86935..ddff1c494 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/ExtendedDividerItemDecoration.java @@ -84,12 +84,9 @@ public class ExtendedDividerItemDecoration extends RecyclerView.ItemDecoration { } public void setPadding(final int left, final int top, final int right, final int bottom) { - mPadding = new Padding() { - @Override - public boolean get(int position, Rect rect) { - rect.set(left, top, right, bottom); - return true; - } + mPadding = (position, rect) -> { + rect.set(left, top, right, bottom); + return true; }; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java index e6569702d..b3848a953 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java @@ -118,14 +118,11 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo builder.setPositiveButton(android.R.string.ok, this); } final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - final AlertDialog alertDialog = (AlertDialog) dialog; - DialogExtensionsKt.applyTheme(alertDialog); - final ListView listView = alertDialog.getListView(); - listView.setOnItemClickListener(FileSelectorDialogFragment.this); - } + dialog.setOnShowListener(dialog1 -> { + final AlertDialog alertDialog = (AlertDialog) dialog1; + DialogExtensionsKt.applyTheme(alertDialog); + final ListView listView = alertDialog.getListView(); + listView.setOnItemClickListener(FileSelectorDialogFragment.this); }); return dialog; } @@ -268,12 +265,9 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo private final String[] extensions; private final Pattern extensions_regex; - private static final Comparator NAME_COMPARATOR = new Comparator() { - @Override - public int compare(final File file1, final File file2) { - final Locale loc = Locale.getDefault(); - return file1.getName().toLowerCase(loc).compareTo(file2.getName().toLowerCase(loc)); - } + private static final Comparator NAME_COMPARATOR = (file1, file2) -> { + final Locale loc = Locale.getDefault(); + return file1.getName().toLowerCase(loc).compareTo(file2.getName().toLowerCase(loc)); }; public FilesLoader(final Context context, final File path, final String[] extensions) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java index 66fa84f94..f0a3d88d0 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; -import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; import androidx.annotation.NonNull; @@ -88,12 +87,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements mAction = action; setPersistent(false); setTitle(KeyboardShortcutsHandler.getActionLabel(context, action)); - mPreferencesChangeListener = new OnSharedPreferenceChangeListener() { - @Override - public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { - updateSummary(); - } - }; + mPreferencesChangeListener = (preferences, key) -> updateSummary(); updateSummary(); } @@ -143,12 +137,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements builder.setPositiveButton(android.R.string.ok, this); builder.setNegativeButton(android.R.string.cancel, this); final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - DialogExtensionsKt.applyTheme((AlertDialog) dialog); - } - }); + dialog.setOnShowListener(dialog1 -> DialogExtensionsKt.applyTheme((AlertDialog) dialog1)); return dialog; } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java index 6d70643d2..4455099f8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/ThemedListPreferenceDialogFragmentCompat.java @@ -47,17 +47,15 @@ public class ThemedListPreferenceDialogFragmentCompat extends ThemedPreferenceDi } mClickedDialogEntryIndex = preference.findIndexOfValue(preference.getValue()); builder.setSingleChoiceItems(entries, mClickedDialogEntryIndex, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - mClickedDialogEntryIndex = which; - /* - * Clicking on an item simulates the positive button - * click, and dismisses the dialog. - */ - ThemedListPreferenceDialogFragmentCompat.this.onClick(dialog, - DialogInterface.BUTTON_POSITIVE); - dialog.dismiss(); - } + (dialog, which) -> { + mClickedDialogEntryIndex = which; + /* + * Clicking on an item simulates the positive button + * click, and dismisses the dialog. + */ + ThemedListPreferenceDialogFragmentCompat.this.onClick(dialog, + DialogInterface.BUTTON_POSITIVE); + dialog.dismiss(); }); /* * The typical interaction for list-based dialogs is to have diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java index 40f003f7a..b4e77996b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java @@ -100,12 +100,7 @@ abstract class MultiSelectListPreference extends DialogPreference implements IDi builder.setNegativeButton(android.R.string.cancel, null); builder.setMultiChoiceItems(mNames, mValues, this); final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - DialogExtensionsKt.applyTheme((AlertDialog) dialog); - } - }); + dialog.setOnShowListener(dialog1 -> DialogExtensionsKt.applyTheme((AlertDialog) dialog1)); return dialog; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java index 7c9bbdb74..7d520e36c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java @@ -21,7 +21,6 @@ package org.mariotaku.twidere.preference; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import androidx.annotation.NonNull; @@ -78,19 +77,9 @@ public class SettingsImportExportPreference extends DialogPreference implements entries[1] = context.getString(R.string.export_settings); values[0] = new Intent(context, DataImportActivity.class); values[1] = new Intent(context, DataExportActivity.class); - builder.setItems(entries, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - startActivity(values[which]); - } - }); + builder.setItems(entries, (dialog, which) -> startActivity(values[which])); final AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(final DialogInterface dialog) { - DialogExtensionsKt.applyTheme((AlertDialog) dialog); - } - }); + dialog.setOnShowListener(dialog1 -> DialogExtensionsKt.applyTheme((AlertDialog) dialog1)); return dialog; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java index bc7346649..ad66c6aef 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java @@ -2,8 +2,6 @@ package org.mariotaku.twidere.preference; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; @@ -17,7 +15,6 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.ListView; import android.widget.SeekBar; @@ -160,42 +157,33 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const final SharedPreferences preferences = preference.getSharedPreferences(); preference.setValue(preference.getPersistedString(null)); builder.setTitle(preference.getDialogTitle()); - builder.setSingleChoiceItems(preference.mBackgroundEntries, preference.getValueIndex(), new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - preference.setSelectedOption(which); - updateAlphaVisibility(); - } + builder.setSingleChoiceItems(preference.mBackgroundEntries, preference.getValueIndex(), (dialog, which) -> { + preference.setSelectedOption(which); + updateAlphaVisibility(); }); builder.setPositiveButton(android.R.string.ok, this); builder.setNegativeButton(android.R.string.cancel, this); final Dialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { - @Override - public void onShow(DialogInterface dialog) { - final AlertDialog alertDialog = (AlertDialog) dialog; - DialogExtensionsKt.applyTheme(alertDialog); - if (preferences != null) { - final LayoutInflater inflater = alertDialog.getLayoutInflater(); - final ListView listView = alertDialog.getListView(); - assert listView != null; - final ViewGroup listViewParent = (ViewGroup) listView.getParent(); - listViewParent.removeView(listView); - final View view = inflater.inflate(R.layout.dialog_theme_background_preference, listViewParent); - ((ViewGroup) view.findViewById(R.id.list_container)).addView(listView); - mAlphaContainer = view.findViewById(R.id.alpha_container); - mAlphaSlider = view.findViewById(R.id.alpha_slider); - mAlphaSlider.setMax(MAX_ALPHA - MIN_ALPHA); - mAlphaSlider.setProgress(preferences.getInt(KEY_THEME_BACKGROUND_ALPHA, DEFAULT_THEME_BACKGROUND_ALPHA) - MIN_ALPHA); - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - preference.setSelectedOption(position); - updateAlphaVisibility(); - } - }); + dialog.setOnShowListener(dialog1 -> { + final AlertDialog alertDialog = (AlertDialog) dialog1; + DialogExtensionsKt.applyTheme(alertDialog); + if (preferences != null) { + final LayoutInflater inflater = alertDialog.getLayoutInflater(); + final ListView listView = alertDialog.getListView(); + assert listView != null; + final ViewGroup listViewParent = (ViewGroup) listView.getParent(); + listViewParent.removeView(listView); + final View view = inflater.inflate(R.layout.dialog_theme_background_preference, listViewParent); + ((ViewGroup) view.findViewById(R.id.list_container)).addView(listView); + mAlphaContainer = view.findViewById(R.id.alpha_container); + mAlphaSlider = view.findViewById(R.id.alpha_slider); + mAlphaSlider.setMax(MAX_ALPHA - MIN_ALPHA); + mAlphaSlider.setProgress(preferences.getInt(KEY_THEME_BACKGROUND_ALPHA, DEFAULT_THEME_BACKGROUND_ALPHA) - MIN_ALPHA); + listView.setOnItemClickListener((parent, view1, position, id) -> { + preference.setSelectedOption(position); updateAlphaVisibility(); - } + }); + updateAlphaVisibility(); } }); return dialog; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java b/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java index 254a2a412..f678104a9 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/AbsServiceInterface.java @@ -31,7 +31,6 @@ import androidx.annotation.Nullable; import org.mariotaku.twidere.constant.IntentConstants; import org.mariotaku.twidere.util.ServiceUtils.ServiceToken; -import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; @@ -73,12 +72,7 @@ public abstract class AbsServiceInterface implements IInte final Intent intent = new Intent(IntentConstants.INTENT_ACTION_EXTENSION_SHORTEN_STATUS); final ComponentName component = ComponentName.unflattenFromString(mShortenerName); intent.setComponent(component); - final FutureTask futureTask = new FutureTask<>(new Callable() { - @Override - public Boolean call() throws Exception { - return mIInterface != null; - } - }); + final FutureTask futureTask = new FutureTask<>(() -> mIInterface != null); mToken = ServiceUtils.bindToService(mContext, intent, new ServiceConnection() { @Override public void onServiceConnected(final ComponentName name, final IBinder obj) { @@ -112,7 +106,6 @@ public abstract class AbsServiceInterface implements IInte } public interface CheckServiceAction { - @SuppressWarnings("RedundantThrows") void check(@Nullable Bundle metaData) throws CheckServiceException; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java index 1e1d57991..c3c5d0dd7 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java @@ -391,12 +391,9 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener { } }); - animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator valueAnimator) { - lp.height = (Integer) valueAnimator.getAnimatedValue(); - dismissView.setLayoutParams(lp); - } + animator.addUpdateListener(valueAnimator -> { + lp.height = (Integer) valueAnimator.getAnimatedValue(); + dismissView.setLayoutParams(lp); }); mPendingDismisses.add(new PendingDismissData(dismissPosition, dismissView)); From bd2e9150e9a9522e1ff4b63a001f38d7b3279a31 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:33:23 -0400 Subject: [PATCH 18/24] Static-ize some inner classes --- .../org/mariotaku/twidere/util/MouseScrollDirectionDecider.java | 2 +- .../org/mariotaku/twidere/util/NotificationManagerWrapper.java | 2 +- .../twidere/util/SwipeDismissListViewTouchListener.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java b/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java index 071cc8103..b5b1bf7fd 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/MouseScrollDirectionDecider.java @@ -132,7 +132,7 @@ public class MouseScrollDirectionDecider { } @SuppressLint("ViewConstructor") - private class InternalHorizontalScrollView extends HorizontalScrollView { + private static class InternalHorizontalScrollView extends HorizontalScrollView { private final int factor; private final MouseScrollDirectionDecider decider; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/NotificationManagerWrapper.java b/twidere/src/main/java/org/mariotaku/twidere/util/NotificationManagerWrapper.java index f0895ebb0..6f1e4e9b0 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/NotificationManagerWrapper.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/NotificationManagerWrapper.java @@ -113,7 +113,7 @@ public class NotificationManagerWrapper { } - private class PostedNotification { + private static class PostedNotification { private final String tag; private final int id; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java index c3c5d0dd7..77636e8da 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/SwipeDismissListViewTouchListener.java @@ -325,7 +325,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener { return false; } - class PendingDismissData implements Comparable { + static class PendingDismissData implements Comparable { public int position; public View view; From b33a1e8763b2b6d9166d1253bab258b1de755414 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:34:34 -0400 Subject: [PATCH 19/24] Fix size of passed arrays --- .../mariotaku/microblog/library/twitter/model/CardDataMap.java | 2 +- .../microblog/library/twitter/model/UniversalSearchResult.java | 2 +- .../org/mariotaku/twidere/model/util/UserKeysConverter.java | 2 +- .../main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java | 2 +- .../main/java/org/mariotaku/twidere/model/CronExpression.java | 2 +- .../java/org/mariotaku/twidere/util/MultiSelectManager.java | 2 +- .../mariotaku/twidere/util/content/ContentResolverUtils.java | 2 +- .../mariotaku/twidere/util/content/DatabaseUpgradeHelper.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java index ab83d32d1..8853e9a7a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/CardDataMap.java @@ -64,7 +64,7 @@ public class CardDataMap implements ValueMap { @Override public String[] keys() { final Set keySet = map.keySet(); - return keySet.toArray(new String[keySet.size()]); + return keySet.toArray(new String[0]); } @Override diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java index 3eea4da04..8f9f8f38c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/model/UniversalSearchResult.java @@ -250,7 +250,7 @@ public class UniversalSearchResult { index.end = jsonParser.nextIntValue(-1); list.add(index); } - return list.toArray(new Index[list.size()]); + return list.toArray(new Index[0]); } @Override diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/UserKeysConverter.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/UserKeysConverter.java index 2730efd4b..c70934807 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/UserKeysConverter.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/util/UserKeysConverter.java @@ -46,7 +46,7 @@ public class UserKeysConverter implements TypeConverter { while (jsonParser.nextToken() != JsonToken.END_ARRAY) { list.add(UserKey.valueOf(jsonParser.getValueAsString())); } - return list.toArray(new UserKey[list.size()]); + return list.toArray(new UserKey[0]); } @Override diff --git a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java b/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java index c0357bd88..c0f1de410 100644 --- a/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java +++ b/twidere.component.nyan/src/main/java/org/mariotaku/twidere/nyan/NyanDrawingHelper.java @@ -314,7 +314,7 @@ public class NyanDrawingHelper { public void dispatchOnDraw(final Canvas canvas) { final int w = canvas.getWidth(), h = canvas.getHeight(); if (w <= 0 || h <= 0) return; - for (final Star star : mStars.toArray(new Star[mStars.size()])) { + for (final Star star : mStars.toArray(new Star[0])) { final int col = star.nextColumn(), row = star.nextRow(); final float y = (row + 0.5f) * (h / mStarRows), x = (col + 0.5f) * (w / mStarCols); drawStar(canvas, x, y, star.nextFrame()); diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java b/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java index f6321ccbc..8cabe426b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java +++ b/twidere/src/main/java/org/mariotaku/twidere/model/CronExpression.java @@ -447,7 +447,7 @@ public class CronExpression { if (match) { list.add(str.substring(start, i)); } - return list.toArray(new String[list.size()]); + return list.toArray(new String[0]); } } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectManager.java b/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectManager.java index 0be0adc23..d9e9a28ab 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectManager.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectManager.java @@ -133,7 +133,7 @@ public class MultiSelectManager { userKeys.add(((ParcelableStatus) item).user_key); } } - return userKeys.toArray(new UserKey[userKeys.size()]); + return userKeys.toArray(new UserKey[0]); } public interface Callback { diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java index 371fcdce7..ed060e533 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/content/ContentResolverUtils.java @@ -81,7 +81,7 @@ public class ContentResolverUtils { public static int bulkInsert(@NonNull final ContentResolver resolver, @NonNull final Uri uri, @NonNull final Collection values) { - return bulkInsert(resolver, uri, values.toArray(new ContentValues[values.size()])); + return bulkInsert(resolver, uri, values.toArray(new ContentValues[0])); } public static int bulkInsert(@NonNull final ContentResolver resolver, @NonNull final Uri uri, diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/content/DatabaseUpgradeHelper.java b/twidere/src/main/java/org/mariotaku/twidere/util/content/DatabaseUpgradeHelper.java index 0a7d13c26..ce5d4619b 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/content/DatabaseUpgradeHelper.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/content/DatabaseUpgradeHelper.java @@ -107,7 +107,7 @@ public final class DatabaseUpgradeHelper { newInsertColsList.add(newCol); } } - final String[] newInsertCols = newInsertColsList.toArray(new String[newInsertColsList.size()]); + final String[] newInsertCols = newInsertColsList.toArray(new String[0]); if (!TwidereArrayUtils.contains(newInsertCols, notNullCols)) return null; qb.columns(newInsertCols); final Columns.Column[] oldDataCols = new Columns.Column[newInsertCols.length]; From 3b2df86fe73d336550de96515616ef8952d0734e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:35:50 -0400 Subject: [PATCH 20/24] Remove redundant initializers --- .../org/mariotaku/twidere/util/DataImportExportUtils.java | 6 +++--- .../oshkimaadziig/george/androidutils/SpanFormatter.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java index 21edb8925..dc1966a10 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/DataImportExportUtils.java @@ -170,7 +170,7 @@ public class DataImportExportUtils implements Constants { ZipInputStream zipInputStream = new ZipInputStream(inputStream)) { int flags = 0; List entryNames = new ArrayList<>(); - ZipEntry entry = null; + ZipEntry entry; while ((entry = zipInputStream.getNextEntry()) != null) { entryNames.add(entry.getName()); } @@ -204,11 +204,11 @@ public class DataImportExportUtils implements Constants { try (InputStream inputStream = context.getContentResolver().openInputStream(src.getUri()); ZipInputStream zipInputStream = new ZipInputStream(inputStream) ) { - ZipEntry entry = null; + ZipEntry entry; while ((entry = zipInputStream.getNextEntry()) != null) { StringBuilder stringBuilder = new StringBuilder(); byte[] buffer = new byte[1024]; - int read = 0; + int read; while ((read = zipInputStream.read(buffer, 0, 1024)) >= 0) { stringBuilder.append(new String(buffer, 0, read)); } diff --git a/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java b/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java index 6bd08caa8..d21139878 100644 --- a/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java +++ b/twidere/src/main/java/org/oshkimaadziig/george/androidutils/SpanFormatter.java @@ -90,7 +90,7 @@ public class SpanFormatter { } else if (typeTerm.equals("%")) { cookedArg = "\n"; } else { - int argIdx = 0; + int argIdx; if (argTerm.equals("")) argIdx = ++argAt; else if (argTerm.equals("<")) argIdx = argAt; else argIdx = Integer.parseInt(argTerm.substring(0, argTerm.length() - 1)) - 1; From 45349463145b5b8db4cd27a6e046f7257c70342f Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:39:35 -0400 Subject: [PATCH 21/24] Simplify some code constructs --- .../microblog/library/twitter/util/InternalParseUtil.java | 5 +---- .../mariotaku/twidere/util/collection/CompactHashSet.java | 4 ++-- .../java/org/mariotaku/twidere/util/support/ViewSupport.java | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java index 55581c465..c816da647 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java +++ b/twidere.component.common/src/main/java/org/mariotaku/microblog/library/twitter/util/InternalParseUtil.java @@ -52,12 +52,9 @@ public final class InternalParseUtil { accessLevel = TwitterResponse.AccessLevel.READ_WRITE; break; case 25: - // “read-write-directmessages” (Read, Write, & Direct - // Message) - accessLevel = TwitterResponse.AccessLevel.READ_WRITE_DIRECTMESSAGES; - break; case 26: // “read-write-privatemessages” (Read, Write, & Direct + // “read-write-directmessages” (Read, Write, & Direct // Message) accessLevel = TwitterResponse.AccessLevel.READ_WRITE_DIRECTMESSAGES; break; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java b/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java index c1d378e7e..88b32aebe 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/collection/CompactHashSet.java @@ -25,6 +25,7 @@ package org.mariotaku.twidere.util.collection; import androidx.annotation.NonNull; +import java.util.Arrays; import java.util.Collection; import java.util.ConcurrentModificationException; import java.util.Iterator; @@ -253,8 +254,7 @@ public class CompactHashSet extends java.util.AbstractSet { @Override public void clear() { elements = 0; - for (int ix = 0; ix < objects.length; ix++) - objects[ix] = null; + Arrays.fill(objects, null); freecells = objects.length; modCount++; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java index 4b2f2f6b2..7fd1bb7bc 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/ViewSupport.java @@ -92,8 +92,8 @@ public final class ViewSupport { if (cls.isAssignableFrom(view.getClass())) return (T) view; if (view instanceof ViewGroup) { for (int i = 0, j = ((ViewGroup) view).getChildCount(); i < j; i++) { - final View found = findViewByType(((ViewGroup) view).getChildAt(i), cls); - if (found != null) return (T) found; + final T found = findViewByType(((ViewGroup) view).getChildAt(i), cls); + if (found != null) return found; } } return null; From 20fad6b9174ceec137e128974dbf7a2ed1bb2c5f Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:44:38 -0400 Subject: [PATCH 22/24] Migrate some older Kotlin --- .../org/mariotaku/twidere/activity/UserSelectorActivity.kt | 4 ++-- .../org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt | 2 +- .../mariotaku/twidere/fragment/ColorPickerDialogFragment.kt | 2 +- .../kotlin/org/mariotaku/twidere/fragment/UserFragment.kt | 2 +- .../mariotaku/twidere/fragment/filter/AddEditItemFragment.kt | 2 +- .../fragment/message/MessageNewConversationFragment.kt | 2 +- .../twidere/fragment/status/AbsStatusDialogFragment.kt | 2 +- .../org/mariotaku/twidere/fragment/status/StatusFragment.kt | 2 +- .../org/mariotaku/twidere/loader/ExtensionsListLoader.kt | 2 +- .../org/mariotaku/twidere/preference/ColorPickerPreference.kt | 2 +- .../kotlin/org/mariotaku/twidere/util/HttpClientFactory.kt | 4 ++-- .../org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt | 2 +- .../mariotaku/twidere/util/glide/RoundedRectTransformation.kt | 1 - 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt index d048cb6ab..b562e4948 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt @@ -109,8 +109,8 @@ class UserSelectorActivity : BaseActivity(), OnItemClickListener, LoaderManager. override fun onCreateLoader(id: Int, args: Bundle?): Loader> { val accountKey = args?.getParcelable(EXTRA_ACCOUNT_KEY)!! - val query = args?.getString(EXTRA_QUERY).orEmpty() - val fromCache = args?.getBoolean(EXTRA_FROM_CACHE) + val query = args.getString(EXTRA_QUERY).orEmpty() + val fromCache = args.getBoolean(EXTRA_FROM_CACHE) if (!fromCache) { showProgress() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt index 4961d3906..a7aa768e6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -117,7 +117,7 @@ class StatusDetailsAdapter( inflater = LayoutInflater.from(context) cardBackgroundColor = ThemeUtils.getCardBackgroundColor(context!!, preferences[themeBackgroundOptionKey], preferences[themeBackgroundAlphaKey]) - val listener = StatusAdapterLinkClickHandler>(context!!, preferences) + val listener = StatusAdapterLinkClickHandler>(context, preferences) listener.setAdapter(this) twidereLinkify = TwidereLinkify(listener) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt index aa62fa2e8..ef0dd7f8c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ColorPickerDialogFragment.kt @@ -100,7 +100,7 @@ class ColorPickerDialogFragment : BaseDialogFragment(), DialogInterface.OnClickL override fun onSaveInstanceState(outState: Bundle) { if (controller != null) { - outState!!.putInt(EXTRA_COLOR, controller!!.color) + outState.putInt(EXTRA_COLOR, controller!!.color) } super.onSaveInstanceState(outState) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index e1520072f..c87e45b75 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -667,7 +667,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, actionBarShadowColor = 0xA0000000.toInt() val args = arguments val accountKey = args?.getParcelable(EXTRA_ACCOUNT_KEY) ?: run { - activity?.finish() + activity.finish() return } val userKey = args.getParcelable(EXTRA_USER_KEY) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt index cf5d579a8..4fa212fea 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt @@ -253,7 +253,7 @@ class AddEditItemFragment : BaseDialogFragment() { Toast.LENGTH_SHORT).show() } else { val idWhere = Expression.equals(Filters._ID, rowId).sql - resolver?.update(uri, values, idWhere, null) + resolver.update(uri, values, idWhere, null) } } else { resolver?.insert(uri, values) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt index bcfe87c1f..6aeef8430 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt @@ -238,7 +238,7 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks url.host() "[PORT]" -> url.port() "[AUTHORITY]" -> url.authority() - "[PATH]" -> url.encodedPath()?.removePrefix("/").orEmpty() + "[PATH]" -> url.encodedPath().removePrefix("/") "[/PATH]" -> url.encodedPath().orEmpty() - "[PATH_ENCODED]" -> url.encodedPath()?.removePrefix("/")?.urlEncoded() + "[PATH_ENCODED]" -> url.encodedPath().removePrefix("/").urlEncoded() "[QUERY]" -> url.encodedQuery().orEmpty() "[?QUERY]" -> url.encodedQuery()?.prefix("?").orEmpty() "[QUERY_ENCODED]" -> url.encodedQuery()?.urlEncoded() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt index 8fe3da1a0..535426bb3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt @@ -34,7 +34,7 @@ class RecyclerViewScrollHandler(contentListSupport: ContentListSupport, vi } override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { - val scrollState = recyclerView!!.scrollState + val scrollState = recyclerView.scrollState scrollHandler.handleScroll(dy, scrollState, oldState, RecyclerView.SCROLL_STATE_IDLE) oldState = scrollState } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt index 70d005bcb..e4be99d63 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt @@ -46,7 +46,6 @@ class RoundedRectTransformation( val height = source.height val bitmap = bitmapPool.get(width, height, Bitmap.Config.ARGB_8888) - ?: Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888) val canvas = Canvas(bitmap) val paint = Paint() From 537aa5dbb421da7782ded1870eb72d6232706ce9 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 31 May 2020 02:53:41 -0400 Subject: [PATCH 23/24] Redundant construct cleanup 2: kotlin boogaloo --- .../kotlin/androidx/loader/app/LoaderManagerExtensions.kt | 3 --- .../kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt | 1 - .../androidx/recyclerview/widget/RecyclerViewAccessor.kt | 2 -- .../mariotaku/twidere/activity/AccountSelectorActivity.kt | 1 - .../org/mariotaku/twidere/activity/MediaViewerActivity.kt | 1 - .../mariotaku/twidere/activity/UserListSelectorActivity.kt | 1 - .../mariotaku/twidere/adapter/MessagesConversationAdapter.kt | 3 +-- .../org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt | 3 +-- .../twidere/adapter/SimpleParcelableUserListsAdapter.kt | 3 +-- .../org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt | 2 +- .../org/mariotaku/twidere/adapter/SupportTabsAdapter.kt | 1 - .../org/mariotaku/twidere/adapter/VariousItemsAdapter.kt | 3 +-- .../mariotaku/twidere/extension/model/AccountExtensions.kt | 2 +- .../mariotaku/twidere/fragment/APIEditorDialogFragment.kt | 1 - .../org/mariotaku/twidere/fragment/AbsStatusesFragment.kt | 2 +- .../mariotaku/twidere/fragment/AccountsDashboardFragment.kt | 1 - .../org/mariotaku/twidere/fragment/BaseDialogFragment.kt | 1 - .../org/mariotaku/twidere/fragment/ItemsListFragment.kt | 1 - .../mariotaku/twidere/fragment/ParcelableGroupsFragment.kt | 1 - .../mariotaku/twidere/fragment/ParcelableStatusesFragment.kt | 2 +- .../twidere/fragment/ParcelableUserListsFragment.kt | 1 - .../mariotaku/twidere/fragment/UserProfileEditorFragment.kt | 1 - .../mariotaku/twidere/fragment/media/ImagePageFragment.kt | 1 - .../fragment/status/TranslationDestinationDialogFragment.kt | 1 - .../kotlin/org/mariotaku/twidere/provider/CacheProvider.kt | 2 -- .../org/mariotaku/twidere/task/AbsFriendshipOperationTask.kt | 5 ++--- .../kotlin/org/mariotaku/twidere/task/DestroyFavoriteTask.kt | 3 +-- .../main/kotlin/org/mariotaku/twidere/task/SaveFileTask.kt | 2 +- .../twidere/task/twitter/message/GetMessagesTask.kt | 3 +-- .../src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt | 3 +-- twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt | 4 ++-- .../org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt | 3 +-- .../mariotaku/twidere/util/glide/AuthenticatedUriLoader.kt | 1 - .../org/mariotaku/twidere/util/glide/NoThumborUrlLoader.kt | 1 - .../org/mariotaku/twidere/util/glide/TwidereGlideModule.kt | 1 - .../util/refresh/JobSchedulerAutoRefreshController.kt | 1 - .../org/mariotaku/twidere/util/sync/TimelineSyncManager.kt | 1 - .../twidere/util/twitter/card/TwitterCardViewFactory.kt | 2 +- .../kotlin/org/mariotaku/twidere/util/view/ViewAnimator.kt | 5 ++--- .../main/kotlin/org/mariotaku/twidere/view/MediaViewPager.kt | 5 +---- .../twidere/view/holder/compose/MediaPreviewViewHolder.kt | 1 - 41 files changed, 21 insertions(+), 61 deletions(-) diff --git a/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt b/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt index 3920617b1..172cba0da 100644 --- a/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt +++ b/twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt @@ -1,8 +1,5 @@ package androidx.loader.app -import androidx.loader.app.LoaderManager -import androidx.loader.app.LoaderManagerImpl - /** * Created by mariotaku on 2016/11/26. */ diff --git a/twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt b/twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt index fab5db6b5..6dde68c1a 100644 --- a/twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt +++ b/twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt @@ -2,7 +2,6 @@ package androidx.loader.content import android.content.Context import android.os.AsyncTask -import androidx.loader.content.AsyncTaskLoader import org.mariotaku.twidere.extension.set import org.mariotaku.twidere.util.Analyzer diff --git a/twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt b/twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt index c0fe226db..bdff2b83c 100644 --- a/twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt +++ b/twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt @@ -19,6 +19,4 @@ package androidx.recyclerview.widget -import androidx.recyclerview.widget.RecyclerView - val RecyclerView.LayoutManager.recyclerView: RecyclerView? get() = mRecyclerView diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt index 0376f95ac..c386c9f0d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt @@ -34,7 +34,6 @@ import org.mariotaku.twidere.R import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.adapter.AccountDetailsAdapter import org.mariotaku.twidere.annotation.AccountType -import org.mariotaku.twidere.app.TwidereApplication import org.mariotaku.twidere.extension.model.isOAuth import org.mariotaku.twidere.model.UserKey import org.mariotaku.twidere.model.util.AccountUtils diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index b81b7c08b..9d1c475c2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -26,7 +26,6 @@ import android.os.Build import android.os.Bundle import android.os.Environment import android.os.Parcelable -import android.provider.MediaStore import androidx.annotation.RequiresApi import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt index 6d08fad0b..17a011f31 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt @@ -28,7 +28,6 @@ import android.view.View import android.widget.AdapterView.OnItemClickListener import android.widget.TextView import androidx.loader.app.hasRunningLoadersSafe -import com.bumptech.glide.Glide import kotlinx.android.synthetic.main.layout_list_with_empty_view.* import org.mariotaku.ktextension.Bundle import org.mariotaku.ktextension.contains diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt index c3f4f1abb..f1fd45836 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt @@ -120,8 +120,7 @@ class MessagesConversationAdapter( } ITEM_LOAD_OLDER_INDICATOR -> { val view = inflater.inflate(LoadIndicatorViewHolder.layoutResource, parent, false) - val holder = LoadIndicatorViewHolder(view) - return holder + return LoadIndicatorViewHolder(view) } } throw UnsupportedOperationException() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt index 6dbaa6d54..0c41840f4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt @@ -70,8 +70,7 @@ class SelectableUsersAdapter( when (viewType) { ITEM_VIEW_TYPE_USER -> { val view = inflater.inflate(R.layout.list_item_simple_user, parent, false) - val holder = SelectableUserViewHolder(view, this) - return holder + return SelectableUserViewHolder(view, this) } ITEM_VIEW_TYPE_LOAD_INDICATOR -> { val view = inflater.inflate(R.layout.list_item_load_indicator, parent, false) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SimpleParcelableUserListsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SimpleParcelableUserListsAdapter.kt index 8e74fcc73..9522c938a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SimpleParcelableUserListsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SimpleParcelableUserListsAdapter.kt @@ -67,8 +67,7 @@ class SimpleParcelableUserListsAdapter( return view } 1 -> { - val view = createViewFromResource(position, convertView, parent, R.layout.list_item_load_indicator) - return view + return createViewFromResource(position, convertView, parent, R.layout.list_item_load_indicator) } } throw UnsupportedOperationException() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt index a7aa768e6..4a7fb5c2e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -306,7 +306,7 @@ class StatusDetailsAdapter( when (holder.itemViewType) { VIEW_TYPE_DETAIL_STATUS -> { holder as DetailStatusViewHolder - payloads.forEach { it -> + payloads.forEach { when (it) { is StatusFragment.StatusActivity -> { holder.updateStatusActivity(it) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt index 5f18ceacc..89fe86f3e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt @@ -26,7 +26,6 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.viewpager.widget.PagerAdapter import android.view.View -import android.view.ViewGroup import org.mariotaku.twidere.fragment.iface.RefreshScrollTopInterface import org.mariotaku.twidere.fragment.iface.SupportFragmentCallback import org.mariotaku.twidere.model.SupportTabSpec diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt index d2bd29e6a..69a53652e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt @@ -57,8 +57,7 @@ class VariousItemsAdapter( } VIEW_TYPE_HASHTAG -> { val view = inflater.inflate(R.layout.list_item_two_line_small, parent, false) - val holder = HashtagViewHolder(view, hashtagClickListener) - return holder + return HashtagViewHolder(view, hashtagClickListener) } } throw UnsupportedOperationException() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt index 930b3e128..0210500a7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt @@ -38,7 +38,7 @@ fun Account.getCredentials(am: AccountManager): Credentials { if (token != null) return@run token } return@run null - } ?: throw NullPointerException("AuthToken is null for ${this}") + } ?: throw NullPointerException("AuthToken is null for $this") return parseCredentials(authToken, getCredentialsType(am)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt index ae6d81f37..156207d38 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt @@ -10,7 +10,6 @@ import androidx.appcompat.app.AlertDialog import android.view.View import android.view.ViewGroup import android.widget.* -import com.bumptech.glide.Glide import com.rengwuxian.materialedittext.MaterialEditText import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.ArrayAdapter diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt index 55cc8e1e4..4e07878cf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt @@ -272,7 +272,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment if (orig.account_key == status.account_key && TextUtils.equals(orig.id, status.retweet_id)) { orig.my_retweet_id = status.my_retweet_id diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt index ba8754e7f..28b3ca859 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt @@ -24,7 +24,6 @@ import android.os.Bundle import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.app.hasRunningLoadersSafe import androidx.loader.content.Loader -import androidx.recyclerview.widget.RecyclerView import android.view.KeyEvent import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_recyclerview.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt index 4d6e20150..5d5e27688 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -50,7 +50,6 @@ import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.activity.ColorPickerDialogActivity import org.mariotaku.twidere.activity.ThemedMediaPickerActivity import org.mariotaku.twidere.annotation.AccountType -import org.mariotaku.twidere.annotation.ImageShapeStyle import org.mariotaku.twidere.extension.loadProfileBanner import org.mariotaku.twidere.extension.loadProfileImage import org.mariotaku.twidere.extension.model.api.mastodon.toParcelable diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt index d828c5251..2932aaf14 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt @@ -24,7 +24,6 @@ import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri -import android.os.Bundle import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt index 36ea0e0d5..d8e3e18d6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt @@ -21,7 +21,6 @@ package org.mariotaku.twidere.fragment.status import android.app.Dialog import android.os.Bundle -import android.os.Parcel import android.os.Parcelable import androidx.appcompat.app.AlertDialog import kotlinx.android.parcel.Parcelize diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt index 761bbe6c9..b128d8134 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt @@ -8,14 +8,12 @@ import android.database.Cursor import android.graphics.BitmapFactory import android.net.Uri import android.os.ParcelFileDescriptor -import okio.ByteString import okio.ByteString.Companion.decodeBase64 import okio.ByteString.Companion.encodeUtf8 import org.mariotaku.mediaviewer.library.FileCache import org.mariotaku.twidere.TwidereConstants.AUTHORITY_TWIDERE_CACHE import org.mariotaku.twidere.TwidereConstants.QUERY_PARAM_TYPE import org.mariotaku.twidere.annotation.CacheFileType -import org.mariotaku.twidere.extension.get import org.mariotaku.twidere.model.CacheMetadata import org.mariotaku.twidere.task.SaveFileTask import org.mariotaku.twidere.util.JsonSerializer diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/AbsFriendshipOperationTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/AbsFriendshipOperationTask.kt index c25c1ab23..b477fdbb3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/AbsFriendshipOperationTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/AbsFriendshipOperationTask.kt @@ -38,10 +38,9 @@ abstract class AbsFriendshipOperationTask( val event = FriendshipTaskEvent(action, params.accountKey, params.userKey) event.isFinished = true if (result != null) { - val user = result - showSucceededMessage(params, user) + showSucceededMessage(params, result) event.isSucceeded = true - event.user = user + event.user = result } else if (exception != null) { showErrorMessage(params, exception) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/DestroyFavoriteTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/DestroyFavoriteTask.kt index 70913f5d3..ff997f341 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/DestroyFavoriteTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/DestroyFavoriteTask.kt @@ -72,8 +72,7 @@ class DestroyFavoriteTask( val taskEvent = FavoriteTaskEvent(FavoriteTaskEvent.Action.DESTROY, accountKey, statusId) taskEvent.isFinished = true if (result != null) { - val status = result - taskEvent.status = status + taskEvent.status = result taskEvent.isSucceeded = true Toast.makeText(context, R.string.message_toast_status_unfavorited, Toast.LENGTH_SHORT).show() } else { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveFileTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveFileTask.kt index 3a5c80b3a..8b572b280 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveFileTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveFileTask.kt @@ -54,7 +54,7 @@ abstract class SaveFileTask( override fun onPostExecute(result: SaveFileResult?) { dismissProgress() - if (result != null && result.savedFile != null) { + if (result?.savedFile != null) { onFileSaved(result.savedFile!!, result.mimeType) } else { onFileSaveFailed() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt index 3e9dd431f..bb8be2bfa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt @@ -146,9 +146,8 @@ class GetMessagesTask( val sincePagination = param.pagination?.elementAtOrNull(accountsCount + index) as? SinceMaxPagination val firstFetch by lazy { - val noConversationsBefore = context.contentResolver.queryCount(Conversations.CONTENT_URI, + return@lazy context.contentResolver.queryCount(Conversations.CONTENT_URI, Expression.equalsArgs(Conversations.ACCOUNT_KEY).sql, arrayOf(accountKey.toString())) <= 0 - return@lazy noConversationsBefore } val updateLastRead = param.hasMaxIds || firstFetch diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt index d0db5a3fa..e0a6e0af7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt @@ -408,8 +408,7 @@ object ThemeUtils { if (icon != null && item.groupId !in excludedGroups) { icon.mutate() if (info is TwidereMenuInfo) { - val sInfo = info - val stateColor = if (sInfo.isHighlight) sInfo.getHighlightColor(highlightColor) else color + val stateColor = if (info.isHighlight) info.getHighlightColor(highlightColor) else color if (stateColor != 0) { icon.setColorFilter(stateColor, mode) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt index 75a8e8e60..688b6adc5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt @@ -513,7 +513,7 @@ object Utils { } internal fun isExtensionUseJSON(info: ResolveInfo?): Boolean { - if (info == null || info.activityInfo == null) return false + if (info?.activityInfo == null) return false val activityInfo = info.activityInfo if (activityInfo.metaData != null && activityInfo.metaData.containsKey(METADATA_KEY_EXTENSION_USE_JSON)) return activityInfo.metaData.getBoolean(METADATA_KEY_EXTENSION_USE_JSON) @@ -606,7 +606,7 @@ object Utils { fun copyStream(input: InputStream, output: OutputStream, length: Int) { val buffer = ByteArray(1024) - var bytesRead: Int = 0 + var bytesRead = 0 do { val read = input.read(buffer) if (read == -1) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt index 1e944736f..1dbd44c13 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt @@ -21,7 +21,6 @@ package org.mariotaku.twidere.util.cache import android.net.Uri import com.bumptech.glide.disklrucache.DiskLruCache -import okio.ByteString import okio.ByteString.Companion.encode import org.mariotaku.mediaviewer.library.FileCache import org.mariotaku.twidere.BuildConfig @@ -65,7 +64,7 @@ class DiskLRUFileCache(val cacheDir: File) : FileCache { try { editor.getFile(0).outputStream().use { - var bytesCopied: Int = 0 + var bytesCopied = 0 val buffer = ByteArray(8192) var bytes = stream.read(buffer) while (bytes >= 0) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/AuthenticatedUriLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/AuthenticatedUriLoader.kt index 0a93a1fbf..ce1ea31f0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/AuthenticatedUriLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/AuthenticatedUriLoader.kt @@ -24,7 +24,6 @@ import android.content.Context import android.net.Uri import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher import com.bumptech.glide.load.Options -import com.bumptech.glide.load.data.DataFetcher import com.bumptech.glide.load.model.* import com.bumptech.glide.load.model.ModelLoader.LoadData import com.bumptech.glide.signature.ObjectKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/NoThumborUrlLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/NoThumborUrlLoader.kt index a5998598d..87b16ad47 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/NoThumborUrlLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/NoThumborUrlLoader.kt @@ -22,7 +22,6 @@ package org.mariotaku.twidere.util.glide import android.content.Context import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher import com.bumptech.glide.load.Options -import com.bumptech.glide.load.data.DataFetcher import com.bumptech.glide.load.model.* import com.bumptech.glide.signature.ObjectKey import okhttp3.OkHttpClient diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt index 88122b3e4..3f8d6f983 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt @@ -27,7 +27,6 @@ import com.bumptech.glide.Registry import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.module.AppGlideModule -import com.bumptech.glide.module.GlideModule import okhttp3.OkHttpClient import okhttp3.Request import org.mariotaku.twidere.model.media.AuthenticatedUri diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/JobSchedulerAutoRefreshController.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/JobSchedulerAutoRefreshController.kt index fb38ac44c..ada0d9e15 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/JobSchedulerAutoRefreshController.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/JobSchedulerAutoRefreshController.kt @@ -13,7 +13,6 @@ import org.mariotaku.twidere.service.JobTaskService import org.mariotaku.twidere.service.JobTaskService.Companion.JOB_ID_REFRESH_FILTERS_SUBSCRIPTIONS import org.mariotaku.twidere.service.JobTaskService.Companion.JOB_ID_REFRESH_LAUNCH_PRESENTATIONS import java.util.concurrent.TimeUnit -import android.Manifest.permission as AndroidPermissions /** * Created by mariotaku on 2016/12/17. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt index 2d8f9515b..52ab6d9eb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt @@ -24,7 +24,6 @@ import android.net.Uri import androidx.collection.ArrayMap import nl.komponents.kovenant.Promise import nl.komponents.kovenant.then -import okio.ByteString import okio.ByteString.Companion.encodeUtf8 import org.mariotaku.twidere.TwidereConstants.TIMELINE_SYNC_CACHE_PREFERENCES_NAME import org.mariotaku.twidere.annotation.ReadPositionTag diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/twitter/card/TwitterCardViewFactory.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/twitter/card/TwitterCardViewFactory.kt index 87ef105d3..e0cd9880e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/twitter/card/TwitterCardViewFactory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/twitter/card/TwitterCardViewFactory.kt @@ -52,7 +52,7 @@ abstract class TwitterCardViewFactory { private fun createCardFragment(status: ParcelableStatus): ContainerView.ViewController? { val card = status.card - if (card == null || card.name == null) return null + if (card?.name == null) return null if (TwitterCardUtils.CARD_NAME_PLAYER == card.name) { return createGenericPlayerFragment(card) } else if (TwitterCardUtils.CARD_NAME_AUDIO == card.name) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewAnimator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewAnimator.kt index 8e6c123e9..8f9d767f5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewAnimator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewAnimator.kt @@ -62,8 +62,7 @@ class ViewAnimator { animator.end() } } - val newView = view - currentInAnimator = managedViews[newView]?.inAnimator?.also { animator -> + currentInAnimator = managedViews[view]?.inAnimator?.also { animator -> animator.addListener(object : SimpleAnimatorListener() { override fun onAnimationEnd(animation: Animator) { animator.removeListener(this) @@ -74,7 +73,7 @@ class ViewAnimator { } override fun onAnimationStart(animation: Animator) { - newView?.visibility = View.VISIBLE + view?.visibility = View.VISIBLE } }) if (animate) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/MediaViewPager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/MediaViewPager.kt index bfaad2b61..3bc18504f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/MediaViewPager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/MediaViewPager.kt @@ -21,8 +21,5 @@ package org.mariotaku.twidere.view import android.content.Context import android.util.AttributeSet -import android.view.View -class MediaViewPager(context: Context, attrs: AttributeSet? = null) : ExtendedViewPager(context, attrs) { - -} \ No newline at end of file +class MediaViewPager(context: Context, attrs: AttributeSet? = null) : ExtendedViewPager(context, attrs) \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt index a2990d7f1..70bac3b0d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt @@ -31,7 +31,6 @@ import org.mariotaku.twidere.R import org.mariotaku.twidere.adapter.MediaPreviewAdapter import org.mariotaku.twidere.model.ParcelableMedia import org.mariotaku.twidere.model.ParcelableMediaUpdate -import java.lang.Exception class MediaPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnLongClickListener, View.OnClickListener { From 7e7647f7a817f0546acc48ba26f4a16238f7404e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Mon, 1 Jun 2020 01:28:27 -0400 Subject: [PATCH 24/24] Revert drawerlayout update --- twidere/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index cf2112520..7fce8ac33 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -203,7 +203,7 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core:1.2.0' implementation 'androidx.core:core-ktx:1.2.0' - implementation 'androidx.drawerlayout:drawerlayout:1.1.0-rc01' + implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01' implementation 'androidx.exifinterface:exifinterface:1.2.0' implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation 'androidx.multidex:multidex:2.0.1'