- client discovery optimizations

- push/local notifications improvements
- received indicator fixes
- other improvements

Author: IxiAngel

Spixi-PushService/Spixi-PushService.csproj

@@ -37,6 +37,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OneSignalSDK.DotNet" Version="5.2.1" />
+    <PackageReference Include="OneSignalSDK.DotNet" Version="5.2.2" />
   </ItemGroup>
 </Project>

Spixi/Interfaces/IPushService.cs

@@ -5,7 +5,8 @@ public interface IPushService
     {
         void initialize();
         void setTag(string tag);
-        void clearNotifications();
-        void showLocalNotification(string title, string message, string data);
+        void clearNotifications(int unreadCount);
+        void clearRemoteNotifications(int unreadCount);
+        void showLocalNotification(int messageId, string title, string message, string data, bool alert, int unreadCount);
     }
 }

Spixi/Meta/Node.cs

@@ -1,4 +1,5 @@
-using IXICore;
+using Force.Crc32;
+using IXICore;
 using IXICore.Inventory;
 using IXICore.Meta;
 using IXICore.Network;
@@ -278,14 +279,18 @@ static public void mainLoop()
 
             try
             {
+                bool fireLocalNotification = OperatingSystem.IsAndroid();
                 while (running)
                 {
                     try
                     {
                         PeerStorage.savePeersFile();
 
                         if (Config.enablePushNotifications)
-                            OfflinePushMessages.fetchPushMessages();
+                        {
+                            OfflinePushMessages.fetchPushMessages(false, fireLocalNotification, false);
+                            fireLocalNotification = false;
+                        }
 
                         // Update the friendlist
                         updateFriendStatuses();
@@ -357,7 +362,8 @@ static public void updateFriendStatuses()
 
                     if (presence != null)
                     {
-                        if (friend.online == false)
+                        if (friend.online == false
+                            && friend.relayNode != null)
                         {
                             friend.online = true;
                             UIHelpers.setContactStatus(friend.walletAddress, friend.online, friend.getUnreadMessageCount(), "", 0);
@@ -656,7 +662,7 @@ public override byte[] getBlockHash(ulong blockNum)
             return b.blockChecksum;
         }
 
-        public static FriendMessage addMessageWithType(byte[] id, FriendMessageType type, Address wallet_address, int channel, string message, bool local_sender = false, Address sender_address = null, long timestamp = 0, bool fire_local_notification = true, int payable_data_len = 0)
+        public static FriendMessage addMessageWithType(byte[] id, FriendMessageType type, Address wallet_address, int channel, string message, bool local_sender = false, Address sender_address = null, long timestamp = 0, bool fire_local_notification = true, bool alert = true, int payable_data_len = 0)
         {
             FriendMessage friend_message = FriendList.addMessageWithType(id, type, wallet_address, channel, message, local_sender, sender_address, timestamp, fire_local_notification, payable_data_len);
             if (friend_message != null)
@@ -706,7 +712,9 @@ public static FriendMessage addMessageWithType(byte[] id, FriendMessageType type
                                 if (friend.bot == false
                                     || (friend.metaData.botInfo != null && friend.metaData.botInfo.sendNotification))
                                 {
-                                    SPushService.showLocalNotification("Spixi", "New Message", friend.walletAddress.ToString());
+                                    int unreadCount = FriendList.getUnreadMessageCount();
+                                    SPushService.showLocalNotification((int)Crc32Algorithm.Compute(friend_message.id), "Spixi", "New Message", friend.walletAddress.ToString(), alert, unreadCount);
+                                    SPushService.clearRemoteNotifications(unreadCount);
                                 }
                             }
                         }

Spixi/Network/NetworkProtocol.cs

@@ -413,12 +413,16 @@ private static void handleUpdatePresence(byte[] data, RemoteEndpoint endpoint)
             if (f != null)
             {
                 var pa = p.addresses[0];
-                // TODO use actual wallet address once Presence hostname contains such address
-                f.relayNode = new Peer(pa.address, null, pa.lastSeenTime, 0, 0, 0);
-                f.updatedStreamingNodes = pa.lastSeenTime;
-                if (UIHelpers.isChatScreenDisplayed(f))
+                if (f.lastSeenTime < pa.lastSeenTime)
                 {
-                    StreamClientManager.connectTo(f.relayNode.hostname, f.relayNode.walletAddress);
+                    // TODO use actual wallet address once Presence hostname contains such address
+                    f.relayNode = new Peer(pa.address, null, pa.lastSeenTime, 0, 0, 0);
+                    f.updatedStreamingNodes = pa.lastSeenTime;
+                    f.lastSeenTime = pa.lastSeenTime;
+                    if (UIHelpers.isChatScreenDisplayed(f))
+                    {
+                        StreamClientManager.connectTo(f.relayNode.hostname, f.relayNode.walletAddress);
+                    }
                 }
             }
         }
@@ -444,12 +448,16 @@ private static void handleKeepAlivePresence(byte[] data, RemoteEndpoint endpoint
             if (f != null)
             {
                 var pa = p.addresses[0];
-                // TODO use actual wallet address once Presence hostname contains such address
-                f.relayNode = new Peer(pa.address, null, pa.lastSeenTime, 0, 0, 0);
-                f.updatedStreamingNodes = pa.lastSeenTime;
-                if (UIHelpers.isChatScreenDisplayed(f))
+                if (f.lastSeenTime < pa.lastSeenTime)
                 {
-                    StreamClientManager.connectTo(f.relayNode.hostname, f.relayNode.walletAddress);
+                    // TODO use actual wallet address once Presence hostname contains such address
+                    f.relayNode = new Peer(pa.address, null, pa.lastSeenTime, 0, 0, 0);
+                    f.updatedStreamingNodes = pa.lastSeenTime;
+                    f.lastSeenTime = pa.lastSeenTime;
+                    if (UIHelpers.isChatScreenDisplayed(f))
+                    {
+                        StreamClientManager.connectTo(f.relayNode.hostname, f.relayNode.walletAddress);
+                    }
                 }
             }
         }
@@ -522,7 +530,7 @@ static void handleSectorNodes(byte[] data, RemoteEndpoint endpoint)
             var friends = FriendList.getFriendsBySectorPrefix(prefix);
             foreach(var friend in friends)
             {
-                friend.updatedSectorNodes = Clock.getNetworkTimestamp();
+                friend.updatedSectorNodes = Clock.getTimestamp();
                 friend.sectorNodes = peers;
             }
         }

Spixi/Network/StreamProcessor.cs

@@ -177,9 +177,9 @@ public static void handleFileFullyReceived(Address sender, SpixiMessage data)
         }*/
 
         // Called when receiving S2 data from clients
-        public override ReceiveDataResponse receiveData(byte[] bytes, RemoteEndpoint endpoint, bool fireLocalNotification = true)
+        public override ReceiveDataResponse receiveData(byte[] bytes, RemoteEndpoint endpoint, bool fireLocalNotification = true, bool alert = true)
         {
-            ReceiveDataResponse rdr = base.receiveData(bytes, endpoint, fireLocalNotification);
+            ReceiveDataResponse rdr = base.receiveData(bytes, endpoint);
             if (rdr == null)
             {
                 return rdr;
@@ -377,7 +377,7 @@ public override ReceiveDataResponse receiveData(byte[] bytes, RemoteEndpoint end
                         break;
 
                     case SpixiMessageCode.chat:
-                        Node.addMessageWithType(message.id, FriendMessageType.standard, sender_address, spixi_message.channel, Encoding.UTF8.GetString(spixi_message.data), false, real_sender_address, message.timestamp, fireLocalNotification);
+                        Node.addMessageWithType(message.id, FriendMessageType.standard, sender_address, spixi_message.channel, Encoding.UTF8.GetString(spixi_message.data), false, real_sender_address, message.timestamp, fireLocalNotification, alert, 0);
                         break;
 
                     case SpixiMessageCode.msgReceived:
@@ -580,7 +580,7 @@ private static void handleAppRequest(byte[] messageId, Address sender_address, A
                         {
                             if (VoIPManager.onReceivedCall(friend, app_data.sessionId, app_data.data))
                             {
-                                Node.addMessageWithType(app_data.sessionId, FriendMessageType.voiceCall, sender_address, 0, "");
+                                Node.addMessageWithType(messageId, FriendMessageType.voiceCall, sender_address, 0, "");
                             }
                             UIHelpers.refreshAppRequests = true;
                         }

Spixi/Pages/Chat/SingleChatPage.xaml.cs

@@ -538,15 +538,17 @@ private void onLoad()
                     Preferences.Default.Set("rating_action", "show");
                 }
 
-                if (FriendList.getUnreadMessageCount() == 0)
+                int unreadCount = FriendList.getUnreadMessageCount();
+                if (unreadCount == 0)
                 {
-                    SPushService.clearNotifications();
+                    SPushService.clearNotifications(unreadCount);
                 }
             });
         }
 
         public void onSend(string str)
         {
+            str = str.Trim(new char[] { ' ', '\t', '\r', '\n' });
             if (str.Length < 1)
             {
                 return;
@@ -575,7 +577,7 @@ public void onSend(string str)
             byte[] spixi_msg_bytes = spixi_message.getBytes();
 
             // store the message and display it
-            FriendMessage friend_message = Node.addMessageWithType(null, FriendMessageType.standard, friend.walletAddress, selectedChannel, str, true, null, 0, true, spixi_msg_bytes.Length);
+            FriendMessage friend_message = Node.addMessageWithType(null, FriendMessageType.standard, friend.walletAddress, selectedChannel, str, true, null, 0, true, true, spixi_msg_bytes.Length);
 
             // Finally, clear the input field
             Utils.sendUiCommand(this, "clearInput");
@@ -1647,9 +1649,10 @@ public override void onResume()
 
             updateMessagesReadStatus();
 
-            if (FriendList.getUnreadMessageCount() == 0)
+            int unreadCount = FriendList.getUnreadMessageCount();
+            if (unreadCount == 0)
             {
-                SPushService.clearNotifications();
+                SPushService.clearNotifications(unreadCount);
             }
         }
     }

Spixi/Pages/Home/HomePage.xaml.cs

@@ -1177,7 +1177,7 @@ public override void updateScreen()
                 Node.changedSettings = false;
             }
 
