From 484d723c75cb258159c170a814ee2813da32a6bb Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 21 Jun 2017 12:22:38 +0200 Subject: [PATCH] Cleanup chat list: As we encrypt messages, not chats, there is not need for a chat-encrypted state. --- .../main/java/com/b44t/messenger/MrChat.java | 4 --- .../java/com/b44t/ui/Cells/DialogCell.java | 29 +++--------------- .../src/main/res/drawable-hdpi/check_list.png | Bin 689 -> 0 bytes .../src/main/res/drawable-mdpi/check_list.png | Bin 459 -> 0 bytes .../main/res/drawable-xhdpi/check_list.png | Bin 908 -> 0 bytes .../main/res/drawable-xxhdpi/check_list.png | Bin 1148 -> 0 bytes 6 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 MessengerProj/src/main/res/drawable-hdpi/check_list.png delete mode 100644 MessengerProj/src/main/res/drawable-mdpi/check_list.png delete mode 100644 MessengerProj/src/main/res/drawable-xhdpi/check_list.png delete mode 100644 MessengerProj/src/main/res/drawable-xxhdpi/check_list.png diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java index 93cbaa02a..b97221fa2 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java @@ -93,10 +93,6 @@ public class MrChat { /* additional functions that are not 1:1 available in the backend **********************************************************************************************/ - public int isEncrypted() { - return 0; - } - public static TLRPC.Chat chatId2chat(int id) { TLRPC.Chat ret = new TLRPC.Chat(); diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java index edd155f50..11ec09058 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/DialogCell.java @@ -70,7 +70,6 @@ public class DialogCell extends BaseCell { private static Drawable countDrawableGrey; private static Drawable groupDrawable; private static Drawable muteDrawable; - private static Drawable verifiedDrawable; private static Paint linePaint; private static Paint backPaint; @@ -123,8 +122,6 @@ public class DialogCell extends BaseCell { private int countWidth; private StaticLayout countLayout; - private boolean drawVerified; - private int avatarTop = AndroidUtilities.dp(10); private boolean isSelected; @@ -173,7 +170,6 @@ public class DialogCell extends BaseCell { countDrawableGrey = getResources().getDrawable(R.drawable.dialogs_badge2); groupDrawable = getResources().getDrawable(R.drawable.list_group); muteDrawable = getResources().getDrawable(R.drawable.mute_grey); - verifiedDrawable = getResources().getDrawable(R.drawable.check_list); } setBackgroundResource(R.drawable.list_selector); @@ -253,10 +249,6 @@ public class DialogCell extends BaseCell { boolean checkMessage = true; drawNameGroup = false; - //drawNameBroadcast = false; - //drawNameLock = false; - //drawNameBot = false; - drawVerified = false; { if (m_mrChat.getType()==MrChat.MR_CHAT_GROUP) { // EDIT BY MR @@ -267,7 +259,6 @@ public class DialogCell extends BaseCell { drawNameGroup = true; nameLockTop = AndroidUtilities.dp(17.5f); //} - //drawVerified = chat.verified; -- /EDIT BY MR if (!LocaleController.isRTL) { nameLockLeft = AndroidUtilities.dp(AndroidUtilities.leftBaseline); @@ -328,7 +319,6 @@ public class DialogCell extends BaseCell { case MrMsg.MR_OUT_DELIVERED: drawCheck2 = true; break; case MrMsg.MR_OUT_READ: drawCheck1 = true; drawCheck2 = true; break; } - drawVerified = m_mrChat.isEncrypted()!=0; // we use the "verified" check as an icon for "encryted" and "verified" } if (unreadCount != 0) { @@ -393,18 +383,12 @@ public class DialogCell extends BaseCell { } } - if (dialogMuted && !drawVerified) { + if (dialogMuted) { int w = AndroidUtilities.dp(6) + muteDrawable.getIntrinsicWidth(); nameWidth -= w; if (LocaleController.isRTL) { nameLeft += w; } - } else if (drawVerified) { - int w = AndroidUtilities.dp(6) + verifiedDrawable.getIntrinsicWidth(); - nameWidth -= w; - if (LocaleController.isRTL) { - nameLeft += w; - } } nameWidth = Math.max(AndroidUtilities.dp(12), nameWidth); @@ -475,10 +459,8 @@ public class DialogCell extends BaseCell { if (nameLayout != null && nameLayout.getLineCount() > 0) { left = nameLayout.getLineLeft(0); widthpx = Math.ceil(nameLayout.getLineWidth(0)); - if (dialogMuted && !drawVerified) { + if (dialogMuted) { nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - muteDrawable.getIntrinsicWidth()); - } else if (drawVerified) { - nameMuteLeft = (int) (nameLeft + (nameWidth - widthpx) - AndroidUtilities.dp(6) - verifiedDrawable.getIntrinsicWidth()); } if (left == 0) { if (widthpx < nameWidth) { @@ -504,7 +486,7 @@ public class DialogCell extends BaseCell { nameLeft -= (nameWidth - widthpx); } } - if (dialogMuted || drawVerified) { + if (dialogMuted) { nameMuteLeft = (int) (nameLeft + left + AndroidUtilities.dp(6)); } } @@ -669,12 +651,9 @@ public class DialogCell extends BaseCell { } } - if (dialogMuted && !drawVerified) { // TODO: if we enable encrypted chats and show the verified logo, we may show both, muted and verivied + if (dialogMuted) { setDrawableBounds(muteDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f)); muteDrawable.draw(canvas); - } else if (drawVerified) { - setDrawableBounds(verifiedDrawable, nameMuteLeft, AndroidUtilities.dp(16.5f)); - verifiedDrawable.draw(canvas); } if (drawError) { diff --git a/MessengerProj/src/main/res/drawable-hdpi/check_list.png b/MessengerProj/src/main/res/drawable-hdpi/check_list.png deleted file mode 100644 index e739bea2f801cbf28d4892b08bb9a0400586b964..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 689 zcmV;i0#5yjP)Px%Ye_^wR5%fpRLyG>Q4pVb*`!G@ZA}Piz|Y2`^k9MqwYH5Gq=@NjE#r?DEphZnnh-`{wKSemgsFW)b?V z;`8PSgw9z~v4xen^fwJDniP$!Hp({IW9D4`f%bbPdJV0YYTp-$;JnxfXcEF}1|B1z zOF%H}_%U+EoX;)mGg<}+Pu3gbosRWh141R@+m-qJIe%RF9k$)M>-Y7wiOQw=k4b;5 zo1tVTWJEOK2Zh>*EheZ&QnBi%narl((76EIzRxwA4n4R>01-A2)Wai~t0?C-|ATB_ z6yem!K+h{UnKXfYtC>* z7;M`Btu}9-#jWKe=G?OMnI{I>go0~@WY^^-`)d*0{ICI^*W2AV*YM9Mj4X=7kj-sc z(Ex^G2v4Rma42O!iuL-JE$1^Ovwmc9hHIGkYBUb8x~62DoC%N!uU4DDY`AZ~J~jxo z3t8BW%ss`sWnU3p$!zLz(!qOX3l>(l95a`Ugl4AkBDtbhMH({bOc+=~Dr@F&B2cpc z*mV?&Zz$!kPKWB-%qL4jFWrP0{s|KGV8KR=k;M ze}GW_8Zzii@{>R5DJZ;n6!XI>8Yw8m+kp6ypQhAIlk6#HUr=oF9XUPx$g-Jv~R45gFkvmHRK@i7h_VyAnIU5a;sMz@gO%YAHq_D6I2_)Evprx2r>;)S; z3q@=!1QoRv^aF@VC5mXPVjg7@!I;fDd&gd43J>n)_5bbc%^-9=_AN~WDCwvg{Ik%+livnewsh{pXQOD~u7HrJ+ zL1L)KNg+z+HLsYO615d78w+}1ZOU&86tFVshr_2ToV?cU9D@AFC;Q)cy+UJ_VD}FP z2%5GaHs}TAE8yUU#E~DPuBbhHK#K!pIp+0@7P6rc!()y!WLq9)Zo3DN^9usIj+5=}^$7p~002ovPDHLkV1j&~ B$zA{e diff --git a/MessengerProj/src/main/res/drawable-xhdpi/check_list.png b/MessengerProj/src/main/res/drawable-xhdpi/check_list.png deleted file mode 100644 index 7bc4bc303bd2ce0dd147ab02699cbcf33e3b6fc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 zcmV;719SX|P)Px&MoC0LR7ee_RZVCUK@@&(wrN^zOaEv{4z-|YK`NG}t(PhhDhLX;YU;tWAYOX& zpdPG>coOka4}y5I_D2Mfs)q_97Hce?jTrP0lByNd*0$Ll-%k--#F6*dWZ=?@CrX#|%7Uxa`=X4y#DvAv-ZmnjnN|1vl zCYQov$;SXV<*zax`Rbb2elDaAfRsmNJb9R?4H95pO4)^o^yxM9LRlm{k?xeH8KYoM z4#Elvt`T12o@)qW@O3osz>TvnbRc6gV~%)4)ByN(B0OYD>msen`C~jlrWFd`Pxg@1 zp)940r<5H%))`0xhxc@@Rh=s6M@MR>{l6$;VzoW?q zclw)Qq_@7Pn6DBh1>blCq{~>ovB=GRjZotgaImc!&g`o720?f`I}l9dP908p85<*o zBFy~!BLidae|aV$h)D*O5SJBNH{E!r3EKF+klzWCrxQ6f^A#4BEe{vaSQp~jrOHYH z%^;C0d+OnOUn88{u{l3dmI%$lN}=+vifXPvI%?OkZJVIKwOR=b@2*qtcVAZXIbnde ztLRG940^1t4bt;QHb+#2ZQOoO#FyaNr}fUjVxy5Jm3ZcqBtksPvQ%tT{Un}D5!S!~ z3XQk#GHsu|GJC94kt`prifR!O#)tHN0z4v2GO4qipZ)GwS$QHHMT*RCbD%;>>l^*} zJjLu}*lo5L8e9wvAtI;K{LiQKew6E?y)CxzQp$So?QIwLi$JejI6 zqBw`b*Dk93twM-l8hb%SCVM*QbaCSIeAkCIM>ePXUb35;7WWe_^)_Dk?tPdF@I9dd ioS2J-rVGakzyAQwH&3gDYNW0J0000Px(Hc3Q5R9Fekm`!X@*{t*!=ln)VdI$yQMxfPRoc^j=i?9u-j`zHUalwo#WV0# zIf!|r zzC4!RYt+#Oj3Sy1WbS_6>Xb@P^}br_JdxNodUWwflm?G7pmE1>F4@@G+Suwv!ez4g zo%oo#Y$vv|Lp`Y*VH^qPI3m`&rg&_0jqe;?nJdtt1nW@dIA`Zad(y)}+GTL`@{5vl zQGnPLj-7Nb8C8a zsUqZk#u6uab23>F0<1R0T1Xlrm);+B;vp{n_;Aa2U}EUcQ2e!xt&K3SzYW$eOxlSf z4{^!sp+nrxt8yy>yRxGNTALDZt#hFjpyH8m6kW(eyz;q2Jrr0|!^|_CljIU`UC13I z4&otU=_SJ+iY{XO`N5R*c)@|MlO@$GFOfrqVKbLRCK&dVTUOU&0(&~(oxC9;?1&SCrz6~SmSu-1M?Op`O*ER>5)dWV0 zIKSj@)jc?hU@>xC6*wz)64=@H`FL{~oZc|646tS}ni%Jo94>?h_sf|+Vv1n5r)Nnp z*GCpQU@TyyiV?Kra3}I!Abi~2xHAX-o`0Hx$L|Z!xjgmPH~}u7lYo6In?P+B%E0R7 zSH@aN9N4@{UGm_kENN0e-k*$UKG1-cm$$Z*0qQoYUM(2;(>~Y4AWhqee5{ndg@KXN zG~U&7BjfT8Qrq++uoF?+g~=KFiGz5^M8Z*C8Dj4ZMFA?XFJb$br)I7w9!8lsCcIhm*N}o-@$mn=)HqM$))D4CK9Gaat2rI&DTGm z)<;PkxETJ9gcY1BWdcokYTW6dnjolTY>0Dy-k3x9eg4br%MaOp`{NVrt4Dg6d)2#i zhkri3?Hylwr(UPLQg6pqx6zG+qlB08%DA9NhxAN|v_4NHoD{=^S9hwlP6@P)h7}yG zB3kC5g7W(udxQIdA$*weCLRB(H0fHwkuzoDei1sP@jr~G;HgHIT=A+my@pC^Q$LND z`2^_rZB$!EC8`ls;@8aqnSf(nS?M=n5RASFKfte=2czbxYW!b+P5%uLz1}$lZ60j^ O0000