- improved shutdown/resume handling on mobiles

IxiAngel · IxiAngel · commit 5e2c77bec690 · 2025-08-10T02:04:30.000+02:00
- fixed switching between external and internal screens on Android
- improved new version notification
diff --git a/Spixi/App.xaml.cs b/Spixi/App.xaml.cs
@@ -23,8 +23,6 @@ public static App Instance(bool force_redraw = false)
     }
     public static bool isInForeground { get; set; } = false;
 
-    Node node = null;
-
     public static Window appWindow { get; private set; } = null;
 
     public static string startingScreen = ""; // Which screen to start on
@@ -122,9 +120,9 @@ public App()
 
                 UIHelpers.reloadAllPages();
             };
-            
+
             // Start Ixian code
-            node = new Node();
+            _ = new Node();
 
             // Attempt to load a pre-existing wallet
             bool wallet_found = Node.checkForExistingWallet();
@@ -171,7 +169,6 @@ public App()
         else
         {
             // Already started before
-            node = Node.Instance;
         }
     }
 
@@ -223,11 +220,6 @@ protected override Window CreateWindow(IActivationState activationState)
             window.Title = "Spixi IM";
             if (appWindow == null)
             {
-                window.Destroying += (s, e) =>
-                {
-                    Shutdown();
-                };
-
                 window.Resumed += (s, e) =>
                 {
                     if (Config.enablePushNotifications && IxianHandler.wallets.Count > 0)
@@ -240,12 +232,19 @@ protected override Window CreateWindow(IActivationState activationState)
         return window;
     }
 
-    public static void Shutdown()
+    public static async Task Shutdown()
     {
-        IxianHandler.shutdown();
-        while (IxianHandler.status != NodeStatus.stopped)
+        try
         {
-            Thread.Sleep(10);
+            IxianHandler.shutdown();
+            while (IxianHandler.status != NodeStatus.stopped)
+            {
+                await Task.Delay(10);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.error("Exception during Shutdown: {0}", ex);
         }
     }
 
@@ -276,4 +275,30 @@ private static void CurrentDomainOnUnhandledException(object sender, UnhandledEx
         }
     }
 
+    public static void EnsureNodeRunning()
+    {
+        try
+        {
+            if (Instance == null)
+            {
+                Logging.info("EnsureNodeRunning: Node.Instance is null, creating new Node");
+                _ = new Node();
+            }
+            else if (IxianHandler.status == NodeStatus.stopped)
+            {
+                Logging.info("EnsureNodeRunning: Node exists but is stopped");
+                //preStart();
+                //start();
+            }
+            else
+            {
+                Logging.info("EnsureNodeRunning: Node is already running");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.error("EnsureNodeRunning exception: {0}", ex);
+        }
+    }
+
 }
diff --git a/Spixi/MauiProgram.cs b/Spixi/MauiProgram.cs
@@ -1,34 +1,106 @@
-﻿using CommunityToolkit.Maui;
+﻿#if ANDROID
+    using Android.App;
+    using Android.OS;
+#endif
+
+using CommunityToolkit.Maui;
+using IXICore.Meta;
 using Microsoft.Maui.Controls.Compatibility.Hosting;
-using Microsoft.Maui.Handlers;
+using Microsoft.Maui.LifecycleEvents;
 
 namespace Spixi;
 
 public static class MauiProgram
 {
-	public static MauiApp CreateMauiApp()
-	{
-		var builder = MauiApp.CreateBuilder();
-		builder
-			.UseMauiApp<App>()
+    public static MauiApp CreateMauiApp()
+    {
+        var builder = MauiApp.CreateBuilder();
+        builder
+            .UseMauiApp<App>()
             .UseMauiCompatibility()
             .UseMauiCommunityToolkit()
             .ConfigureFonts(fonts =>
-			{
-				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-			})
+            {
+                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+            })
             .ConfigureMauiHandlers((handlers) =>
             {
 #if ANDROID
                 //handlers.AddHandler(typeof(WebView), typeof(Spixi.Platforms.Android.Renderers.MyWebViewHandler));
-				handlers.AddCompatibilityRenderer(typeof(WebView), typeof(Spixi.Platforms.Android.Renderers.SpixiWebviewRenderer2));
+                handlers.AddCompatibilityRenderer(typeof(WebView), typeof(Spixi.Platforms.Android.Renderers.SpixiWebviewRenderer2));
 #endif
+
 #if IOS
                 handlers.AddHandler(typeof(WebView), typeof(Spixi.Platforms.iOS.iOSWebViewHandler));
+#endif
+            })
+            .ConfigureLifecycleEvents(events =>
+            {
+#if ANDROID
+                events.AddAndroid(android =>
+                {
+                    // Shutdown logic
+                    android.OnDestroy(async (activity) =>
+                    {
+                        if (!activity.IsChangingConfigurations)
+                        {
+                            Logging.info("Android OnDestroy real exit, shutting down Node");
+                            await App.Shutdown();
+                        }
+                        else
+                        {
+                            Logging.info("Android OnDestroy ignored due to IsChangingConfigurations=true");
+                        }
+                    });
+
+                    // Restart logic when activity comes back to foreground
+                    android.OnResume((activity) =>
+                    {
+                        Logging.info("Android OnResume - ensuring Node is running");
+                        App.isInForeground = true;
+                        App.EnsureNodeRunning();
+                    });
+                });
+#endif
+
+#if IOS
+                events.AddiOS(ios =>
+                {
+                    ios.WillTerminate(async (app) =>
+                    {
+                        Logging.info("iOS WillTerminate shutting down Node");
+                        await App.Shutdown();
+                    });
+
+                    ios.OnActivated((app) =>
+                    {
+                        Logging.info("iOS OnActivated ensuring Node is running");
+                        App.isInForeground = true;
+                        App.EnsureNodeRunning();
+                    });
+                });
+#endif
+
+#if WINDOWS
+                events.AddWindows(windows =>
+                {
+                    windows.OnClosed(async (window, args) =>
+                    {
+                        Logging.info("Windows OnWindowClosed - shutting down Node");
+                        await App.Shutdown();
+                    });
+
+                    windows.OnWindowCreated((window) =>
+                    {
+                        Logging.info("Windows OnWindowCreated - ensuring Node is running");
+                        App.isInForeground = true;
+                        App.EnsureNodeRunning();
+                    });
+                });
 #endif
             });
 
-		return builder.Build();
-	}
+        return builder.Build();
+    }
 }
