From 66aaf243cf7654c40628187a0249ac77b9452c7a Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Tue, 7 Feb 2023 17:09:36 +0800
Subject: [PATCH] opt: notify cm

---
 flutter/lib/desktop/pages/server_page.dart | 7 ++++---
 flutter/lib/models/server_model.dart       | 6 ++++++
 src/client/io_loop.rs                      | 2 +-
 src/server/connection.rs                   | 7 ++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index b2f70cdd5..a253b9aa2 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -524,7 +524,7 @@ class _CmControlPanel extends StatelessWidget {
         Offstage(
           offstage: !client.inVoiceCall,
           child: buildButton(context,
-              color: Colors.purple,
+              color: Colors.red,
               onClick: () => closeVoiceCall(),
               icon: Icon(Icons.reply, color: Colors.white),
               text: "Stop voice call",
@@ -538,7 +538,7 @@ class _CmControlPanel extends StatelessWidget {
                 child: buildButton(context,
                     color: MyTheme.accent,
                     onClick: () => handleVoiceCall(true),
-                    icon: Icon(Icons.phone, color: Colors.white),
+                    icon: Icon(Icons.phone_enabled, color: Colors.white),
                     text: "Accept",
                     textColor: Colors.white),
               ),
@@ -546,7 +546,8 @@ class _CmControlPanel extends StatelessWidget {
                 child: buildButton(context,
                     color: Colors.red,
                     onClick: () => handleVoiceCall(false),
-                    icon: Icon(Icons.phone, color: Colors.white),
+                    icon:
+                        Icon(Icons.phone_disabled_rounded, color: Colors.white),
                     text: "Deny",
                     textColor: Colors.white),
               )
diff --git a/flutter/lib/models/server_model.dart b/flutter/lib/models/server_model.dart
index eec424bfe..aab12ab5d 100644
--- a/flutter/lib/models/server_model.dart
+++ b/flutter/lib/models/server_model.dart
@@ -587,6 +587,12 @@ class ServerModel with ChangeNotifier {
       if (index != -1) {
         _clients[index].inVoiceCall = client.inVoiceCall;
         _clients[index].incomingVoiceCall = client.incomingVoiceCall;
+        if (client.incomingVoiceCall) {
+          // Has incoming phone call, let's set the window on top.
+          Future.delayed(Duration.zero, () {
+            window_on_top(null);
+          });
+        }
         notifyListeners();
       }
     } catch (e) {
diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs
index 234f4f842..05eab692a 100644
--- a/src/client/io_loop.rs
+++ b/src/client/io_loop.rs
@@ -1259,7 +1259,7 @@ impl<T: InvokeUiSession> Remote<T> {
                             log::debug!("Possible encountering a voice call attack.");
                         } else {
                             if response.accepted {
-                                // The peer accepts the voice call.
+                                // The peer accepted the voice call.
                                 self.handler.on_voice_call_started();
                                 self.stop_voice_call_sender = self.start_voice_call();
                             } else {
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 7a16df811..86d837619 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1596,9 +1596,11 @@ impl Connection {
                             NonZeroI64::new(request.req_timestamp)
                                 .unwrap_or(NonZeroI64::new(get_time()).unwrap()),
                         );
-                        // Call cm.
+                        // Notify the connection manager.
                         self.send_to_cm(Data::VoiceCallIncoming);
                     } else {
+                        // Notify the connection manager.
+                        self.send_to_cm(Data::CloseVoiceCall("".to_owned()));
                         self.close_voice_call().await;
                     }
                 }
@@ -1617,6 +1619,7 @@ impl Connection {
             if accepted {
                 // Backup the default input device.
                 let audio_input_device = Config::get_option("audio-input");
+                log::debug!("Backup the sound input device {}", audio_input_device);
                 self.audio_input_device_before_voice_call = Some(audio_input_device);
                 // Switch to default input device
                 let default_sound_device = get_default_sound_input();
@@ -1637,8 +1640,6 @@ impl Connection {
         // Restore to the prior audio device.
         if let Some(sound_input) = std::mem::replace(&mut self.audio_input_device_before_voice_call, None) {
             set_sound_input(sound_input);
-            // Notify the connection manager.
-            self.send_to_cm(Data::CloseVoiceCall("".to_owned()));
         }
     }