From 2016fa315b07a2c88f577e632abf65325bd57a58 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 22 Jun 2015 08:46:43 -0700
Subject: [PATCH] Support for quick reply from notifications.

Fixes #483
Closes #3455
// FREEBIE
---
 AndroidManifest.xml                           |   9 ++
 res/anim/slide_from_top.xml                   |   7 ++
 res/anim/slide_to_top.xml                     |   7 ++
 res/drawable-hdpi/ic_launch_white_24dp.png    | Bin 0 -> 357 bytes
 res/drawable-hdpi/ic_reply_white_36dp.png     | Bin 0 -> 467 bytes
 res/drawable-mdpi/ic_launch_white_24dp.png    | Bin 0 -> 268 bytes
 res/drawable-mdpi/ic_reply_white_36dp.png     | Bin 0 -> 350 bytes
 res/drawable-xhdpi/ic_launch_white_24dp.png   | Bin 0 -> 368 bytes
 res/drawable-xhdpi/ic_reply_white_36dp.png    | Bin 0 -> 567 bytes
 res/drawable-xxhdpi/ic_launch_white_24dp.png  | Bin 0 -> 533 bytes
 res/drawable-xxhdpi/ic_reply_white_36dp.png   | Bin 0 -> 814 bytes
 res/drawable-xxxhdpi/ic_launch_white_24dp.png | Bin 0 -> 666 bytes
 res/drawable-xxxhdpi/ic_reply_white_36dp.png  | Bin 0 -> 1057 bytes
 res/menu/conversation_popup.xml               |   9 ++
 res/values/attrs.xml                          |   1 +
 res/values/strings.xml                        |   8 +-
 res/values/themes.xml                         |  19 +++
 .../securesms/ConversationActivity.java       |  58 ++++++---
 .../securesms/ConversationListActivity.java   |   1 +
 .../securesms/ConversationPopupActivity.java  | 117 ++++++++++++++++++
 .../notifications/MessageNotifier.java        |   2 +-
 .../notifications/NotificationItem.java       |  16 ++-
 .../util/concurrent/ListenableFuture.java     |  12 ++
 .../util/concurrent/SettableFuture.java       | 112 +++++++++++++++++
 24 files changed, 354 insertions(+), 24 deletions(-)
 create mode 100644 res/anim/slide_from_top.xml
 create mode 100644 res/anim/slide_to_top.xml
 create mode 100644 res/drawable-hdpi/ic_launch_white_24dp.png
 create mode 100644 res/drawable-hdpi/ic_reply_white_36dp.png
 create mode 100644 res/drawable-mdpi/ic_launch_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_reply_white_36dp.png
 create mode 100644 res/drawable-xhdpi/ic_launch_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_reply_white_36dp.png
 create mode 100644 res/drawable-xxhdpi/ic_launch_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_reply_white_36dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_launch_white_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_reply_white_36dp.png
 create mode 100644 res/menu/conversation_popup.xml
 create mode 100644 src/org/thoughtcrime/securesms/ConversationPopupActivity.java
 create mode 100644 src/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java
 create mode 100644 src/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6003be36e9..538f960447 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -112,6 +112,15 @@
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightTheme.Popup"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".ConversationPopupActivity"
+              android:windowSoftInputMode="stateVisible"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:excludeFromRecents="true"
+              android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".MessageDetailsActivity"
diff --git a/res/anim/slide_from_top.xml b/res/anim/slide_from_top.xml
new file mode 100644
index 0000000000..ef75904da2
--- /dev/null
+++ b/res/anim/slide_from_top.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android" >
+    <translate
+            android:duration="250"
+            android:fromYDelta="-100%"
+            android:toYDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/res/anim/slide_to_top.xml b/res/anim/slide_to_top.xml
new file mode 100644
index 0000000000..cc204acb23
--- /dev/null
+++ b/res/anim/slide_to_top.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+            android:duration="250"
+            android:fromYDelta="0%"
+            android:toYDelta="-100%" />
+</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_launch_white_24dp.png b/res/drawable-hdpi/ic_launch_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bdb87244f9133deb5fe7333e77aadee9383b16d
GIT binary patch
literal 357
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W@p<r;B5V$MLt<PV*iz;9+~9(ygGDz{<Abl#64dp~VM_;=~rdkd24VFYMUj`Nkqs
zpX1Hq#r~!9LIX}O`Nex;L2Ik`lK}tFZH6fy7(@?ugzS*WYD`t&W_ZD}R`%l)1#{gA
znFY`Gd$3h5o6lVNti{<jrQoN5m5hG-vYu6~PRoRhcCh(~PDz@v+09W&jh}O-OiF?B
z%qGi6GnhKkj|B7yI=}wDaLMwBJGa<ucL%Xf-kT(T=j`4a`vh(oPp{XqW@zYLD4VsY
zQ}L|LgpfObclGVQ_GI#0ukN%xwpafD*O;weem&Tv_8&(L(4!2Vu6{1-oD!M<?3{xg

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_reply_white_36dp.png b/res/drawable-hdpi/ic_reply_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f8076f25b892916c6212e536f3f1447a6860de1
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00B!$L_t(o!|m6<N&`U<$MK68JgW#PRE$p`q_Gx~%1-nF
z1oZ`Me1MdK5@IW)vXFoV#3m?$Sm`TR*!l-SB!LhVzA4t2%Oytd+?gWm@7jS696P%+
z9-iLkIm}@WbC?R|lheX{Y7}%ZpBm_3hEl;glmgbJ#IYbHjP+8YSeO#T`YE{QfGx5l
z>|%qcZk{+|jieoHIMvB3MKb@z{zjR!IAl6L7KJi-XPdD&SaizdlG&(OT*@4pMLi4}
zEbIJ6lO}oT0}@P~tlZJ>&jV?Rrv52ayVuokS+{W!->^%OGF9$)9D==&vi-zNvBVDN
zGzM_{Qjg~ZtDN!?YJwTbv0$DO%|Pv*^uUwh_`CLvN%>K3h3Bv84UHjnj#~h(bjEL=
zGvG7)tV%5w<D3ASS}RkM3o3fcV2W$a&2yo*wcSqbFo%s8)&|edKofIirt|;+002ov
JPDHLkV1iYR!JhyC

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_launch_white_24dp.png b/res/drawable-mdpi/ic_launch_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..18fc7dda40855349c00fbead0e68db4e16a4e691
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kL+
z;_2cTVsSe8$9V^-lm)Zf4*b{uznE!)#xjl==3PZiQV*CU0^a-&4Ki_<60a1-?6Z@j
zP)gyHKGRfVfyIoGmV#0NQ<FQ{LwGHwCSPX=*6Ud!&_5X{zd+;o;zs$^MSIMAjxCzw
zpz$%O(@E%(&{mT@zx+A&I9wHIP<3CR^?hmiJT)mMhS2i!nUhb(0v*P{;OXk;vd$@?
F2>|t7R2={S

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_reply_white_36dp.png b/res/drawable-mdpi/ic_reply_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcf2096dd8eaae60dc1febc820079c4112ac8fcb
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W@prr;B5V$MLsU_wyYL5IO$wmC`|GiQOdzk{>y2nj|ESCVgiR`p6>GyrkH?`REfx
zoh4<fZ~QV13Cs+sKIimn_hVnXlYfiP85)#Ko9JB69%(h9bva{Xg+e=%8&7MGK$Vfw
zi>Zx@x?PbAG=!fVnkBc?BtS;^*_kK8-*knaxL8Yir7_ej6ERU>U=Oa^V!(Ye)!q2i
zr$2=|gS@{h?*1ZaeE8`Hx7^LsJ*F~B|2ZD#9=647we_~i+b6PBGranAEbJibGpV)L
tQceag|2ccd4Xej1e2nF9?&rD75c2nN&!dBd6M#Ns@O1TaS?83{1OON_fv5lg

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_launch_white_24dp.png b/res/drawable-xhdpi/ic_launch_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dbbc3f08f3087426ba98b1b0b21e25ab76ea11f
GIT binary patch
literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq
zUwFDWhD02Gd)=4skb*#4qL5AZOTm~5p3=u(cjbRgIJV`T%FjD1{<5|urd?!7^S*aH
z!1w5Z7k!!s+8SdMm>gQgWSw4bpS&rZF{DCi+olGw3#?YT38~DP>k4Kau+it?sa($3
z^I5zyVV3zN5MSr>q5~7^|9@^eP!-4X;VJK(@=Xl&^FG*hFn9h8Ntk0_d@m!hVWK~y
z#?PL7!MB$;GroFg&{+6S#HLWp;r!-?WT$zo5m%nreD2W6N}Bg~f-c{Y`BQJ*pT?BK
zQQ?^MweEo)lS!rcgd0@}^81|bUPzbmGd?@Lx`<Kb8S~?pcFk;AKNkS~%;4$j=d#Wz
Gp$P!KY>guT

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_reply_white_36dp.png b/res/drawable-xhdpi/ic_reply_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f11be49564fa35f2bc1d42959ca9e8347023099
GIT binary patch
literal 567
zcmV-70?7S|P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00FN_L_t(&-tF0~OG9B4$MMa9&Nm#0CgXxA27_WU4Y6u4
z_%8?sF&J-C#2_YFSy1d+#(WEc4zsXem_b1igGum(eGPY4_j2#p+`W4aa(*`-_;BBz
z^PDF{NY)inkb)GXAO$H%K??G`ELk86B!MiD1hP3|Kn_O;=$9h`RLT(mD(4snRdNi2
zsyRkMZXAOkcaAZT7YClmu*o7rtps^<N|R%o1Z}~C>f<<hV1wZxL5*?j6gXru7|>rh
zPBM)64Qhr1@WB?n{(+k1*vT{H56B-5z$a^jn+5sDv9nLRED)U2C*_ejxujddOI?~X
zqGmt)>KvH-F}i2f#L`hKUre`lajoZ9+0&Z#qyFp$*`OVf=9Fu0d1;^<m}pH48zs&x
zE2PL#s7cD!T1<jz@?*@C<k6F~U}hT>A;BK+E_FBF_bB*{;vg2URh4sQx6(1zEAG^V
z`C&txld{@T^W&H>OT7Km?#LKejdNG5eI_Dfq}NZjSUn?U=-EXYfTWzUa0kc0y`;f;
zCs*!Ynz=)S0rD)%I_nrCCGGGfp~q7SQjmfaq@e!?`UXwqj!ba}_3Quu002ovPDHLk
FV1fW`>>L09

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_launch_white_24dp.png b/res/drawable-xxhdpi/ic_launch_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbb8dba76c4d26c99e70879c2bd7136137f2dac1
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00E6jL_t(&-tE~tP6IIzfZ;z)c6nTZ3lM0KfFtmd=xA~R
zL;+G-T3Qei6*VOiiICtB1SAU1zzL9eG)s|!i0p2h@z~yCrrO5Vw`+T5M{X4~D_RCJ
zkbw-;P*BDpU6xsNpK0v55RIw<E%CtWtgjXhlrfx{6BKm9rDXBLfu2}z7U+Y8W`T;j
z0m8_*W4Ae=Do!F$H75zEj*|d1$+>4g9jJ_Rz;`N8Ip?Q-{&1j-K075G(txTtNkDa+
z1fY6ObkH<TWYBa@RFDfNBFK#s4U{op+kqqKIwT+^juuFbqXSapXn<5X{vc(JFG$7-
zcI<QdqOTJOlrvyUv{*qva!wGC4<`V~kE0Iq<tT&vIm)0@&b-s0DyYrvSm!Cr%F27_
zk0dP;>Zfc(lGm&Nd8kc~3vmfe)Jhx3Kn6099P~v-ocLtk1@yvNB+!rz7f_G$NT6e`
zTtGR`bRuwG*_^D0RacyktOV!m@$S~Sj(XA~x^$QevX$Ss;kx{9!S3x1WFP|>=wJK-
Xv#JRYx;U6c00000NkvXXu0mjfAS~6^

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_reply_white_36dp.png b/res/drawable-xxhdpi/ic_reply_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..24e00b240899c14bfeaaf118c35242b54037fa07
GIT binary patch
literal 814
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
zRV?##aSW-r_4c-PhDe~uv5y}GLz0AQ9xOB1#Nw-*lqe`7vL#Ymdg2$mgQ6lX9)j7y
ztCn~vYcx$2(_EvZF|A38wOJyvM!_+#S%IyyzPs@5*|hSsvd!hs<{kdIZ2yPm$~)EP
zW;QrH7nL}Zz-Bz-AWxb>vm^?Wv2yMP8`WMQzQE2M`6?lGno&gSQm(MGK`hZ{f|ysQ
zYBuVou57rPtl4liy|djkiL>1_t+UN_Bg^4Mkx7Y#Itw>cO!J5k5)-j>@e|UKTs_C%
zr(kCDny<3gWL8g#_bHml7@xRylUC(Pj=%d3PCL)_x!tqv#Rt}FdSRCDce<2++fcUo
zP)%yfI-SJ4h{QC@!>e)<^db}I8PBjgW6Pb;_<D`E@H9T{GbYuSnwFkqnz4Kan@(=n
zjM-}nxlgyTewcCAD)B>?UG4Uy8Re&M2mbo@DMR|~`s=m1X)mV!Z(KJ&eeFAy+M7Y9
z=UB9t<~2Poa(%Q>_2$Me9c!A?jF)d)Yvjdz_Bo?=jsCMOvlc~1lx>mE`Mf&e*1kKR
zmmax$R;}t~a)TomPhnqR-scJZx|g~3nX6XaIPH0CX3|2<8{JP_=dZc#5i9dd>vCu2
z@ujB!eo3ZjF|L`irS47m>N54~GrAYfopviG{(NMbQbPVD+w{6V=QYn*@})2Jos>&>
z`GD#E>vg|9{+$TylP=BNZOYRr`eQ@NQ$yM0TIn6Zn?G&;(YI}i<C)KY;<kJXv|YTJ
zea70T-|LnoK7Si}fBXEBEGhr<A5C6f_qoN-YHRcJ{$x+tXWzsp^!_(HJ%91*-gVD(
zV*YK}+<Kki;$8o8WtGbI$C}nZn0V5ei>u$J&-*Qv$hdq)x7C3Yt*m#Fru#*x|1LSi
hH1|A~G;;d2{)!r=)PGEw(}2mC!PC{xWt~$(696s-XAJ-V

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_launch_white_24dp.png b/res/drawable-xxxhdpi/ic_launch_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..092346dd7cd9d7096476e544df490c524e688d3c
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00I(8L_t(|+U?svN&`U@$MIhvXhIN=AQoEKgp?K{1QHOu
zg^*Zi<rO@D;9tbn6Nq36vGxyIScn#$LCb)!78YX6?9R@<_vWp>=|afv_p_OuCCR3e
zpxmQk00S7n00uCC0sa-B8u+@8P(TZPv@wH;&_guxI3e1O7od(^tQCEa;{oazV5#^d
zjR!a>eDtFNTDYfKCSn1O&@VUO1#{&F41*U=C4j_l1B7D{15A|{ke;s|kd?0-ke#m@
z;FGTyFh2hs)8zoT^1HY$1Hhes<GcTufV6z*2c+k#2V~_d2W01~2KeMF2KeQx1^DJG
z1^DNy1i11$xDDUG93Wr5IzZlhWq|zozrPEu#sh@p`+wGF2e9Vz1DNx<0qps_0D*i?
z!1(+(bSd-s07Cg(0I_@?08M_hD>2p4j|8BbJW&9Yb3X!r_S6*zP_I0~0Q!Yf6yVD5
z;4XN97X)zR3j%oZ#Q<FSVt_NOvgC^a8aT%?L%!fS@RLB5FS-hS6X^1VuLEBM%6#!F
zaRaB=Cd@|}e&jQN0SsUO0~o*ne;7b@<15V=qLvr%jCn<XCoJRz9AaG&U=N#l0ZlxJ
z&wKaz(8Ob20NoAv#m7E2Tu-F|YPcBrz#eB@VFkkw08qmYdQm4*f&*;1^L_q?)kF_%
z%wke};e5p<j$L!#AE0~~zyJm?fB_6(00R^lpBmL<5Qbv-0000007*qoM6N<$g4qHR
AnE(I)

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_reply_white_36dp.png b/res/drawable-xxxhdpi/ic_reply_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff6ff92d81e116bdbdca35daf84f4d87ad878243
GIT binary patch
literal 1057
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ(J6g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t)J
zFfh;bba4!+xb^nV-R%BEnd2YlpE*2X>4ZsY!O5=LUB{MbEbq85$)Ye}tBk_iglJC7
z3C*5-Dn$;(4l7k>+C0fnT`g<Cb<yaQbMMBp_xS2=|FL<q@7?{!rFXx7{aN$BVRhWy
z{_BU$9i2o&lmsR;u&5|7a(Xy01%U`52!AC^5XcV!3qDZ|*xb-mDG*@L-@s$TWb}dK
z!~tamX8fFc%rh%&*o{6{@QSn@PhL=9bC0R@=|>R_oBrtzFF#apOp)s^cX;{f0J~g4
zUscu&x%vfPDuX^x*3;Y2-df0ds!!c?y~X*o?dvqASGawiYxXTjh=0MI&wtW(ofGR?
z#5=`)-o-BkJ(pH6J)N&UQ*qrUqbi5iN0PqQ*^5|0GUlb^iU0HJ65>B#Fnz{*s|mLA
zQuY-sDahac;-kvtlUnADcOH2DTQDbKQntgp4=SH$EY)M&d5rmj`&w-Wy-zB|X7jg4
zeW_%4XLMR`!fhLdyE<Y41@{71M(bF_uej!X>x<v&i`n;FwuH%dEt6gwv|no3@zR-f
zVa=a)%I~`d&Uwc%*?Q+JfzDekkw4~qEIehp_sT7nE~Y?v(K?;qDf85Q`hFiu+-50y
zf9dm>wM|!Uuolf<G5gVvocfdger~nQq5F&{oV|VKp4gt+D}@ctCKt|R>J>Ftms~ns
z5VtHPc}r(8S9ip5y;+${yX7sFZb@CwJ>WVe*qd9HCx!Kk&E={6FLG4$m(5ySl2XHc
z?RSw#BH!*EZuM-NT`t#HoiUnx_fC?5?xN;@vhB0nm2DR`RvG_H>G{{V%k#~HK#xUM
z;SF5%D#f<^&J24~7HK<}@qNwXC{)cYW<POm<A=F>cxArs^L8kc;`Vu7@!<RSqUjAe
zTbD&R9pCYI+YZ*0)jK@}eIM7T)+VircKCMd@tOtJzpwTkdSkZjYQoBv+5aVXp0!n|
z*4?Fc;mi5=ZxxE~GH<&1Bv<(UKdI{d-415AS;9Vk?B96%F3YBy8Jn8SHIw-bZ~H3D
zUh5_PL8&!k`)UWX*>|UXs^VF3HCAEv+exR7{kvk<e%F4=0kMg5C!VgfcM5rGG~w*D
zx2xTsZI-^vwkh(qB%l4qhsps>Yzyq~+*7n~6pCpqIDV#<b=JXPK5mT_(+VRU4sH!}
lu+$Lbz?T7lx#Z}gI>y!dHWxEx1wnb9!PC{xWt~$(696df%BBDS

literal 0
HcmV?d00001

diff --git a/res/menu/conversation_popup.xml b/res/menu/conversation_popup.xml
new file mode 100644
index 0000000000..f35e1f1ae3
--- /dev/null
+++ b/res/menu/conversation_popup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="@string/conversation_popup__menu_expand_popup"
+          android:id="@+id/menu_expand"
+          android:icon="?menu_popup_expand"
+          app:showAsAction="ifRoom" />
+
+</menu>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 48cc16ea4c..9ca060e1fc 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -95,6 +95,7 @@
     <attr name="menu_new_conversation_icon" format="reference" />
     <attr name="menu_search_icon" format="reference" />
     <attr name="menu_call_icon" format="reference" />
+    <attr name="menu_popup_expand" format="reference"/>
     <attr name="menu_unlock_icon" format="reference" />
     <attr name="menu_lock_icon" format="reference" />
     <attr name="menu_lock_icon_small" format="reference" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 64e3af7dd9..8aa13a829b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -436,6 +436,9 @@
     <string name="MmsMessageRecord_bad_encrypted_mms_message">Bad encrypted MMS message...</string>
     <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS message encrypted for non-existing session...</string>
 
+    <!-- MuteDialog -->
+    <string name="MuteDialog_mute_notifications">Mute notifications</string>
+
     <!-- ApplicationMigrationService -->
     <string name="ApplicationMigrationService_import_in_progress">Import in progress</string>
     <string name="ApplicationMigrationService_importing_text_messages">Importing text messages</string>
@@ -458,6 +461,7 @@
     <string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
     <string name="MessageNotifier_mark_as_read">Mark as read</string>
     <string name="MessageNotifier_media_message">Media message</string>
+    <string name="MessageNotifier_reply">Reply</string>
 
     <!-- QuickResponseService -->
     <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Quick response unavailable when TextSecure is locked!</string>
@@ -901,6 +905,9 @@
     <string name="conversation__menu_delete_thread">Delete thread</string>
     <string name="conversation__menu_view_media">All images</string>
 
+    <!-- conversation_popup -->
+    <string name="conversation_popup__menu_expand_popup">Expand popup</string>
+
     <!-- conversation_callable -->
     <string name="conversation_add_to_contacts__menu_add_to_contacts">Add to contacts</string>
 
@@ -950,7 +957,6 @@
 
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
-    <string name="MuteDialog_mute_notifications">Mute notifications</string>
 
 
     <!-- EOF -->
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 11a3b90752..62171cc14c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -39,6 +39,23 @@
         <item name="android:windowBackground">@color/black</item>
     </style>
 
+    <style name="PopupAnimation" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/slide_from_top</item>
+        <item name="android:windowExitAnimation">@anim/slide_to_top</item>
+    </style>
+
+    <style name="TextSecure.LightTheme.Popup" parent="TextSecure.LightTheme">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowSoftInputMode">stateUnchanged</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowActionModeOverlay" tools:targetApi="honeycomb">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowAnimationStyle">@style/PopupAnimation</item>
+        <item name="android:windowCloseOnTouchOutside" tools:targetApi="honeycomb">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
@@ -131,6 +148,7 @@
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
         <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
+        <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
         <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
         <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
@@ -254,6 +272,7 @@
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
         <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
+        <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
         <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
         <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
         <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 53c1e48d3c..04501b4ffa 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -97,6 +97,8 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libaxolotl.InvalidMessageException;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
@@ -138,16 +140,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private static final int GROUP_EDIT        = 5;
   private static final int CAPTURE_PHOTO     = 6;
 
-  private MasterSecret          masterSecret;
-  private ComposeText           composeText;
-  private AnimatingToggle       buttonToggle;
-  private SendButton            sendButton;
-  private ImageButton           attachButton;
-  private ConversationTitleView titleView;
-  private TextView              charactersLeft;
-  private ConversationFragment  fragment;
-  private Button                unblockButton;
-  private View                  composePanel;
+  private   MasterSecret          masterSecret;
+  protected ComposeText           composeText;
+  private   AnimatingToggle       buttonToggle;
+  private   SendButton            sendButton;
+  private   ImageButton           attachButton;
+  private   ConversationTitleView titleView;
+  private   TextView              charactersLeft;
+  private   ConversationFragment  fragment;
+  private   Button                unblockButton;
+  private   View                  composePanel;
 
   private AttachmentTypeSelectorAdapter attachmentAdapter;
   private AttachmentManager             attachmentManager;
@@ -169,7 +171,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected void onPreCreate() {
     dynamicTheme.onCreate(this);
     dynamicLanguage.onCreate(this);
-    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
   }
 
   @Override
@@ -768,7 +769,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     emojiToggle.setOnClickListener(new EmojiToggleListener());
   }
 
-  private void initializeActionBar() {
+  protected void initializeActionBar() {
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setCustomView(R.layout.conversation_title_view);
     getSupportActionBar().setDisplayShowCustomEnabled(true);
@@ -950,18 +951,22 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     return drafts;
   }
 
-  private void saveDraft() {
-    if (this.recipients == null || this.recipients.isEmpty())
-      return;
+  protected ListenableFuture<Long> saveDraft() {
+    final SettableFuture<Long> future = new SettableFuture<>();
+
+    if (this.recipients == null || this.recipients.isEmpty()) {
+      future.set(threadId);
+      return future;
+    }
 
     final Drafts       drafts               = getDraftsForCurrentState();
     final long         thisThreadId         = this.threadId;
     final MasterSecret thisMasterSecret     = this.masterSecret.parcelClone();
     final int          thisDistributionType = this.distributionType;
 
-    new AsyncTask<Long, Void, Void>() {
+    new AsyncTask<Long, Void, Long>() {
       @Override
-      protected Void doInBackground(Long... params) {
+      protected Long doInBackground(Long... params) {
         ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(ConversationActivity.this);
         DraftDatabase  draftDatabase  = DatabaseFactory.getDraftDatabase(ConversationActivity.this);
         long           threadId       = params[0];
@@ -974,9 +979,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         } else if (threadId > 0) {
           threadDatabase.update(threadId);
         }
-        return null;
+
+        return threadId;
       }
+
+      @Override
+      protected void onPostExecute(Long result) {
+        future.set(result);
+      }
+
     }.execute(thisThreadId);
+
+    return future;
   }
 
   private void setBlockedUserState(Recipients recipients) {
@@ -1031,10 +1045,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     return getRecipients() != null && getRecipients().isGroupRecipient();
   }
 
-  private Recipients getRecipients() {
+  protected Recipients getRecipients() {
     return this.recipients;
   }
 
+  protected long getThreadId() {
+    return this.threadId;
+  }
+
   private String getMessage() throws InvalidMessageException {
     String rawText = composeText.getText().toString();
 
@@ -1055,7 +1073,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }.execute(threadId);
   }
 
-  private void sendComplete(long threadId) {
+  protected void sendComplete(long threadId) {
     boolean refreshFragment = (threadId != this.threadId);
     this.threadId = threadId;
 
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index c062596781..a11e84e503 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -174,6 +174,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, distributionType);
 
     startActivity(intent);
+    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
   }
 
   private void handleDisplaySettings() {
diff --git a/src/org/thoughtcrime/securesms/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java
new file mode 100644
index 0000000000..75c17aa262
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ConversationPopupActivity.java
@@ -0,0 +1,117 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.util.Log;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.WindowManager;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.ExecutionException;
+
+public class ConversationPopupActivity extends ConversationActivity {
+
+  private static final String TAG = ConversationPopupActivity.class.getSimpleName();
+
+  @Override
+  protected void onPreCreate() {
+    super.onPreCreate();
+    overridePendingTransition(R.anim.slide_from_top, R.anim.slide_to_top);
+  }
+
+  @Override
+  protected void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
+    getWindow().setFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND,
+                         WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+
+    WindowManager.LayoutParams params = getWindow().getAttributes();
+    params.alpha     = 1.0f;
+    params.dimAmount = 0.1f;
+    params.gravity   = Gravity.TOP;
+    getWindow().setAttributes(params);
+
+    Display display = getWindowManager().getDefaultDisplay();
+    int     width   = display.getWidth();
+    int     height  = display.getHeight();
+
+    if (height > width) getWindow().setLayout((int) (width * .85), (int) (height * .5));
+    else                getWindow().setLayout((int) (width * .7), (int) (height * .75));
+
+    super.onCreate(bundle, masterSecret);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    composeText.requestFocus();
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    if (isFinishing()) overridePendingTransition(R.anim.slide_from_top, R.anim.slide_to_top);
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    MenuInflater inflater = this.getMenuInflater();
+    menu.clear();
+
+    inflater.inflate(R.menu.conversation_popup, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_expand:
+        saveDraft().addListener(new ListenableFuture.Listener<Long>() {
+          @Override
+          public void onSuccess(Long result) {
+            ActivityOptionsCompat transition = ActivityOptionsCompat.makeScaleUpAnimation(getWindow().getDecorView(), 0, 0, getWindow().getAttributes().width, getWindow().getAttributes().height);
+            Intent intent = new Intent(ConversationPopupActivity.this, ConversationActivity.class);
+            intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, getRecipients().getIds());
+            intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, result);
+
+            if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+              startActivity(intent, transition.toBundle());
+            } else {
+              startActivity(intent);
+              overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
+            }
+
+            finish();
+          }
+
+          @Override
+          public void onFailure(ExecutionException e) {
+            Log.w(TAG, e);
+          }
+        });
+        return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  protected void initializeActionBar() {
+    super.initializeActionBar();
+    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+  }
+
+  @Override
+  protected void sendComplete(long threadId) {
+    super.sendComplete(threadId);
+    finish();
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 711f6e3ae4..d3d2d680f6 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -94,7 +94,6 @@ public class MessageNotifier {
       sendInThreadNotification(context, recipients);
     } else {
       Intent intent = new Intent(context, ConversationActivity.class);
-      intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
       intent.putExtra("recipients", recipients.getIds());
       intent.putExtra("thread_id", threadId);
       intent.setData((Uri.parse("custom://"+System.currentTimeMillis())));
@@ -221,6 +220,7 @@ public class MessageNotifier {
                                            context.getString(R.string.MessageNotifier_mark_as_read),
                                            notificationState.getMarkAsReadIntent(context, masterSecret));
       builder.addAction(markAsReadAction);
+      builder.addAction(new Action(R.drawable.ic_reply_white_36dp, context.getString(R.string.MessageNotifier_reply), notifications.get(0).getReplyIntent(context)));
       builder.extend(new NotificationCompat.WearableExtender().addAction(markAsReadAction));
     }
 
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
index 27a4374962..db81902a07 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
 import android.text.SpannableStringBuilder;
 
 import org.thoughtcrime.securesms.ConversationActivity;
+import org.thoughtcrime.securesms.ConversationPopupActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.Util;
@@ -81,8 +82,7 @@ public class NotificationItem {
   }
 
   public PendingIntent getPendingIntent(Context context) {
-    Intent intent = new Intent(context, ConversationActivity.class);
-
+    Intent     intent           = new Intent(context, ConversationActivity.class);
     Recipients notifyRecipients = threadRecipients != null ? threadRecipients : recipients;
     if (notifyRecipients != null) intent.putExtra("recipients", notifyRecipients.getIds());
 
@@ -92,4 +92,16 @@ public class NotificationItem {
     return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
   }
 
+  public PendingIntent getReplyIntent(Context context) {
+    Intent     intent           = new Intent(context, ConversationPopupActivity.class);
+    Recipients notifyRecipients = threadRecipients != null ? threadRecipients : recipients;
+    if (notifyRecipients != null) intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, notifyRecipients.getIds());
+
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
+    intent.setData((Uri.parse("custom://"+System.currentTimeMillis())));
+
+    return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+  }
+
+
 }
diff --git a/src/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java b/src/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java
new file mode 100644
index 0000000000..59f3a54acb
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/concurrent/ListenableFuture.java
@@ -0,0 +1,12 @@
+package org.thoughtcrime.securesms.util.concurrent;
+
+import java.util.concurrent.ExecutionException;
+
+public interface ListenableFuture<T> {
+  void addListener(Listener<T> listener);
+
+  public interface Listener<T> {
+    public void onSuccess(T result);
+    public void onFailure(ExecutionException e);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java b/src/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java
new file mode 100644
index 0000000000..447faa9812
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/concurrent/SettableFuture.java
@@ -0,0 +1,112 @@
+package org.thoughtcrime.securesms.util.concurrent;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class SettableFuture<T> implements Future<T>, ListenableFuture<T> {
+
+  private final List<Listener<T>> listeners = new LinkedList<>();
+
+  private          boolean   completed;
+  private          boolean   canceled;
+  private volatile T         result;
+  private volatile Throwable exception;
+
+  @Override
+  public synchronized boolean cancel(boolean mayInterruptIfRunning) {
+    if (!completed && !canceled) {
+      canceled = true;
+      return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public synchronized boolean isCancelled() {
+    return canceled;
+  }
+
+  @Override
+  public synchronized boolean isDone() {
+    return completed;
+  }
+
+  public boolean set(T result) {
+    synchronized (this) {
+      if (completed || canceled) return false;
+
+      this.result    = result;
+      this.completed = true;
+    }
+
+    notifyAllListeners();
+    return true;
+  }
+
+  public boolean setException(Throwable throwable) {
+    synchronized (this) {
+      if (completed || canceled) return false;
+
+      this.exception = throwable;
+      this.completed = true;
+    }
+
+    notifyAllListeners();
+    return true;
+  }
+
+  @Override
+  public synchronized T get() throws InterruptedException, ExecutionException {
+    while (!completed) wait();
+
+    if (exception != null) throw new ExecutionException(exception);
+    else                   return result;
+  }
+
+  @Override
+  public synchronized T get(long timeout, TimeUnit unit)
+      throws InterruptedException, ExecutionException, TimeoutException
+  {
+    long startTime = System.currentTimeMillis();
+
+    while (!completed && System.currentTimeMillis() - startTime > unit.toMillis(timeout)) {
+      wait(unit.toMillis(timeout));
+    }
+
+    if (!completed) throw new TimeoutException();
+    else            return get();
+  }
+
+  @Override
+  public void addListener(Listener<T> listener) {
+    synchronized (this) {
+      listeners.add(listener);
+
+      if (!completed) return;
+    }
+
+    notifyListener(listener);
+  }
+
+  private void notifyAllListeners() {
+    List<Listener<T>> localListeners;
+
+    synchronized (this) {
+      localListeners = new LinkedList<>(listeners);
+    }
+
+    for (Listener<T> listener : localListeners) {
+      notifyListener(listener);
+    }
+  }
+
+  private void notifyListener(Listener<T> listener) {
+    if (exception != null) listener.onFailure(new ExecutionException(exception));
+    else                   listener.onSuccess(result);
+  }
+}