diff --git a/Spixi/Meta/Config.cs b/Spixi/Meta/Config.cs
@@ -33,7 +33,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.9"; // Spixi version
+        public static readonly string version = "spixi-0.9.10-dev"; // Spixi version
 
         public static readonly string checkVersionUrl = "https://resources.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
@@ -68,6 +68,10 @@ public Node()
             networkClientManagerStatic = new NetworkClientManagerStatic(Config.maxRelaySectorNodesToConnectTo);
             NetworkClientManager.init(networkClientManagerStatic);
 
+            // Prepare the stream processor
+            StreamCapabilities caps = StreamCapabilities.Incoming | StreamCapabilities.Outgoing | StreamCapabilities.IPN | StreamCapabilities.Apps;
+            streamProcessor = new StreamProcessor(new SpixiPendingMessageProcessor(Config.spixiUserFolder, Config.enablePushNotifications), caps);
+
             // Init TIV
             tiv = new TransactionInclusion(new SpixiTransactionInclusionCallbacks(), false);
 
@@ -81,13 +85,21 @@ public Node()
 
             FriendList.init(Config.spixiUserFolder);
 
-            Logging.info("Node init done");
+            UpdateVerify.init(Config.checkVersionUrl, Config.checkVersionSeconds);
+
+            OfflinePushMessages.init(Config.pushServiceUrl, streamProcessor);
 
             string backup_file_name = Path.Combine(Config.spixiUserFolder, "spixi.account.backup.ixi");
             if (File.Exists(backup_file_name))
             {
                 File.Delete(backup_file_name);
             }
