From 8603d24bcb85b47d8c14b80efea3f71f1e3f0ebb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 30 May 2020 10:30:57 +0200
Subject: [PATCH] add record voice mail button to busy screen. fixes #3754

---
 .../ui/ConversationFragment.java              |   5 ++
 .../ui/ConversationsActivity.java             |   2 +
 .../conversations/ui/RtpSessionActivity.java  |  46 ++++++++++++------
 .../drawable-hdpi/ic_voicemail_white_24dp.png | Bin 0 -> 478 bytes
 .../drawable-mdpi/ic_voicemail_white_24dp.png | Bin 0 -> 221 bytes
 .../ic_voicemail_white_24dp.png               | Bin 0 -> 487 bytes
 .../ic_voicemail_white_24dp.png               | Bin 0 -> 625 bytes
 .../ic_voicemail_white_24dp.png               | Bin 0 -> 971 bytes
 8 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_voicemail_white_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_voicemail_white_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_voicemail_white_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_voicemail_white_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_voicemail_white_24dp.png

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 1aaa14380..d60516cc6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2121,6 +2121,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         final String downloadUuid = extras.getString(ConversationsActivity.EXTRA_DOWNLOAD_UUID);
         final String text = extras.getString(Intent.EXTRA_TEXT);
         final String nick = extras.getString(ConversationsActivity.EXTRA_NICK);
+        final String postInitAction = extras.getString(ConversationsActivity.EXTRA_POST_INIT_ACTION);
         final boolean asQuote = extras.getBoolean(ConversationsActivity.EXTRA_AS_QUOTE);
         final boolean pm = extras.getBoolean(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, false);
         final boolean doNotAppend = extras.getBoolean(ConversationsActivity.EXTRA_DO_NOT_APPEND, false);
@@ -2161,6 +2162,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 appendText(text, doNotAppend);
             }
         }
+        if (ConversationsActivity.POST_ACTION_RECORD_VOICE.equals(postInitAction)) {
+            attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
+            return;
+        }
         final Message message = downloadUuid == null ? null : conversation.findMessageWithFileAndUuid(downloadUuid);
         if (message != null) {
             startDownloadable(message);
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 43addb299..24e167e85 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -94,6 +94,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     public static final String EXTRA_NICK = "nick";
     public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm";
     public static final String EXTRA_DO_NOT_APPEND = "do_not_append";
+    public static final String EXTRA_POST_INIT_ACTION = "post_init_action";
+    public static final String POST_ACTION_RECORD_VOICE = "record_voice";
 
     private static List<String> VIEW_AND_SHARE_ACTIONS = Arrays.asList(
             ACTION_VIEW_CONVERSATION,
diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 8c70413a5..76522cee8 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -44,6 +44,7 @@ import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityRtpSessionBinding;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.services.AppRTCAudioManager;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.util.AvatarWorkerTask;
@@ -101,6 +102,14 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         }
     }
 
+    private static void addSink(final VideoTrack videoTrack, final SurfaceViewRenderer surfaceViewRenderer) {
+        try {
+            videoTrack.addSink(surfaceViewRenderer);
+        } catch (final IllegalStateException e) {
+            Log.e(Config.LOGTAG, "possible race condition on trying to display video track. ignoring", e);
+        }
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -372,7 +381,6 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         }
     }
 