-            SPushService.clearNotifications();
+            SPushService.clearNotifications(FriendList.getUnreadMessageCount());
         }
 
         private void onUpdateUI(/*object source, ElapsedEventArgs e*/)

Spixi/Platforms/Android/MainActivity.cs

@@ -37,7 +37,7 @@ public class MainActivity : MauiAppCompatActivity
 
     public TaskCompletionSource<SpixiImageData> PickImageTaskCompletionSource { set; get; }
     internal static MainActivity Instance { get; private set; }
-    protected override void OnCreate(Bundle bundle)
+    protected override void OnCreate(Bundle? bundle)
     {
         Instance = this;
 
@@ -68,7 +68,7 @@ protected override void OnCreate(Bundle bundle)
         handleNotificationIntent(Intent);
     }
 
-    protected override void OnActivityResult(int requestCode, Result resultCode, Intent intent)
+    protected override void OnActivityResult(int requestCode, Result resultCode, Intent? intent)
     {
         base.OnActivityResult(requestCode, resultCode, intent);
 
@@ -113,7 +113,7 @@ private void SaveFileToUri(Android.Net.Uri uri, string filePath)
         }
     }
 
-    protected override void OnNewIntent(Intent intent)
+    protected override void OnNewIntent(Intent? intent)
     {
         base.OnNewIntent(intent);
 
@@ -124,11 +124,11 @@ protected override void OnNewIntent(Intent intent)
         });
     }
 
