- client discovery improvements

- minor VoIP improvements

Author: IxiAngel

Spixi/App.xaml.cs

@@ -207,6 +207,7 @@ protected override void OnResume()
 
         NetworkClientManager.wakeReconnectLoop();
         StreamClientManager.wakeReconnectLoop();
+        PresenceList.forceSendKeepAlive = true;
 
         // Popup the lockscreen if necessary
         // Allow a 5 second cooldown after unlock
@@ -219,7 +220,6 @@ protected override void OnResume()
             var lockPage = new LockPage(true);
             lockPage.authSucceeded += onUnlock;
             MainPage.Navigation.PushModalAsync(lockPage);
-            PresenceList.forceSendKeepAlive = true;
             return;
         }
 
@@ -229,7 +229,6 @@ protected override void OnResume()
             p.onResume();
         }
         OfflinePushMessages.resetCooldown();
-        PresenceList.forceSendKeepAlive = true;
     }
 
     protected override void OnSleep()

Spixi/Network/StreamProcessor.cs

@@ -588,7 +588,7 @@ private static void handleAppRequest(byte[] messageId, Address sender_address, A
                         {
                             if (VoIPManager.onReceivedCall(friend, app_data.sessionId, app_data.data))
                             {
-                                Node.addMessageWithType(messageId, FriendMessageType.voiceCall, sender_address, 0, "");
+                                Node.addMessageWithType(app_data.sessionId, FriendMessageType.voiceCall, sender_address, 0, "");
                             }
                             UIHelpers.refreshAppRequests = true;
                         }
@@ -599,7 +599,7 @@ private static void handleAppRequest(byte[] messageId, Address sender_address, A
                         Logging.error("App with id {0} is not installed.", app_id);
                     }
                 }
-                Node.addMessageWithType(messageId, FriendMessageType.appSession, sender_address, 0, app_data.appId);
+                Node.addMessageWithType(app_data.sessionId, FriendMessageType.appSession, sender_address, 0, app_data.appId);
 
             });
         }

Spixi/Platforms/Android/SPlatformUtils.cs

@@ -1,8 +1,6 @@
 using Android.App;
 using Android.Content;
 using Android.Media;
-using Android.OS;
-using AndroidX.Core.View;
 using IXICore.Meta;
 using SPIXI;
 using SPIXI.Interfaces;
@@ -11,6 +9,8 @@ namespace Spixi
 {
     public class SPlatformUtils
     {
+        static object ringtoneLock = new object();
+
         static MediaPlayer? ringtone = null;
         static MediaPlayer? dialtonePlayer = null;
 
@@ -43,68 +43,74 @@ public static string getHtmlPath()
 
         public static void startRinging()
         {
-            if (ringtone != null)
+            lock (ringtoneLock)
             {
-                return;
-            }
-
-            try
-            {
-                bool ring = true;
-
-                NotificationManager nm = (NotificationManager)MainActivity.Instance.GetSystemService(Context.NotificationService)!;
-                InterruptionFilter int_filter = nm.CurrentInterruptionFilter;
-                if (int_filter != InterruptionFilter.Priority && int_filter != InterruptionFilter.All)
+                if (ringtone != null)
                 {
-                   ring = false;
+                    return;
                 }
-                
 
-                AudioManager am = (AudioManager)MainActivity.Instance.GetSystemService(Context.AudioService)!;
-                if (am.RingerMode != RingerMode.Normal)
+                try
                 {
-                    ring = false;
+                    bool ring = true;
+
+                    NotificationManager nm = (NotificationManager)MainActivity.Instance.GetSystemService(Context.NotificationService)!;
+                    InterruptionFilter int_filter = nm.CurrentInterruptionFilter;
+                    if (int_filter != InterruptionFilter.Priority && int_filter != InterruptionFilter.All)
+                    {
+                        ring = false;
+                    }
+
+
+                    AudioManager am = (AudioManager)MainActivity.Instance.GetSystemService(Context.AudioService)!;
+                    if (am.RingerMode != RingerMode.Normal)
+                    {
+                        ring = false;
+                    }
+
+                    MainActivity.Instance.VolumeControlStream = Android.Media.Stream.Ring;
+
+                    if (ring)
+                    {
+                        ringtone = playSoundFromAssets("sounds/default_ringtone.mp3");
+                        ringtone.Looping = true;
+                        ringtone.Start();
+                    }
                 }
-
-                MainActivity.Instance.VolumeControlStream = Android.Media.Stream.Ring;
-
-                if (ring)
+                catch (Exception e)
                 {
-                    ringtone = playSoundFromAssets("sounds/default_ringtone.mp3");
-                    ringtone.Looping = true;
-                    ringtone.Start();
+                    Logging.error("Exception occurred in startRinging: " + e);
+                    ringtone = null;
                 }
             }
-            catch (Exception e)
-            {
-                Logging.error("Exception occurred in startRinging: " + e);
-                ringtone = null;
-            }
         }
 
         public static void stopRinging()
         {
-            if (ringtone == null)
+            lock (ringtoneLock)
             {
-                return;
-            }
+                if (ringtone == null)
+                {
+                    return;
+                }
 
-            try
-            {
-                if (ringtone.IsPlaying)
+                try
                 {
-                    ringtone.Stop();
+                    if (ringtone.IsPlaying)
+                    {
+                        ringtone.Stop();
+                    }
+                    ringtone.Release();
+                }
+                catch (Exception e)
+                {
+                    Logging.error("Exception occurred while stopping the ringtone: " + e);
+                }
+                finally
+                {
+                    ringtone = null;
+                    MainActivity.Instance.VolumeControlStream = Android.Media.Stream.NotificationDefault;
                 }
-                ringtone.Release();
-            }
-            catch (Exception e)
-            {
-                Logging.error("Exception occurred while stopping the ringtone: " + e);
-            }
-            finally
-            {
-                ringtone = null;
-                MainActivity.Instance.VolumeControlStream = Android.Media.Stream.NotificationDefault;
             }
         }
 

Spixi/VoIP/VoIPManager.cs

@@ -58,7 +58,7 @@ public static void initiateCall(Friend friend)
             string codecs = String.Join("|", SSpixiCodecInfo.getSupportedAudioCodecs());
 
             var sm = StreamProcessor.sendAppRequest(friend, "spixi.voip", currentCallSessionId, Encoding.UTF8.GetBytes(codecs), "spixi.voip");
-            Node.addMessageWithType(sm.id, FriendMessageType.voiceCall, friend.walletAddress, 0, "", true, null, 0, false);
+            Node.addMessageWithType(currentCallSessionId, FriendMessageType.voiceCall, friend.walletAddress, 0, "", true, null, 0, false);
             ((SpixiContentPage)Application.Current.MainPage.Navigation.NavigationStack.Last()).displayCallBar(currentCallSessionId, SpixiLocalization._SL("global-call-dialing") + " " + friend.nickname + "...", 0);
 
             aquirePowerLocks();