From c3b10b04589825ba4c999d627d988e0d346c2603 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 28 Sep 2018 15:43:10 +0200
Subject: [PATCH] show correct end-to-end-encryption icons, closes #56

---
 res/drawable-hdpi/msg_encr_in.png                 | Bin 0 -> 369 bytes
 res/drawable-hdpi/msg_encr_media.png              | Bin 0 -> 304 bytes
 res/drawable-hdpi/msg_encr_out.png                | Bin 0 -> 374 bytes
 res/drawable-mdpi/msg_encr_in.png                 | Bin 0 -> 297 bytes
 res/drawable-mdpi/msg_encr_media.png              | Bin 0 -> 255 bytes
 res/drawable-mdpi/msg_encr_out.png                | Bin 0 -> 298 bytes
 res/drawable-xhdpi/msg_encr_in.png                | Bin 0 -> 428 bytes
 res/drawable-xhdpi/msg_encr_media.png             | Bin 0 -> 328 bytes
 res/drawable-xhdpi/msg_encr_out.png               | Bin 0 -> 429 bytes
 res/drawable-xxhdpi/msg_encr_in.png               | Bin 0 -> 598 bytes
 res/drawable-xxhdpi/msg_encr_media.png            | Bin 0 -> 441 bytes
 res/drawable-xxhdpi/msg_encr_out.png              | Bin 0 -> 604 bytes
 res/layout/conversation_item_footer.xml           |   4 ++--
 .../components/ConversationItemFooter.java        |  13 ++++++-------
 .../securesms/connect/ApplicationDcContext.java   |   1 +
 15 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 res/drawable-hdpi/msg_encr_in.png
 create mode 100644 res/drawable-hdpi/msg_encr_media.png
 create mode 100644 res/drawable-hdpi/msg_encr_out.png
 create mode 100644 res/drawable-mdpi/msg_encr_in.png
 create mode 100644 res/drawable-mdpi/msg_encr_media.png
 create mode 100644 res/drawable-mdpi/msg_encr_out.png
 create mode 100644 res/drawable-xhdpi/msg_encr_in.png
 create mode 100644 res/drawable-xhdpi/msg_encr_media.png
 create mode 100644 res/drawable-xhdpi/msg_encr_out.png
 create mode 100644 res/drawable-xxhdpi/msg_encr_in.png
 create mode 100644 res/drawable-xxhdpi/msg_encr_media.png
 create mode 100644 res/drawable-xxhdpi/msg_encr_out.png

