- fixed QR scanner camera permission request issue on Windows desktop

ixian-platform · Sep 24, 2024 · 6123e36 · 6123e36
1 parent ac032d7
commit 6123e36
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/Spixi/Pages/Contacts/ContactNewPage.xaml.cs b/Spixi/Pages/Contacts/ContactNewPage.xaml.cs
@@ -106,7 +106,7 @@ public async void quickScan()
         {
             var scanPage = new ScanPage();
             scanPage.scanSucceeded += HandleScanSucceeded;
-            await Navigation.PushModalAsync(scanPage);
+            await Navigation.PushAsync(scanPage, Config.defaultXamarinAnimations);
         }
 
         public void processQRResult(string result)

diff --git a/Spixi/Pages/Home/HomePage.xaml.cs b/Spixi/Pages/Home/HomePage.xaml.cs
@@ -404,7 +404,7 @@ public async void quickScan()
         {
             var scanPage = new ScanPage();
             scanPage.scanSucceeded += HandleScanSucceeded;
-            await Navigation.PushModalAsync(scanPage);
+            await Navigation.PushAsync(scanPage, Config.defaultXamarinAnimations);
         }
         private void HandleScanSucceeded(object sender, SPIXI.EventArgs<string> e)
         {

diff --git a/Spixi/Pages/Launch/LaunchRestorePage.xaml.cs b/Spixi/Pages/Launch/LaunchRestorePage.xaml.cs
@@ -4,13 +4,9 @@
 using SPIXI.Interfaces;
 using SPIXI.Lang;
 using SPIXI.Meta;
-using System;
-using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using System.Text;
 using System.Web;
-using IFilePicker = SPIXI.Interfaces.IFilePicker;
 
 namespace SPIXI
 {
@@ -168,6 +164,8 @@ private bool restoreAccountFile(string source_path, string pass)
                 }
                 Directory.Delete(Path.Combine(Config.spixiUserFolder, "Acc"), true);
                 Directory.Move(Path.Combine(tmpDirectory, "Acc"), Path.Combine(Config.spixiUserFolder, "Acc"));
+//                Directory.Delete(Path.Combine(Config.spixiUserFolder, "Chats"), true);
+//                Directory.Move(Path.Combine(tmpDirectory, "Chats"), Path.Combine(Config.spixiUserFolder, "Chats"));
                 if (File.Exists(Path.Combine(tmpDirectory, "account.ixi")))
                 {
                     File.Move(Path.Combine(tmpDirectory, "account.ixi"), Path.Combine(Config.spixiUserFolder, "account.ixi"));

diff --git a/Spixi/Pages/Scan/ScanPage.xaml.cs b/Spixi/Pages/Scan/ScanPage.xaml.cs
@@ -26,7 +26,6 @@ private void onNavigated(object sender, WebNavigatedEventArgs e)
 
     private void onLoad()
     {
-        //Utils.sendUiCommand(webView, "setAddress", wallet_to_add);
     }
 
     private void onNavigating(object sender, WebNavigatingEventArgs e)
@@ -45,8 +44,7 @@ private void onNavigating(object sender, WebNavigatingEventArgs e)
         }
         else if (current_url.Equals("ixian:back", StringComparison.Ordinal))
         {
-            Navigation.PopModalAsync(Config.defaultXamarinAnimations);
-            GC.Collect();
+            OnBackButtonPressed();
         }
         else if (current_url.Equals("ixian:error", StringComparison.Ordinal))
         {
@@ -86,14 +84,14 @@ public void processQRResult(string text)
         {
             allowScanning = false;
             scanSucceeded(this, new SPIXI.EventArgs<string>(wal));
-            Navigation.PopModalAsync(Config.defaultXamarinAnimations);
+            OnBackButtonPressed();
         }
     }
 
     protected override bool OnBackButtonPressed()
     {
         Navigation.PopAsync(Config.defaultXamarinAnimations);
-
+        GC.Collect();
         return true;
     }
 

diff --git a/Spixi/Pages/Wallet/WalletSendPage.xaml.cs b/Spixi/Pages/Wallet/WalletSendPage.xaml.cs
@@ -211,7 +211,7 @@ public async void quickScan()
         {
             var scanPage = new ScanPage();
             scanPage.scanSucceeded += HandleScanSucceeded;
-            await Navigation.PushModalAsync(scanPage);
+            await Navigation.PushAsync(scanPage, Config.defaultXamarinAnimations);
         }
         public void processQRResult(string result)
         {