fix registration and linking, automatically remove dash from auth code

Properly release the handle when returning to the StartPage, properly reacquire it when finishing link/reg

Author: Trolldemorted

Signal-Windows.Lib/SignalLibHandle.cs

@@ -239,6 +239,11 @@ await Task.Run(() =>
                     }
                     Task.WaitAll(tasks.ToArray());
                     RecoverDownloads().Wait();
+                    Store = LibsignalDBContext.GetSignalStore();
+                    if (Store != null)
+                    {
+                        LikelyHasValidStore = true;
+                    }
                 });
                 if (LikelyHasValidStore)
                 {

Signal-Windows/App.xaml.cs

@@ -259,6 +259,7 @@ private async Task<bool> CreateMainWindow(string conversationId)
                     }
                     else
                     {
+                        Handle.Release();
                         rootFrame.Navigate(typeof(StartPage));
                     }
                     Window.Current.Activate();

Signal-Windows/ViewModels/FinishRegistrationPageViewModel.cs

@@ -27,7 +27,7 @@ await Task.Run(() =>
                 {
                     string SignalingKey = Base64.encodeBytes(Util.getSecretBytes(52));
                     App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.AccountManager.verifyAccountWithCode(
-                        App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.VerificationCode,
+                        App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.VerificationCode.Replace("-", ""),
                             SignalingKey, App.CurrentSignalWindowsFrontend(App.MainViewId).Locator.RegisterFinalizationPageInstance.SignalRegistrationId,
                             true);
                     SignalStore store = new SignalStore()
@@ -59,6 +59,8 @@ await Task.Run(() =>
                         App.Handle.Store = store;
                     }).AsTask().Wait();
                 });
+                var frontend = App.CurrentSignalWindowsFrontend(App.MainViewId);
+                await App.Handle.Reacquire();
                 View.Frame.Navigate(typeof(MainPage));
             }
             catch (Exception e)

Signal-Windows/ViewModels/LinkPageViewModel.cs

@@ -121,10 +121,10 @@ public async Task BeginLinking()
 
                     /* reload again with prekeys and their offsets */
                     store = LibsignalDBContext.GetSignalStore();
-                    Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+                    Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, async() =>
                     {
                         App.Handle.Store = store;
-                        View.Finish(true);
+                        await View.Finish(true);
                     }).AsTask().Wait();
                 });
                 await LinkingTask;

Signal-Windows/Views/LinkPage.xaml.cs

@@ -1,4 +1,5 @@
 using Signal_Windows.ViewModels;
+using System.Threading.Tasks;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using ZXing.Mobile;
@@ -53,16 +54,14 @@ public void SetQR(string qr)
             QRCode.Source = writer.Write(qr);
         }
 
-        public void Finish(bool success)
+        public async Task Finish(bool success)
         {
             if (success)
             {
+                var frontend = App.CurrentSignalWindowsFrontend(App.MainViewId);
+                await App.Handle.Reacquire();
                 Frame.Navigate(typeof(MainPage));
             }
         }
-
-        private void FinishButton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-        }
     }
 }