-
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void startPictureInPicture() {
         try {
@@ -551,11 +559,13 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             this.binding.acceptCall.setImageResource(R.drawable.ic_call_white_48dp);
             this.binding.acceptCall.setVisibility(View.VISIBLE);
         } else if (state == RtpEndUserState.DECLINED_OR_BUSY) {
-            this.binding.rejectCall.setVisibility(View.INVISIBLE);
-            this.binding.endCall.setOnClickListener(this::exit);
-            this.binding.endCall.setImageResource(R.drawable.ic_clear_white_48dp);
-            this.binding.endCall.setVisibility(View.VISIBLE);
-            this.binding.acceptCall.setVisibility(View.INVISIBLE);
+            this.binding.rejectCall.setOnClickListener(this::exit);
+            this.binding.rejectCall.setImageResource(R.drawable.ic_clear_white_48dp);
+            this.binding.rejectCall.setVisibility(View.VISIBLE);
+            this.binding.endCall.setVisibility(View.INVISIBLE);
+            this.binding.acceptCall.setOnClickListener(this::recordVoiceMail);
+            this.binding.acceptCall.setImageResource(R.drawable.ic_voicemail_white_24dp);
+            this.binding.acceptCall.setVisibility(View.VISIBLE);
         } else if (asList(RtpEndUserState.CONNECTIVITY_ERROR, RtpEndUserState.APPLICATION_ERROR, RtpEndUserState.RETRACTED).contains(state)) {
             this.binding.rejectCall.setOnClickListener(this::exit);
             this.binding.rejectCall.setImageResource(R.drawable.ic_clear_white_48dp);
@@ -789,14 +799,6 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         }
     }
 