diff --git a/res/drawable-hdpi/msg_encr_in.png b/res/drawable-hdpi/msg_encr_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd7f46f85fd6fd5192e809c42a90857260ffcd73
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
zcuGN-QMY0Wkij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0GSPZ!4!
zi{7^re7%_xMOx=u`|a}CxJ~zuelAZ|L1LDYRX{|&2S-U+-I@@ATVLX%woG>NDGGjE
zI??HjwXgD)N#{Pz`EB=oAN#+rvsJXd?0OuWTFU0&r1oy<=N-l;UiU_Eojp)-S~vbq
z>)Ggq6aMYk(#X>&Y@hhlLCzun_T5B7Gmnd0A7*};T)O>@O}zN|`EU65^R4KJIm)(B
zhEe}&*1z2Bt68m@8yNZ?H}6aNw%oovi)HS=6^%vvBaQfvWFBzeQRv<G-F8FoQY}r#
z?R9D?JJ)KhTp;;%>)b8J6&AnwewbO`I+}Np+}^Y`Pvd11GI)LU>~3f%+?fURIfJLG
KpUXO@geCxC^^_<8

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/msg_encr_media.png b/res/drawable-hdpi/msg_encr_media.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ceae209569f603d17859f57620271d1b0b34bdc
GIT binary patch
literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
zcuGN-QMY0Wkij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0GxPZ!4!
zi{7^r4Y`;M1zi81IMmdtuwrg&`^HV;xA#uD=M-?{lyGN+28YtS&7B)=_C_*=J!%&D
zIr+c(VUPM-8zKZ}c+J}R`rH}5ld=t>zSCAJa;L{ICnqqynQP|Hd5ejELHI>C2hJR)
zdFR^KG%lGuGxlE7Oj*@fRo>vHB_EU)o&LzcWqwWA;=13<EZ4i!SvP&^y2pRT`1>(s
uvnU~ZnJW?M6TDw-`;nJc_Wzo?O<WsutzLzj)eE4*89ZJ6T-G@yGywqF18{`^

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/msg_encr_out.png b/res/drawable-hdpi/msg_encr_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..af0aeee917a989f1875c815dad8b05c81b9b677a
GIT binary patch
literal 374
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8wRq
zcuGN-QMY0Wkij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0G;PZ!4!
zi{7^rHhM7!inyGw&DqfF63zYpsGFlWx8P={9F<!wfB6laS{i&0xLoiGXOaGY^pM|{
z3l6KM%W{h@+TAI=L1_7$o!|HTX8ZSba!$|<k437@q70LFXSOXb4{nz7+?pHlclKSo
zsMl|wpWSU^?6=LFcQv=(+&@j`(JXn5dw*En(%_kt$^9YIbL-&`e;!tBt(NCm%jU5t
zO2TE8<-y?WpKrciwu*Rf$5gxI=Ocv!pMFc<&Q$AIzerY6y}`Ib@+?bgLPpYd$!}JR
zBPY1t=F#{OG3RWhO~w45t2V~Z4y%`#qIrAzDcSjU@jfv{QxE3LPPiytFx%;>Vt|7w
P(EALYu6{1-oD!M<8DW$Y

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/msg_encr_in.png b/res/drawable-mdpi/msg_encr_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..d289ed786b4a7b2f4f93fa5808ea386ce3619ed5
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq
zIQ&4EvB!|%4Ny?B#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWIZdo-U3d
z8WWQfBm^#OsJHh%{O_;MjVCiMus+kheL?B_qsQqx#pUhKM(^7vxxVe^X|pN=10$6`
z>1iejzs{$eI&ffyRsKu1@;hb*Ml+26q~Dk-^Q_)j@zi@QX6D29{`>sboj7&Dj?ef1
z|Ci$F;aT)KJcp;1>jcmUqsLbcoH+8};D`B+5B~rEe=a~;QbIz~?!i|RMTbpnA?knA
nZ+w{F*eLD$Mtf!3A_j(+7KS{ZvnCw_x|qS!)z4*}Q$iB}s&REA

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/msg_encr_media.png b/res/drawable-mdpi/msg_encr_media.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b2e7f173ac664ed6131540320e20df0ee98b460
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq
zIQ&4EvB!|%4Ny?B#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWIYnPZ!4!
zjfqG575NSY2(YFvTqo7u-oiX#9)sQm;fu_n<}VEeDp=NaDX}+e?DzB*eOzXo|5@x`
z)2x*@*B33_cO`D`nUm>X*S)*a{42oUIeltMpM$XA_KqD)x&b_`Tb|3^Sn)Ld9@FcU
uUUQRot@PTg!?(o#io?7&^St}(KC&5@dWHTf`SBm<4hBzGKbLh*2~7alep>4Q

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/msg_encr_out.png b/res/drawable-mdpi/msg_encr_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..760538192c05118f3071ee42766a7afb877fa6fb
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq
zIQ&4EvB!|%4Ny?B#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWIa|o-U3d
z8WWQfBm^#OxZk)maX&M+nWb7uW0UVj-S_q<YyN%kd=~uh*o(A1Qe5W8Dh&SopMT)M
zfrJAmPUQTW-)LxB@4Uv^kN3Z%#F_ubMsH@l*#9JL|NTR&|4T}KH!}LS-6iaB(=x~A
zm-5XS|Bl@VU;~0<|No~-NJ!2s%t}Z}`0(TW355eEKHQf~JoTTy!q%5#!Wu@?HUIzL
m2ikC=SL@4v?Uikd7#KwV8*VZ37jXbOnZeW5&t;ucLK6T38FpX*

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/msg_encr_in.png b/res/drawable-xhdpi/msg_encr_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ac4350129a5850ffb2078f0cc77bc9f240e45b5
GIT binary patch
literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000o2000o20Vd5lGynhq8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10VzpDK~zYI?UK7n13?sqzu8$fjao+o0U=euhsX<fL0Ay1EDSbw
zA&_dUwX)DIZD0yDPmqVOwGzBw<z-Wu%&~BT(IiV&RuIjp4(I>*zcUw@)t@glt<f0c
z6-p~h05?~cx5gNk3BYtZe(~<PhLU|CACK=5b$q?JaA+!(-nRkPS{?O+GhlVRL)vrt
zbu$dZ{-g{q2@tv5UL5WOIRJ_ZSq6^c{nom@pqiB7Cy5}t018fbwl>U=P;0i%^Psk!
zq6(a(K7qAXBa{Ke<6;CY?=uBuYpqTV00KY*DDj@Yidyj)w|?wR4alS>zCq-21_S_y
zYcyN!hhbfi!e=k_Q~*T6L92xI0qg@X;vEb4@hh4E{sAEAn>O&6pDM-ilGQ@LuigO0
W0a%>56{NlZ0000<MNUMnLSTZFAE{3O

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/msg_encr_media.png b/res/drawable-xhdpi/msg_encr_media.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d7ae23283f4ca5c46af74aae1585c54d6ef2e48
GIT binary patch
literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z2+RRtMzyn6CO|>S64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1T!db&7<
zcyzv<Y|VAZLB#cbO4D5F02cAbe0N%Jbg#U0dl$3$0`H5wON<kiM*Olg^XE~N6f$ng
z$TOb*``NtX2FjOSJx^UF#?;vHrDUi1u{(Q97+Ma<cvNa$-Mb-k2dmkXY~CAc4J+C1
zHb_V?I44YO^qIv_CbdcDL)fd_`@Gu^ggU#i{)^b#{dyJ?`(kCK^Uced{;x=0v2`nB
z+>@%b!ZbO?_Br>@Up<#KvGK@9o6laSitOrKbsz9Etg9F3^w^$s?xwST{3`b1&)3a5
TV@~x0J;dPY>gTe~DWM4fG5mb|

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/msg_encr_out.png b/res/drawable-xhdpi/msg_encr_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e94856eb3b296719896e80f2e1ff98198f32a9b
GIT binary patch
literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z2+RRtMzyn6CO|>S64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&wLD!M
zLp(a)PTJ^oI6$Or|Kyfqu7WXM(X8y#o8B+bPhj<2eojpM;zEwO>o)T}THycSQqv6e
z3*`kRBCah?S3NV|7kaujclL$|ytS8o_rG}Ge>L%Azdlb&Y(6Hjd~-!8!;GCVJ4}z=
zn8<ME=cMbkb8<CyX-;4d*dhF+pz2lCd7bz#`*=B`8l%7b4NiFaxuwngyngoEtljgs
z9QI@usi{|v%4>{uuP%<rmrJ#O6|U*~<W;8i9+Th%+pMaZ087L7YmSvgoYuY)vXoCI
zb)Vw}u9yWp3a{oJt<~l^cPh|KdI5{&0oDzE{}tb@&M=qSt1+9`Kuh%>^Vi}ugYK!%
z!XkG67uX<@d~>c3!-8LCoU7wS)~Yeq{SoeE{Le7qkB{rDCLg}dE)O$Pdh6!KF&g%J
V&9shqkN^x?22WQ%mvv4FO#tO<s~G?Q

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/msg_encr_in.png b/res/drawable-xxhdpi/msg_encr_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b8fc8c6324ee8903226aed4d7f39342ad13aa51
GIT binary patch
literal 598
zcmV-c0;&CpP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000>3000>30lzO5M*si-8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10n<rDK~z|U?Ug-i6j2n0pEJ9&*=XEoFhq;=!A=NRSQs!8o8U(=
zun7cK0%E0Az;1p*uv?I9Y1k%6La?x~u}}mp(xk8uEd<egXiRjOdu*27n?N#mcU?_!
z-|imXbKmFAxibS^US3}RSJLSQ3)Si%rgs>CVE5ylDEjixf#Nt0hDR<IMa_MXQEMLs
zeIv;HhxK=haU7ej163+Zr?p2G5hjlEDLf1Iv{)+L+H7V2pcQkuTn;raOKC6w0@qDm
zRvxXc_H+#>>>qjvj9H~Mh1)gF3??e)1g3%a7S!dFTfgR7$#5Q7d3pIn_&xcIaH?K<
zm96z&otc@~v3-xL)qx<%y#z+;rR`c@=KS5s$)7Gc&QB=Z(Q6hA2Dx_-24FUdzF~M^
zl?vG(X52N$ePl*2SgTL7#T#!Av-X9*p98y%g6!-4OF*In*5d0?)+mY+V58wi&UOJv
zn)gjq9Xc8wHOBd_w)B=Yqr@ekt&eVdKn{{Nft;Eao;-a4dI`waO9`-@($-J&z<Z*+
zE=}FMl9rWq0Rk;pFaR0gj9V`Nc?~GI7`ryIcIAQ6<bl%UfzsrG(sb;AoPHg-BsV5v
kGMxme21zIVUdL8{01csZ);c91@c;k-07*qoM6N<$g7A9&YybcN

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/msg_encr_media.png b/res/drawable-xxhdpi/msg_encr_media.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2484cbde2f24f9f0de3e74e9b65ac2a9665b678
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000>3000>30lzO5M*si-8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10X9iQK~z|U?UgYv1VI>v-|rBYldN+&QTYQpl~SoAT7C<E>l6}K
zDC8Q2LZhP-5!cY{Jqjx~*|0OWYYxdg)$HW`_IoCqoli<65{ci%n!W&7m$X?t-kaHD
z(|6X9XaUE-2$(QsQtTZ8t$E3GfiwIJfNpG=CEy}J=95ccIi}EQso@Q92=sxC;#1v~
zGAFTQI>6XzbOo$@k?R4sPVNQh#1J|toqW3@yI0EYhxVD}PuOzS4`y~<kv*66`c3VR
z3H6-yQ&rH+a!Jq5RzHT2dx;W|cQe5kaNWx*q(QAI5c4*zB@|Qy3?=PIY8P9%q_L-L
zRnr5%NgA2iuCLc(h>)brk&&bYNo#?%Dr&Qk;Cu$)3?v~RNytYM@{xpm{5he}S(fQz
jTr?p!GvEA6{6F3S&ch|@(i=zj00000NkvXXu0mjfL6x_h

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/msg_encr_out.png b/res/drawable-xxhdpi/msg_encr_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..758198e4077e121d9c173570a7b47856e0f96398
GIT binary patch
literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000>3000>30lzO5M*si-8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10oh4JK~z|U?Uk`>6hRcme{c4VTu!`bNQf4ef}|4!3kw4(34#Oz
z27(sa99SHljbOKbfarmhX%w{xUJ*nI78W)ZhCotSYNd!Enh?wxyxV;?n=lBuo!j$F
ziutO2kN3^@+nw26@bdEV+FePv3se@a4F^&42tX9%Kixn7@Y{a}3d7K>9se)`+yG8k
z>nN}!s<nZYqjO;x#ytnB&R;!%Y0iO+x0_RVC2?-1cJa|#C+nL|hRYAid4kq_8VrEI
z1g7<}vQX*k8BqVo#%+|b?S}GRRHp(H4J*+hQN0X&v@EBB=IX6ZGMu-p{Gwbe#*MGQ
z{-pITSCBJz#-D81b2pz|8jSl2Zv{P;wALG@czE{0Y{MnT`3ddQpXV$X4CeaZFaY<a
z>pxJcR;$z>H_p1|I0LB$qgMI(?&Ra;oo2uM-h2)G+73}2-Dx&65UPV#^}XF_eYze2
zt6Oy}X6T;-sfc~v)Wx!OA*l0N?dUDD<PwnSqnj1TMVWw{Ox5RC-YA?DC?u^&V7;A3
zVSwa@6*dJHYm-k;r)A|_fD}p=3_zf8(8UXocuOv`z1*@)@<3_wKxy(oY4Sj6+H*io
qzm7PsW35<&u7Zq2-T1xsto{I#S$w<t8&xI%0000<MNUMnLSTYY#SJ0=

literal 0
HcmV?d00001

diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index 1c73ff18c..53ef8ce9e 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -57,10 +57,10 @@
         tools:text="to SIM1" />
 
     <ImageView
-        android:id="@+id/footer_insecure_indicator"
+        android:id="@+id/footer_secure_indicator"
         android:layout_width="12dp"
         android:layout_height="11dp"
-        android:src="@drawable/ic_unlocked_white_18dp"
+        android:src="@drawable/msg_encr_out"
         android:visibility="gone"
         android:layout_gravity="center_vertical|end"
         android:contentDescription="@string/conversation_item__secure_message_description"
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index f307b535d..a0a7888be 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -18,7 +18,6 @@ import com.b44t.messenger.DcMsg;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.DateUtils;
@@ -33,7 +32,7 @@ public class ConversationItemFooter extends LinearLayout {
   private TextView            dateView;
   private TextView            simView;
   private ExpirationTimerView timerView;
-  private ImageView           insecureIndicatorView;
+  private ImageView           secureIndicatorView;
   private DeliveryStatusView  deliveryStatusView;
 
   public ConversationItemFooter(Context context) {
@@ -57,7 +56,7 @@ public class ConversationItemFooter extends LinearLayout {
     dateView              = findViewById(R.id.footer_date);
     simView               = findViewById(R.id.footer_sim_info);
     timerView             = findViewById(R.id.footer_expiration_timer);
-    insecureIndicatorView = findViewById(R.id.footer_insecure_indicator);
+    secureIndicatorView   = findViewById(R.id.footer_secure_indicator);
     deliveryStatusView    = findViewById(R.id.footer_delivery_status);
 
     if (attrs != null) {
@@ -78,7 +77,7 @@ public class ConversationItemFooter extends LinearLayout {
     presentDate(messageRecord, locale);
     presentSimInfo(messageRecord);
     presentTimer(messageRecord);
-    presentInsecureIndicator(messageRecord);
+    presentSecureIndicator(messageRecord);
     presentDeliveryStatus(messageRecord);
   }
 
@@ -89,7 +88,7 @@ public class ConversationItemFooter extends LinearLayout {
 
   public void setIconColor(int color) {
     timerView.setColorFilter(color);
-    insecureIndicatorView.setColorFilter(color);
+    secureIndicatorView.setColorFilter(color);
     deliveryStatusView.setTint(color);
   }
 
@@ -158,8 +157,8 @@ public class ConversationItemFooter extends LinearLayout {
     }
   }
 
-  private void presentInsecureIndicator(@NonNull DcMsg messageRecord) {
-    insecureIndicatorView.setVisibility(messageRecord.isSecure() ? View.GONE : View.VISIBLE);
+  private void presentSecureIndicator(@NonNull DcMsg messageRecord) {
+    secureIndicatorView.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
   }
 
   private void presentDeliveryStatus(@NonNull DcMsg messageRecord) {
diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
index f68b3bbc7..abae115f0 100644
--- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
+++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
@@ -63,6 +63,7 @@ public class ApplicationDcContext extends DcContext {
 
         File dbfile = new File(context.getFilesDir(), "messenger.db");
         open(dbfile.getAbsolutePath());
+        setConfig("e2ee_enabled", "1");
 
         try {
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);