-    void handleNotificationIntent(Intent intent)
+    void handleNotificationIntent(Intent? intent)
     {
         if (intent?.Extras != null && intent.Extras.ContainsKey("fa"))
         {
-            string chatId = intent.Extras.GetString("fa");
+            string? chatId = intent.Extras.GetString("fa");
             if (!string.IsNullOrEmpty(chatId))
             {
                 App.startingScreen = chatId;
@@ -140,7 +140,7 @@ void handleNotificationIntent(Intent intent)
     // Fix Edge to Edge
     private class InsetsListener : Java.Lang.Object, AndroidX.Core.View.IOnApplyWindowInsetsListener
     {
-        public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
+        public WindowInsetsCompat? OnApplyWindowInsets(View? v, WindowInsetsCompat? insets)
         {
             // Get system bars (status + navigation) and IME (keyboard) insets
             var sysInsets = insets.GetInsets(WindowInsetsCompat.Type.SystemBars());
@@ -156,9 +156,9 @@ public WindowInsetsCompat OnApplyWindowInsets(View v, WindowInsetsCompat insets)
         }
 
         // Optional override for older Android versions
-        public WindowInsets OnApplyWindowInsets(View v, WindowInsets insets)
+        public WindowInsets? OnApplyWindowInsets(View? v, WindowInsets? insets)
         {
-            return v.OnApplyWindowInsets(insets);
+            return v?.OnApplyWindowInsets(insets);
         }
     }