-    private static void addSink(final VideoTrack videoTrack, final SurfaceViewRenderer surfaceViewRenderer) {
-        try {
-            videoTrack.addSink(surfaceViewRenderer);
-        } catch (final IllegalStateException e) {
-            Log.e(Config.LOGTAG, "possible race condition on trying to display video track. ignoring", e);
-        }
-    }
-
     private Optional<VideoTrack> getLocalVideoTrack() {
         final JingleRtpConnection connection = this.rtpConnectionReference != null ? this.rtpConnectionReference.get() : null;
         if (connection == null) {
@@ -847,7 +849,21 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         proposeJingleRtpSession(account, with, media);
     }
 
-    private void exit(View view) {
+    private void exit(final View view) {
+        finish();
+    }
+
+    private void recordVoiceMail(final View view) {
+        final Intent intent = getIntent();
+        final Account account = extractAccount(intent);
+        final Jid with = Jid.ofEscaped(intent.getStringExtra(EXTRA_WITH));
+        final Conversation conversation = xmppConnectionService.findOrCreateConversation(account, with, false, true);
+        final Intent launchIntent = new Intent(this, ConversationsActivity.class);
+        launchIntent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION);
+        launchIntent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
+        launchIntent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        launchIntent.putExtra(ConversationsActivity.EXTRA_POST_INIT_ACTION, ConversationsActivity.POST_ACTION_RECORD_VOICE);
+        startActivity(launchIntent);
         finish();
     }
 
diff --git a/src/main/res/drawable-hdpi/ic_voicemail_white_24dp.png b/src/main/res/drawable-hdpi/ic_voicemail_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..03a62e15f90fc0cbfc0d743228e74a8ab242c781
GIT binary patch
literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004{Nkl<ZNDb}5
zze|(>9Khkv``(~Y_QNAu3K!9%5J@DOqOlM(kN$}Mg#sr_oWntC3KB%HwN<B-Od(vt
zHN^}o@$OU*KKbnq^?Ze>DdL_78XEpZwmIUWW%pfm+M+3^F!iBtTyx*DAAIUHjx%-0
zJ?kx4-~_L`WW8OVm{4WvYftmtUXJmWKRnGV6M{ol&092YlU<IwV^}p$jh9_FlpVHU
z&I=AWXVqiCHunrK%yGybHw|OdIBwXmi$mrdH|%;9M-21ksN(}e#TE{D-W|g|>X>uR
zFpP_aA{j0l`Z!>}VUY|64ewJr3A1F)5DJ7&!Yo-cghEOaVT-IS!Wlv{p-fhZ(46vx
z&`wqdVV$r+XeX<Ku#VG)XPjW(lHmpi>^5wBi4z<(OkvSbv72K|oHQ&^<Fa9bI^J~0
zFo3BGhOhQfW8O)t`lxZxstH@EvENO@yh#EUc*jM;M`kF|!F|pW)_BR0M_eJ4c*_bc
z+@*`~joZlz!CqJWTc7RWh<V4X_@~M~x0PQK4%xyT3Y;V1_hg$-%qAro8vbiP0d$QC
Ua9}+3WdHyG07*qoM6N<$f?+1ozyJUM

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_voicemail_white_24dp.png b/src/main/res/drawable-mdpi/ic_voicemail_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5aa7db0557bf06ee521c54d2b92e2dbbf402e3e
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iC7v#hAr`0Kp7+jTa+Gj=$h~XA
z0zp@Cp$TgOj!wMrV3$;ELx13#^Nt=t2SXmI7@z+zM?Np~(*wVrHE(0ztl{~u6F0ZE
z(CB>r(G!x=$+p70eQYbmvva!KO(N7*idOe<+q%wP5*BkoyF@<UbJ6dOHxh$h+}z%J
zJE?Wqg=ihS{{_)Jb1%$zHT&kH2b!KX;axiyS6fv4l#q_dD!qEyFZ<)Z-w)z<FkKcj
Vuv&Y1MK93344$rjF6*2UngH4nTz3Ef

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_voicemail_white_24dp.png b/src/main/res/drawable-xhdpi/ic_voicemail_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..59126d7066f7b20a94c169f329275153accfbe7d
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00055Nkl<ZSi|j>
zJ4*vW6on^MHu0InUI})J{wu{0Z51sf8qgmi1S~}2>u*E?b|Ntkt<6KS2%km9OE%eA
zM@?Zdr@DLQoICG3tCWL-gTp@q3+!-910SDfuE>%8){|kI8|wJ@)VU^4CR~{0lpdpK
zbA)G1p5%n?n5RRL#He(c2TZtUDKveQr%E;`eIW`B7DLiUds@;3$)S-n*ky${aaP%*
zDSRckP*$F*UMNn4I%6u3W}1?;9R^zLJja7m&=qNHY$0MIe`9{=<k)#Sq!rsT(W%g_
zoRPKO5YFC{Q{3oq*LWEBwc<h;drw(W*Wrp$yrvb8!q|Ii3SWnDquA4mt}ynV{!hg3
z!hHOsgRkkX8pZ2c@gz*s+EY_p>u}E~KG2FwVeYIwWkp_xO{PPov%G4>rf@sfo-IX&
zj{YcxUYc{cXmdkly=UcVlTu1il&f80W@IGi-<FCfPhmhMs0#JMK5KY*taBg}g-Y<m
z1d5%>b1wywEG;IDX5bYeJ2Z<)VEmCH!Le-j-_WLDcxFkHqfCwduM+pEQD%#j`+ah7
daB!G3J^?=jcHq<R-7WwC002ovPDHLkV1n`}+zJ2y

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_voicemail_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_voicemail_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..28b8e936a05146771d8171de680a7cdefe0c9b2a
GIT binary patch
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006wNkl<ZXx{CZ
z%}QHA6o7Agp@}wzyh}(>+>1hsE%qry6oa@5MCd~ZF4`9;2to*yLg>CqmujvNrB4u2
zx@r8n2-G?EFOwW>7Cql?a_;$ZX72nYL0}k$VHk#C7&E{MM|9{jWW<m@9a=2U#l|9g
zM5NPWmxZZH(c0MJ2l?Fd#=9JyjUpfL<AlP*Vzf5Oe8rzGOS$D}Z4{>xj3tGf(b3vc
zhW8u$R4Efurb>hJ<WOf8q_wdX3tqC8@-^#R$DZ5Fn94dEi?OxviI*8YFL5fKyrY=1
z(6u)9VuI&6lQoP<b`nqMZDQlP%<7NRub%V#bt0~{u_9_*^Vse-L`FS!NN8;wxog35
z2flD}nj)gN(Q%slo{9q}r!69S8-1r)^;FcHoJd6UHik~K?5U_YIRg>V+ZZ{`&{GjQ
zIU^ByP}+X$`}9*pe(6VOmbYGaa{3~2r?f?KT{JuuhfYpML_RBR?SPikJoi+5cXC=H
z@?L3c1}ux6a@|AlDrcu&RoZGn5XjSn(geX0H`!+y&%~UZ)^;`ia97lLnzvjDIh%0W
zHx#z*@y83?$0Vi9{+vyHAM&@|{=LTXHg<RGv61?=Z@g}d?`E{UcEcx$JMIMs)Tj_r
zq0XUL3zP2DA7`)~OGSY$^W+OJl5ey-$8yr<8HJP=_b)h3jE+;(rZ|nBo?9`MQ%fqc
zllaB-G+ePg`9Ffk6Szs6h=I7_=y_m3M4KkHz%UHMFbu;mjQ@c@y7ZZEM%EZy00000
LNkvXXu0mjf1!O6#

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_voicemail_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_voicemail_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..820ff5066b5118de9972bed7a063b7da807d4ca6
GIT binary patch
literal 971
zcmV;+12p`JP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000A$Nkl<Zc-rlm
zyH8X>6o)THAmL%DbSg-+^g(O{HJX4RL_<^}g^#}h5~#E=EJ$c<jE0D@5e*@NAc3f$
zQrT$mwMgu2Oo&7TQHc0ifC4jf_da%Rgm}Jk_RQ~hcJJJoGiMz~5ClOG1VIo4K@bE%
z5H#38In6v^j0xtL<1?e&Cq@aGR(-N5qlw<XJ`=pBhbBtN3M-jH1^1Z6jT!DxY$5d&
zj?&2wSDznrP)15n+0(qk4=*{MRQgrC@#XW16aGba@RT6*vo%!m+ZhVv^N4&uvgi3m
zP$oGUIQ=tB2lknw+G{<w5SEL9)_rqmpT<P8H%NvnzSD0_%IBJ!a0|(D!PggPPTD7C
zl0D}V{EI<q*vCfFNMjR))bfO1F42{q>7TXYQ?2hjrdRhT*U2@ekw+`@h8bVj?6LDq
zTk)A<+seQvhM>3XN|?+Z;)Yp03Fp}JdARa8(di|_b2((vXP8-*;MlV1Q@OM&yfMhG
z_w_=i8l<1Q?ml*XMivVUjv5|nhVMN+i&1U<L1UzSpCbz&b!xBF&Om2sf%cl+GRE2W
zxw}xvs+HjNz-2+3wnwBH3TFF0-^p|+)Ar-sz{2_3etkfTiN>eIp-CAU3{_b^^E#6w
z@`*Y0Dnm7)gzF5eb7e#{KHUyu%Fw=0!bR#uM~jHYC+;wz3~dZ0oTI3G)FPts8F!dd
zhSEX_r>j>SEg~A9*{Fo4wTStszJU5@H(7bKpR|atk@$=|yjO+_LkaI!y9ipuhe&+l
z4n4|HZ7AV-Mdh9rF%XGQmwvzug%Te2y5e&=5}yW#QtgP(vv9;8)?$uD;#2I9r4?DN
zfrW3Xdl2b{Vs6&D&kPxk<Itg%xw`|&?$x%)+s3#q>ptz~IuYXjd(UKRMFJc$MwVOm
zDfx5Nd#!!cN2<@OUcWZ?g-h%@!<{M_pQU<>6NW2upLb`TY=bOR1iI9R_gUT-=dmGR
zlmd@6IcAtOkg%yZY|W=%-JqrnLG!ekTiWDv)7WsDWQ#{*>zgGX^*%?nYs>E$brg|9
zI_c!FpL&K}TYgoZ%i)|ApHn93M%D_K+<u*FYa;!ti5_rl&Hnn!-i4`EoBX74?Q36Q
z8xL1y`uzbqNmMejs*(@>cP=R$;V$3*dFnH?FV;MvE)bcN5Tlzo;|cz?x6Lf$#Ob1e
tV*mYXK@bE%5ClOG1VIo4K@f!hhu=9=y|&YkHp2h_002ovPDHLkV1mxP*C7A^

literal 0
HcmV?d00001