+
+            InventoryCache.init(new InventoryCacheClient(tiv));
+
+            RelaySectors.init(CoreConfig.relaySectorLevels, null);
+
+            Logging.info("Node init done");
         }
 
         static public void preStart()
@@ -96,12 +108,6 @@ static public void preStart()
             IxianHandler.localStorage.start();
 
             FriendList.loadContacts();
-
-            // Prepare the stream processor
-            StreamCapabilities caps = StreamCapabilities.Incoming | StreamCapabilities.Outgoing | StreamCapabilities.IPN | StreamCapabilities.Apps;
-            streamProcessor = new StreamProcessor(new SpixiPendingMessageProcessor(Config.spixiUserFolder, Config.enablePushNotifications), caps);
-
-            OfflinePushMessages.init(Config.pushServiceUrl, streamProcessor);
         }
 
         static public void start()
@@ -114,7 +120,6 @@ static public void start()
 
             running = true;
 
-            UpdateVerify.init(Config.checkVersionUrl, Config.checkVersionSeconds);
             UpdateVerify.start();
 
             ulong block_height = 0;
@@ -147,9 +152,7 @@ static public void start()
             // Start the network queue
             NetworkQueue.start();
 
-            InventoryCache.init(new InventoryCacheClient(tiv));
-
-            RelaySectors.init(CoreConfig.relaySectorLevels, null);
+            streamProcessor.start();
 
             // Start the keepalive thread
             PresenceList.startKeepAlive();
@@ -387,7 +390,7 @@ static public void stop()
             running = false;
 
             // Stop the stream processor
-            streamProcessor.uninitialize();
+            streamProcessor.stop();
 
             IxianHandler.localStorage.stop();
 
diff --git a/Spixi/Pages/Chat/SingleChatPage.xaml.cs b/Spixi/Pages/Chat/SingleChatPage.xaml.cs
@@ -495,6 +495,10 @@ private void onLoad()
             }
 
             UIHelpers.refreshAppRequests = true;
+            warningDisplayed = false;
+            unreadIndicatorDisplayed = false;
+            setNickname = "";
+            setOnlineStatus = false;
 
             // Execute timer-related functionality immediately
             updateScreen();
@@ -508,8 +512,15 @@ private void onLoad()
                 }
             }
 
-            webView.FadeTo(1, 150);
-            webView.Focus();
+            try
+            {
+                webView.FadeTo(1, 150);
+                webView.Focus();
+            }
+            catch (Exception ex)
+            {
+                Logging.warn("Exception: " + ex);
+            }
 
             Task.Run(() =>
             {
diff --git a/Spixi/Pages/Home/HomePage.xaml.cs b/Spixi/Pages/Home/HomePage.xaml.cs
diff --git a/Spixi/Pages/Wallet/WalletSentPage.xaml.cs b/Spixi/Pages/Wallet/WalletSentPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -495,6 +495,10 @@ private void onLoad()`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`UIHelpers.refreshAppRequests = true;`
	`498`	`+ warningDisplayed = false;`
	`499`	`+ unreadIndicatorDisplayed = false;`
	`500`	`+ setNickname = "";`
	`501`	`+ setOnlineStatus = false;`
`498`	`502`
`499`	`503`	`// Execute timer-related functionality immediately`
`500`	`504`	`updateScreen();`
`@@ -508,8 +512,15 @@ private void onLoad()`
`508`	`512`	`}`
`509`	`513`	`}`
`510`	`514`
`511`		`- webView.FadeTo(1, 150);`
`512`		`- webView.Focus();`
	`515`	`+ try`
	`516`	`+ {`
	`517`	`+ webView.FadeTo(1, 150);`
	`518`	`+ webView.Focus();`
	`519`	`+ }`
	`520`	`+ catch (Exception ex)`
	`521`	`+ {`
	`522`	`+ Logging.warn("Exception: " + ex);`
	`523`	`+ }`
`513`	`524`
`514`	`525`	`Task.Run(() =>`
`515`	`526`	`{`