spixi-0.9.4

- updated to latest IXI Core - improved notifications
ProjectIxian · Jan 30, 2025 · 887021b · 887021b
1 parent f069514
commit 887021b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/Spixi/App.xaml.cs b/Spixi/App.xaml.cs
@@ -221,6 +221,13 @@ protected override Window CreateWindow(IActivationState activationState)
                 {
                     Shutdown();
                 };
+
+                window.Resumed += (s, e) =>
+                {
+                    if (Config.enablePushNotifications)
+                        OfflinePushMessages.fetchPushMessages(true);
+                };
+
                 appWindow = window;
             }
         }

diff --git a/Spixi/Data/OfflinePushMessages.cs b/Spixi/Data/OfflinePushMessages.cs
@@ -59,7 +59,7 @@ public static bool sendPushMessage(StreamMessage msg, bool push)
             return false;
         }
 
-        public static bool fetchPushMessages(bool force = false)
+        public static bool fetchPushMessages(bool force = false, bool fireLocalNotification = false)
         {
             if(force == false && lastUpdate + cooldownPeriod > Clock.getTimestamp())
             {
@@ -128,7 +128,7 @@ public static bool fetchPushMessages(bool force = false)
                                         f.setPublicKey(pk);
                                     }
                                 }
-                                StreamProcessor.receiveData(data, null);
+                                StreamProcessor.receiveData(data, null, fireLocalNotification);
                             }
                         }
                         catch (Exception e)

diff --git a/Spixi/Meta/Config.cs b/Spixi/Meta/Config.cs
@@ -32,7 +32,7 @@ public class Config
         public static readonly int packetDataSize = 102400; // 100 Kb per packet for file transfers
         public static readonly long packetRequestTimeout = 60; // Time in seconds to re-request packets
 
-        public static readonly string version = "spixi-0.9.3"; // Spixi version
+        public static readonly string version = "spixi-0.9.4"; // Spixi version
 
         public static readonly string checkVersionUrl = "https://www.ixian.io/spixi-update.txt";
         public static readonly int checkVersionSeconds = 1 * 60 * 60; // 1 hour

diff --git a/Spixi/Meta/Node.cs b/Spixi/Meta/Node.cs
@@ -532,7 +532,7 @@ public override Block getBlockHeader(ulong blockNum)
             return BlockHeaderStorage.getBlockHeader(blockNum);
         }
 
-        public override IxiNumber getMinSignerPowDifficulty(ulong blockNum, long curBlockTimestamp)
+        public override IxiNumber getMinSignerPowDifficulty(ulong blockNum, int curBlockVersion, long curBlockTimestamp)
         {
             // TODO TODO implement this properly
             return ConsensusConfig.minBlockSignerPowDifficulty;

diff --git a/Spixi/Network/StreamProcessor.cs b/Spixi/Network/StreamProcessor.cs
@@ -371,7 +371,7 @@ public static void handleMsgRead(Address sender, int channel, byte[] msg_id)
         }*/
 
         // Called when receiving S2 data from clients
-        public static void receiveData(byte[] bytes, RemoteEndpoint endpoint)
+        public static void receiveData(byte[] bytes, RemoteEndpoint endpoint, bool fireLocalNotification = true)
         {
             if(running == false)
             {
@@ -528,7 +528,7 @@ public static void receiveData(byte[] bytes, RemoteEndpoint endpoint)
                             else
                             {*/
                             // Add the message to the friend list
-                            FriendMessage fm = FriendList.addMessage(message.id, sender_address, spixi_message.channel, Encoding.UTF8.GetString(spixi_message.data), real_sender_address, message.timestamp);
+                            FriendMessage fm = FriendList.addMessage(message.id, sender_address, spixi_message.channel, Encoding.UTF8.GetString(spixi_message.data), real_sender_address, message.timestamp, fireLocalNotification);
                             //}
                         }
                         break;

diff --git a/Spixi/Platforms/Android/SPushService.cs b/Spixi/Platforms/Android/SPushService.cs
@@ -109,14 +109,12 @@ static void handleNotificationReceived(object sender, OneSignalSDK.DotNet.Core.N
         {
             e.PreventDefault();
 
-            if (App.isInForeground)
-                return;
-
-            if (OfflinePushMessages.fetchPushMessages(true))
+            if (OfflinePushMessages.fetchPushMessages(true, true))
             {
                 //OneSignal.Current.ClearAndroidOneSignalNotifications();
-                //return;
+                return;
             }
+
             e.Notification.display();
         }
 

diff --git a/Spixi/Platforms/Windows/Package.appxmanifest b/Spixi/Platforms/Windows/Package.appxmanifest
@@ -5,7 +5,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="com.ixilabs.spixi" Publisher="CN=ixiandev" Version="0.9.3.0" />
+  <Identity Name="com.ixilabs.spixi" Publisher="CN=ixiandev" Version="0.9.4.0" />
 
   <Properties>
     <DisplayName>Spixi</DisplayName>

diff --git a/Spixi/Platforms/iOS/Info.plist b/Spixi/Platforms/iOS/Info.plist
@@ -44,9 +44,9 @@
 	<key>NSFaceIDUsageDescription</key>
 	<string>Biometric authentication for unlocking the app</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.3</string>
+	<string>0.9.4</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.3</string>
+	<string>0.9.4</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>

diff --git a/Spixi/Spixi.csproj b/Spixi/Spixi.csproj
@@ -26,8 +26,8 @@
 		<ApplicationId>com.ixilabs.spixi</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>0.9.3</ApplicationDisplayVersion>
-		<ApplicationVersion>160000930</ApplicationVersion>
+		<ApplicationDisplayVersion>0.9.4</ApplicationDisplayVersion>
+		<ApplicationVersion>160000940</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>