From 1e5e067df7e80ce0e03ddeab1da9578cddae8958 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Sat, 21 Sep 2013 19:28:53 +0100
Subject: [PATCH] Removed ratings from the Android UI.
---
.../res/drawable-hdpi/rating_bad.png | Bin 1541 -> 0 bytes
.../res/drawable-hdpi/rating_good.png | Bin 1524 -> 0 bytes
.../res/drawable-hdpi/rating_unrated.png | Bin 297 -> 0 bytes
.../res/drawable-mdpi/rating_bad.png | Bin 1293 -> 0 bytes
.../res/drawable-mdpi/rating_good.png | Bin 1290 -> 0 bytes
.../res/drawable-mdpi/rating_unrated.png | Bin 150 -> 0 bytes
.../res/drawable-xhdpi/rating_bad.png | Bin 1725 -> 0 bytes
.../res/drawable-xhdpi/rating_good.png | Bin 1705 -> 0 bytes
.../res/drawable-xhdpi/rating_unrated.png | Bin 211 -> 0 bytes
.../briar/android/groups/GroupActivity.java | 5 -
.../sf/briar/android/groups/GroupAdapter.java | 14 +--
.../android/groups/ReadGroupPostActivity.java | 90 +-----------------
.../messages/ConversationActivity.java | 1 -
.../android/messages/ConversationAdapter.java | 14 +--
.../messages/ReadPrivateMessageActivity.java | 18 +---
15 files changed, 9 insertions(+), 133 deletions(-)
delete mode 100644 briar-android/res/drawable-hdpi/rating_bad.png
delete mode 100644 briar-android/res/drawable-hdpi/rating_good.png
delete mode 100644 briar-android/res/drawable-hdpi/rating_unrated.png
delete mode 100644 briar-android/res/drawable-mdpi/rating_bad.png
delete mode 100644 briar-android/res/drawable-mdpi/rating_good.png
delete mode 100644 briar-android/res/drawable-mdpi/rating_unrated.png
delete mode 100644 briar-android/res/drawable-xhdpi/rating_bad.png
delete mode 100644 briar-android/res/drawable-xhdpi/rating_good.png
delete mode 100644 briar-android/res/drawable-xhdpi/rating_unrated.png
diff --git a/briar-android/res/drawable-hdpi/rating_bad.png b/briar-android/res/drawable-hdpi/rating_bad.png
deleted file mode 100644
index 4d332cc92e47bbaaa094105944721a7400b6abe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1541
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip$iURV+|k6;$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1P0rUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfW
zG!Lpb1-Dy_aq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zZhD#G$iTo<?&;zf
zQgQ3e%+ub{jv~iog?+b#=q_yv^L~9Uc504RREBHJ)zI)qoBmJMe!D3n_9r_>&;{Qb
z?X71QDQ*24Sd*RXJExBMe(S?Y6MXhO_ATK1BNjJl_UE&Y&y>3<E?u+g$%=KWJ`^y`
zVNgH7S-|vedqc)Xc^?&_opSc9YabYPG!_@}=pE#=&{f@-VkEhyLFS{-9`^npa*Uf)
z4j=h`Q0@j}^dD>CQ#?N&F-kC=eZb}MwzkWnf@5AI#}2mogN#4e!W_EJI|~MIznb}{
z_uHNKJbN#S{pl0B!g#MC{t3sDpO&W8w;x#lNcVQ&mN+xHVBdr%ZHx6Zp0RRwUTBeP
zGTe~k?7;hj!D?ru_t!_0oc?%waIRoJ-z}OD<u<>;te~*_33ux)<KAuO8l9)PC2rip
zJ$Y*4rWUCK+1IM07wgXqp3KY0oY3*wEV?sn(cIU@*_A(2eEjl-8M|#lbAPL679E(W
zvYElmg4;~_w3he}xfkr~nPQxpm|wU@_RTkAG1<(tl-a|^ZS?}TU;KApbF%(n%Qj<K
z@$|Cq<g&FlneS?yP^$Ak`(RDcnUWRLw->HZV|sQ_@<sC8zRx)yraAdG+KMKZ{^Xc;
zXw&7_Du+_`zCV6bp6B@t&hz*GFg%v|df_+Y`ofQ==H9B<?GyH^#<#^gZPS%^XTsc{
z^~>#h?^RtstMh!@Jz?>V?F+)QoffSzSo|P+=Y6jgZU1Cvi>}Ol#d-TAyXt~&C8MaV
zk*vj2i}bIo`pO<S?bdlQ-SP)aE$_pUZXMy8(%hiD&;9BzUxVOve;xMyIJ8<Im2+9s
zz8$-|jaH>S5YBadwa(h;;Xm(}EEbG@4Z;tAl;W{^MmC1H^yyz!{{(#i70jNlelF{r
G5}E*M9zu)&
diff --git a/briar-android/res/drawable-hdpi/rating_good.png b/briar-android/res/drawable-hdpi/rating_good.png
deleted file mode 100644
index f612bab60e2553211c7c55a836ccac63fc44951d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1524
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip$kol+%*4pl$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1PCvUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfV
zG!Lpb1-Dxaaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zemt{l3IhXEnx~6n
zNX4x;Gf#U*JBl3hUGLeu%yWuat;Da0DO!`fa>b4+vHovxT6lFT_uuuq-ffe9xoT}$
zqN_Qh_{Mdtw--$N!4&`X*vs+<+&qe$_fF4M5r2Mwzi4vx`!nXn&*m6U?g(0?eWq-&
z_LDT$2*$7m(FE3*e8#)sdkyEGXTSL_yMU#uH%~)^>mV1$g?UYq8`$fb{~GL^z;mPe
z0=HaK=Z3Y7o(3#_2UTD2Pj1ku;EsuNZ{X@?c=?9Cz*|^hu70cQ0gDR0b6d9tuw^F-
z81O86`MGPe;@i4~9oL>P&i}^d(<pbgH0go*kBgUFo?V>uW{1ieud|1yp4Zkre?;z$
z;S6Sf3B7FP-kAH$w;%M}-&wNJYd7m2hRt&tCtK~;R@(g8FIwDPq}btmRQ}Y4ytGis
zQq5^`jPBiLy=NY77Cig(NwLV21L_;3wluKR{<3q|W4-ji%=O5P!tY$~gLo&+I9=xE
z!*OC`UuUp`ZaSl?jbux#u-=qZW_8CY48Aehk~*_IQfhM!ED3#Kr|-+rk=1=}N~iWc
z)?_snm6t_o{K2y44uvhBA{6&}Q}PE{otXj!2MojwO}MXeY<Zx%sIpM;`i9>c&!#a3
zKmD?Be$>&!FTNK}{(n70cgx9@vI$#O^xaw-R;V?9?)3Eijq4vAn$i&eK)GT`>t(sT
zGx8HGtb;Ry^sWdin7x1AakRUETh2vP`U!{Sdr8*w2V}cCgM8L1EG_+~cK36<^>=2a
zyyg?u#%luDXU;H+k}K?ZRBZjg*g3;JCnIK_*_16TGm?(ZO4~X!;e^iTefImp_y3)K
oiE9JX8V2nHK<ZY;e^v>Grn3`LT`nEl2P%g>UHx3vIVCg!0Gih^kN^Mx
diff --git a/briar-android/res/drawable-hdpi/rating_unrated.png b/briar-android/res/drawable-hdpi/rating_unrated.png
deleted file mode 100644
index 6b289165b9ee64f59cfc93f336fb61c648ffc171..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}k3C%+Lo)8Y
zy=0qp*g@pT$Nvu!e7Z#TwN$@!+vnk@vGw5ef<z9s^s`HDa<DI2Z=z_hKX3X?^}V&+
zf>2QJ=<VctIj5m{N$%ZUH|@UG*8kVMzwPa@Z;UsXJa#cIU-$Z5@>f;fpF4l`&l4-v
zeA}SBVSRM^1JMe3%T1F@w(OnW@^<r*lY8Fge@*}NT8d#qtV->b)X0LA6W&_emg{jW
zxDhwyzc2Hu;EHvxSHB8(pC$Y0tNS|R^PvX<?te@9dzJTw-T~<kLA!Te*?aN!|5Ml1
oOJ>fBn)`0nFR1fA-mhhPe=kF3g65S<pm!NOUHx3vIVCg!0K2q>7ytkO
diff --git a/briar-android/res/drawable-mdpi/rating_bad.png b/briar-android/res/drawable-mdpi/rating_bad.png
deleted file mode 100644
index 5c5982ac649369ba8fa4c379c462a0f550ff2903..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1293
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip$iURV+|k0+$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O_pUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1>
zG!Lpb1-Dzwaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zKHEBnnSp_^-qXb~
zq~g|_>3h8oJ4hUp&dt*KvGv6wr}E=Ed`;c=AIyJb|3t}8OV7`WtIv&n?h!|E(OhxS
z=qqN=i$AdR1qJ_(%b8aF(EZZ0qVId+rymLS68*HL(dpbX77NCm+#1Vbc@7&`&SiR?
zFzNf1gVrmW+&?hPb6kDdCQ#%gi^Mk0X$RQrtJ%7m;trVZU^4x1GMiWKDATfoI<|Ss
z&KNUmCA4;L`|)4WV!|~C$(%qJ<J1_QeZ2YY2RS5IiyuiPba=;#<(sFr#N2;>yX2q}
z$EBhl?1qiK4XJJpS_hJ|jxgz2boSQXyy6h~U}L_8*oNvOOj>gc%q|K1pCmN@;l78*
zLY96nH)G;EsC8RwLAtYS&~oKc{<4F)Y0-vn=1j2&)8E5*ZO3KRrY|#OKTLbMdBNHV
zlaiz!7fyJ2gZcO+Kh19zb&O|>ukU)W?PYDe+;O|_l}9(szomC?bwi<n<N5gq0{6#z
zOp?05y7T_p{r?xU#U14A{$RA)T<Lu63=2j-hkHzQED{VG`@;-wyq^04R6u#U`njxg
HN@xNA(D}({
diff --git a/briar-android/res/drawable-mdpi/rating_good.png b/briar-android/res/drawable-mdpi/rating_good.png
deleted file mode 100644
index 16fce26e1c2e484a855638960cca2ddebb93f115..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1290
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip$kol+%*4#p$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1POzUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1=
zG!Lpb1-DyFaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z=1+a=!@$5;<LTlU
zQgQ3e^u6AP14NDrn||Fac7*?mE4#a_3142H)ypN_9sj5OZ|ZJVc%{OjmsVORc;w_l
ztt+#(Z98B5kVEmpzF%=3)5;&3?@`%nyYu_J=vUfH_b4SF(6*SvpuV7h(RpuPTjG!V
zHSQ0DV^s9r0;hPhUOT9FgK_Gf=m56%1t*I&^BJoX<W5A@vddR;-C()BfU%~4H)<x&
zLbaN2HS?b{+-cr@Cgy^&+QCkV*8F>EdW8pAUNp=<;*+A4z$(+M8sHz3zd<xwM4&mp
zfK|?iRY!Q{E6EKfiYNT~v|l2H)h4QNMtU+M`<L=F#qG@3a!-ido+$GveYRM~{_Ho)
zGq2?4L~Po!A|&Ooo5KN>WoDw{cW!WW%sdg&Q1kCv8e3G2+tL^1$4yGlzh<#%(&Q5C
z?rjp}OP#&$#kB9Db6&Lts6Xi0|JKgdmiO8Ltr@Jzd#0~DXHl_`W3}%Jq5Kc5s~&L9
zX|~i`#;Ui{h}E<7-htHk=12c#STOoITx6<am0-BMHB?i?Ot}P9I(fSKxvX<aXaWGB
C9l;*}
diff --git a/briar-android/res/drawable-mdpi/rating_unrated.png b/briar-android/res/drawable-mdpi/rating_unrated.png
deleted file mode 100644
index 19521e83c158602004663dc8030d8b31788d5ee0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}0iG_7ArXh)
zo?FP<;K1W>(Z6VtuV0yZThekbGt15c4owdQVw!&XZ~ZCC>N)Al=9ii-F09jvV~vZY
xZ|X1o9K-nR+}-Q{ejVW3a@%H?_aqetzDc(wxEyw!VFsGb;OXk;vd$@?2>^2>H8=nO
diff --git a/briar-android/res/drawable-xhdpi/rating_bad.png b/briar-android/res/drawable-xhdpi/rating_bad.png
deleted file mode 100644
index a8ad06ad9926fb4948f790f4699b1dd740c47d4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1725
zcmaJ?4NMbf7(NOWtb!uU4V3LD14P!|U1_Q9TA`(&1&aKMpc$dGCsb^&KL;%!SWpxZ
zL|BH1L@>hykU7BkHxUR+@TZ`aP2*+|=MPjNXb^Ql#a$8Dl8s$*_kHi1_j%s;{od!x
z9f*$F;7D<&007`9-YAMC)?n-Fu!#6JD>V0s#SITl#N)8-xL&G70f8J#MM1Grnuf-r
zQhB!K8p;Cz+b<RIiFl$Uk}JcMbg4ClZcwTTGyw2|3~H$?1I58qG)<x6Q=ebzqJj!J
zpSp!5fhFn?G+nVVM~lYgM8(T;GGrV%HE2D^GjIt4C5lTygL0=z$2IV&GrU}4Z*@ad
za3%!L;8Q;ql_-e@Loh80vgj~P1_vTwAd`+TVGfh?707@Q7(y5j%%&kQm&NA72sryt
ziELW=c5bXFY&I8R@u}%JuI56JUazO?1L&AG4MI2^4g@nG27^XK&~(`<Txy`HbY61|
zB2*{SD%7|FQ-M}SX)2b9^QlCoA6rnW=V?{C*<&IO3^GX75JHEoEzJc=B>x|(RL)21
z@L2TkdjFGH7oV+0p;%OhWol)_;I?~NQ>nQjT2zW-+IS4xId_WD=@^db(lIp{633z=
zphPNDsH~nDghav>t8}<jB}2s`K9%60D-?1r6Imx@u>v_PAuK|WP=v!oIH62oh#-uG
zu$e++4lBZBnMzcJ&tc_%V+9LhtzuBBiOeEYtH?s-VOmTH&NR(cEL;nFLB3h6eBoNw
zEr^APVj$~i|1s)07oi{Pc3!xIF)w{oMd)2i2z%|J)s4h`fy5#~yy5q;8dHW#jB78J
z{6opv+p(@+L<^Ra^-0D4p(hIKb8qdw+7+z!qZSvgDW?Av!w$ELalKWtb!}&3bxp$C
z>WlgN^KFlKHnqLH;G%Qd#biE>yaA0I-xAk;rzZbgB`F%91lz0u$n}7$an>;IZq2!T
z|7nvZ-IqyG?%5Fy<P`}mt0tFBEq-qt9#A*jN^co`-mK`^8x`VWUM_!XkfWVp`P2Kh
zIspYQZEC3X-*r$y31D9zu&cvNZs|9}1;sRh$?gRuXYpn4#^XS%y}NPvl0oU}Ay`_{
zQTL5G*<#0(EDtcJHM(8u^k#0e1Ef9XvRa2~ukb$KM;+sox+NYd2hF|~icPi+++!ZP
z2}hY)bbQUZf#LTmc~9QBOLw*f4k~+6dZ@YVJ+7>{a?|8|*T&=V#mU>ziB<P9lQ@6$
zvteFd4Lb3P^uUXGtS7UQ)Ht<{w8tFd<2&ls-M9?6Qm-3(MjE1BF85OJb-R21rH}YS
zg<ZGL%@fb3UJTkBKkc&(ZSA%<j+$M31VbZ3Cg;N|alLbvdo8H@k>q;<Nhs)8P5U~x
zs4`$#-=6?n`}0Gpd&Mc<h$O0n<`lkpef~3BBW`@lC<N=YWd}bwI+?5+Q%>k<PRS=5
zY!g=iZ!VBasGj(1(qN<}g99CS<%!>GIc;M2pBDpHr^iVfq>9k<6aD3!ku$=~drhHB
ze$6ls@>WC)Xbd%sC{9anl{e#5UD3IBCzB&Kc}5JJGJoF@zOlx?tzHs0QM5U=04{X$
zgdUBpva}}+Ivq>4YfU)&*`X(k-b_~pjR&(i+p0e}8cX{^l(nl;u9}2rq`ag%fR95;
zlcfFIv3%#8k=)Ab*X3QiOT7Df$Nl>IyoYY2IX*D#SGDzip4#jnlP3TT4IVpwIqAqS
zZCWWWy|J`A%cm30g07L-k@^qoM-{-6Ky*|4be`p?-(i#tmY(f;_%7E{<yVc8Q>vuN
znth&%tl=qgH_zj=X3^oWkv6}2^fw27iltoL?*I5m#biY6zw`=_&E>B*7;S*kCQ3%+
S9??<j4@DdrB|0rkDf|oNt&5)k
diff --git a/briar-android/res/drawable-xhdpi/rating_good.png b/briar-android/res/drawable-xhdpi/rating_good.png
deleted file mode 100644
index 225eaea5f258984ccc6d015598dc431e9af8978a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1705
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Gk*k}tnX#*>lYxt&p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaLa!T6y`aR9TL84#CABECEH%ZgC_h&L>}jh^tZp$g
zG6T8;r+HAlDOlYC){EO8`as9%gQ6BGs$oLF^aEnT6E2VgPx`5O!1P`OOxVq(W~#va
zBJJto7*cWT&FtIR!hr(ECg%z1uid7>*;T&h0jrCFM#rxO{JKp_FPg<`F4w#N39k_l
z`N-7tLx4q8#4%t^xJgz>*5=(OfAQ9JpH`eU<L=v=Y3UD=XP-5j^K-6cahjipAxD$b
zyxb)dih~)r92hkiSQjveG%y8#I8QEnHUCTA8|Po0BYZ*R3-2!0%3|9)879xf9ZrR{
zoO5h{v4i{WxywQ~)E(Js)f<v8WW+J(EI;hJ@7;x;Q!5z@m~Nfez_06(y(W@*gS1tS
zg?!&;>o*K4XZ#&S4@XKq=6~^c1G5EJZo{o(e~rE@IsSJc(+1XAZ#G^(ZFV<F)?mxj
z2Wl^bwjAO3t5nKcHG8L*f#T%7|7=#<8Gj6o_;cq(il)qEF-P@<$}-I__Z&V_ZoYZ1
z1J7iaa>iR;$N$#roE0+-Vff~pF8OJ5v5or91WiTX&5B%S`$IaoxekbYuUy`*tE*G5
z|LMKo5~V*b4)F`szA#kH4P}^gH2Xr~3kKPb|B9zeB|7!IlX_UK8rB!SKztj+6ieeG
z+2j{}&Z`&ZUf{d;nN1^|`Eiti-Qm>FCYj6*qE^n!YtLPh`2M-DZI}Pn;2tA=zvU9_
z2jpHTe9<=YW=ucvdgIomGfzaDF|27#dv@_++%p5sxb1;l;k{ckPv3KRpTnS$%Fyse
zt9s#OGX@LEmny0U-)&+{aE)4S!hA)_c-ypw+~OM%ceg)mdHYp=@^{Hy!ppOJgc;8s
zy1zI(dg1+tGaYZUG2Az5(9=F(T6j1kpjelgWBS82x(x9;Od6YG>$qw+l*$>LWjpbH
zbGLWV+wRNf7p^wrcad}EUs!slugN3C^3R*1CCT1gZml!_rv=TuvOsNf!Aw85>4!9K
zKMc*8QReje=NxIxc})_@es3)HPjL_`s-CiJl6>5!t#br()H>egEIOr=a46^AL(><@
zZ+FMk&1AUH|F=ahP?c#ye$$hZ9mj;{ayCWDFkUp(vg<Um)SCXDbDpjWL)zO9^L8Dt
zR%}RZwO{TT+E&rqSKYHh?e@L!&a{xfM?KE@q9#mWDxKi}TlWCNJf~$FxL7+9L6wK6
LtDnm{r-UW|%Q$@h
diff --git a/briar-android/res/drawable-xhdpi/rating_unrated.png b/briar-android/res/drawable-xhdpi/rating_unrated.png
deleted file mode 100644
index 992827ce7f8095cc7fca8c638126832a043f74c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|dOcknLn>~)
zy|Oox*-@nRqW}KJ-v)XK!OPc0ndUGas<oJ~p-`#kW`SsLiJuv>c$;;9I8YY|*z7wy
z>w<}|{MGEQwYzVH&i`yP-|fWz?eUR!qQAz)=0A7dy4J7x$$PyALAAPa1(F*7(|^CQ
zPI${AvwHebei`;t_hS$2{1vIUu<;YbyaSVevTj>u)YaU>aUCS$>FVdQ&MBb@0Q^Hx
A+5i9m
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
index 49c125ef43..7819438028 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
@@ -29,7 +29,6 @@ import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.GroupMessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
-import net.sf.briar.api.db.event.RatingChangedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
@@ -197,9 +196,6 @@ OnClickListener, OnItemClickListener {
} else if(e instanceof MessageExpiredEvent) {
if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading");
loadHeaders();
- } else if(e instanceof RatingChangedEvent) {
- if(LOG.isLoggable(INFO)) LOG.info("Rating changed, reloading");
- loadHeaders();
} else if(e instanceof SubscriptionRemovedEvent) {
SubscriptionRemovedEvent s = (SubscriptionRemovedEvent) e;
if(s.getGroup().getId().equals(groupId)) {
@@ -234,7 +230,6 @@ OnClickListener, OnItemClickListener {
if(author != null) {
i.putExtra("net.sf.briar.AUTHOR_ID", author.getId().getBytes());
i.putExtra("net.sf.briar.AUTHOR_NAME", author.getName());
- i.putExtra("net.sf.briar.RATING", item.getRating().toString());
}
i.putExtra("net.sf.briar.CONTENT_TYPE", item.getContentType());
i.putExtra("net.sf.briar.TIMESTAMP", item.getTimestamp());
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
index 7f2cd71ab1..4fa1e1af53 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -6,8 +6,6 @@ import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
import java.util.ArrayList;
@@ -15,7 +13,6 @@ import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.Author;
import net.sf.briar.api.db.GroupMessageHeader;
-import net.sf.briar.api.messaging.Rating;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;
@@ -49,24 +46,17 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
innerLayout.setLayoutParams(WRAP_WRAP_1);
innerLayout.setOrientation(VERTICAL);
+ // FIXME: Can this layout be removed?
LinearLayout authorLayout = new LinearLayout(ctx);
authorLayout.setOrientation(HORIZONTAL);
authorLayout.setGravity(CENTER_VERTICAL);
- ImageView thumb = new ImageView(ctx);
- thumb.setPadding(5, 5, 5, 5);
- Rating rating = item.getRating();
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- authorLayout.addView(thumb);
-
TextView name = new TextView(ctx);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
Author author = item.getAuthor();
if(author == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
index 8ce4f8a4c4..2f62722418 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
@@ -10,9 +10,6 @@ import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
-import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -21,7 +18,6 @@ import java.util.logging.Logger;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.HorizontalSpace;
-import net.sf.briar.api.AuthorId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
@@ -29,7 +25,6 @@ import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.Rating;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -38,7 +33,6 @@ import android.text.format.DateUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
-import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -56,11 +50,8 @@ implements OnClickListener {
Logger.getLogger(ReadGroupPostActivity.class.getName());
private GroupId groupId = null;
- private Rating rating = UNRATED;
private boolean read;
- private ImageView thumb = null;
- private ImageButton goodButton = null, badButton = null, readButton = null;
- private ImageButton prevButton = null, nextButton = null;
+ private ImageButton readButton = null, prevButton = null, nextButton = null;
private ImageButton replyButton = null;
private TextView content = null;
@@ -69,7 +60,6 @@ implements OnClickListener {
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
@Inject private volatile LifecycleManager lifecycleManager;
private volatile MessageId messageId = null;
- private volatile AuthorId authorId = null;
@Override
public void onCreate(Bundle state) {
@@ -85,15 +75,7 @@ implements OnClickListener {
b = i.getByteArrayExtra("net.sf.briar.MESSAGE_ID");
if(b == null) throw new IllegalStateException();
messageId = new MessageId(b);
- String authorName = null;
- b = i.getByteArrayExtra("net.sf.briar.AUTHOR_ID");
- if(b != null) {
- authorId = new AuthorId(b);
- authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
- if(authorName == null) throw new IllegalStateException();
- String r = i.getStringExtra("net.sf.briar.RATING");
- if(r != null) rating = Rating.valueOf(r);
- }
+ String authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
String contentType = i.getStringExtra("net.sf.briar.CONTENT_TYPE");
if(contentType == null) throw new IllegalStateException();
long timestamp = i.getLongExtra("net.sf.briar.TIMESTAMP", -1);
@@ -124,19 +106,12 @@ implements OnClickListener {
header.setOrientation(HORIZONTAL);
header.setGravity(CENTER_VERTICAL);
- thumb = new ImageView(this);
- thumb.setPadding(5, 5, 5, 5);
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- header.addView(thumb);
-
TextView name = new TextView(this);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
if(authorName == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
name.setText(R.string.anonymous);
@@ -170,23 +145,6 @@ implements OnClickListener {
footer.setOrientation(HORIZONTAL);
footer.setGravity(CENTER);
- goodButton = new ImageButton(this);
- goodButton.setBackgroundResource(0);
- goodButton.setImageResource(R.drawable.rating_good);
- if(authorName == null) goodButton.setEnabled(false);
- else goodButton.setOnClickListener(this);
- footer.addView(goodButton);
- footer.addView(new HorizontalSpace(this));
-
- badButton = new ImageButton(this);
- badButton.setBackgroundResource(0);
- badButton.setImageResource(R.drawable.rating_bad);
- badButton.setOnClickListener(this);
- if(authorName == null) badButton.setEnabled(false);
- else badButton.setOnClickListener(this);
- footer.addView(badButton);
- footer.addView(new HorizontalSpace(this));
-
readButton = new ImageButton(this);
readButton.setBackgroundResource(0);
if(read) readButton.setImageResource(R.drawable.content_unread);
@@ -296,13 +254,7 @@ implements OnClickListener {
}
public void onClick(View view) {
- if(view == goodButton) {
- if(rating == BAD) setRatingInDatabase(UNRATED);
- else if(rating == UNRATED) setRatingInDatabase(GOOD);
- } else if(view == badButton) {
- if(rating == GOOD) setRatingInDatabase(UNRATED);
- else if(rating == UNRATED) setRatingInDatabase(BAD);
- } else if(view == readButton) {
+ if(view == readButton) {
setReadInDatabase(!read);
} else if(view == prevButton) {
setResult(RESULT_PREV);
@@ -319,38 +271,4 @@ implements OnClickListener {
finish();
}
}
-
- private void setRatingInDatabase(final Rating r) {
- dbUiExecutor.execute(new Runnable() {
- public void run() {
- try {
- lifecycleManager.waitForDatabase();
- long now = System.currentTimeMillis();
- db.setRating(authorId, r);
- long duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO))
- LOG.info("Setting rating took " + duration + " ms");
- setRatingInUi(r);
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(InterruptedException e) {
- if(LOG.isLoggable(INFO))
- LOG.info("Interrupted while waiting for database");
- Thread.currentThread().interrupt();
- }
- }
- });
- }
-
- private void setRatingInUi(final Rating r) {
- runOnUiThread(new Runnable() {
- public void run() {
- rating = r;
- if(r == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(r == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- }
- });
- }
}
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
index 2f3ffeaeb7..5d023014fa 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
@@ -230,7 +230,6 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
i.putExtra("net.sf.briar.CONTACT_ID", contactId.getInt());
i.putExtra("net.sf.briar.CONTACT_NAME", contactName);
i.putExtra("net.sf.briar.AUTHOR_NAME", item.getAuthor().getName());
- i.putExtra("net.sf.briar.RATING", item.getRating().toString());
i.putExtra("net.sf.briar.MESSAGE_ID", item.getId().getBytes());
i.putExtra("net.sf.briar.CONTENT_TYPE", item.getContentType());
i.putExtra("net.sf.briar.TIMESTAMP", item.getTimestamp());
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
index 17207065de..52be9afbf2 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
@@ -6,15 +6,12 @@ import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
import java.util.ArrayList;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.db.PrivateMessageHeader;
-import net.sf.briar.api.messaging.Rating;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;
@@ -49,24 +46,17 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
innerLayout.setLayoutParams(WRAP_WRAP_1);
innerLayout.setOrientation(VERTICAL);
+ // FIXME: Can this layout be removed?
LinearLayout authorLayout = new LinearLayout(ctx);
authorLayout.setOrientation(HORIZONTAL);
authorLayout.setGravity(CENTER_VERTICAL);
- ImageView thumb = new ImageView(ctx);
- thumb.setPadding(5, 5, 5, 5);
- Rating rating = item.getRating();
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- authorLayout.addView(thumb);
-
TextView name = new TextView(ctx);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
name.setText(item.getAuthor().getName());
authorLayout.addView(name);
innerLayout.addView(authorLayout);
diff --git a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
index c86cbc7267..4aa8c5ffa9 100644
--- a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
@@ -10,9 +10,6 @@ import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
-import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -28,7 +25,6 @@ import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.Rating;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -37,7 +33,6 @@ import android.text.format.DateUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
-import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -55,7 +50,6 @@ implements OnClickListener {
Logger.getLogger(ReadPrivateMessageActivity.class.getName());
private ContactId contactId = null;
- private Rating rating = UNRATED;
private boolean read;
private ImageButton readButton = null, prevButton = null, nextButton = null;
private ImageButton replyButton = null;
@@ -80,9 +74,6 @@ implements OnClickListener {
setTitle(contactName);
String authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
if(authorName == null) throw new IllegalStateException();
- String r = i.getStringExtra("net.sf.briar.RATING");
- if(r == null) throw new IllegalStateException();
- rating = Rating.valueOf(r);
byte[] b = i.getByteArrayExtra("net.sf.briar.MESSAGE_ID");
if(b == null) throw new IllegalStateException();
messageId = new MessageId(b);
@@ -116,19 +107,12 @@ implements OnClickListener {
header.setOrientation(HORIZONTAL);
header.setGravity(CENTER_VERTICAL);
- ImageView thumb = new ImageView(this);
- thumb.setPadding(5, 5, 5, 5);
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- header.addView(thumb);
-
TextView name = new TextView(this);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
name.setText(authorName);
header.addView(name);
--
GitLab