remove stale references to App.Store

fixes the NRE when opening the add contact page

Author: Trolldemorted

Signal-Windows/App.xaml.cs

@@ -35,7 +35,6 @@ sealed partial class App : Application
         public static string URL = "https://textsecure-service.whispersystems.org";
         public static SignalServiceUrl[] ServiceUrls = new SignalServiceUrl[] { new SignalServiceUrl(URL, null) };
         public static StorageFolder LocalCacheFolder = ApplicationData.Current.LocalCacheFolder;
-        public static SignalStore Store;
         public static bool MainPageActive = false;
         public static string USER_AGENT = "Signal-Windows";
         public static uint PREKEY_BATCH_SIZE = 100;

Signal-Windows/ViewModels/AddContactPageViewModel.cs

@@ -116,7 +116,7 @@ public async Task RefreshContacts(CancellationToken? cancellationToken = null)
             RefreshingContacts = true;
             Contacts.Clear();
             signalContacts.Clear();
-            SignalServiceAccountManager accountManager = new SignalServiceAccountManager(App.ServiceUrls, App.Store.Username, App.Store.Password, (int)App.Store.DeviceId, App.USER_AGENT);
+            SignalServiceAccountManager accountManager = new SignalServiceAccountManager(App.ServiceUrls, App.Handle.Store.Username, App.Handle.Store.Password, (int)App.Handle.Store.DeviceId, App.USER_AGENT);
             ContactStore contactStore = await ContactManager.RequestStoreAsync(ContactStoreAccessType.AllContactsReadOnly);
             List<PhoneContact> intermediateContacts = new List<PhoneContact>();
             if (contactStore != null)

Signal-Windows/ViewModels/FinishRegistrationPageViewModel.cs

@@ -45,7 +45,6 @@ await Task.Run(() =>
                     LibsignalDBContext.SaveOrUpdateSignalStore(store);
                     Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
-                        App.Store = store;
                         App.Handle.Store = store;
                     }).AsTask().Wait();
 
@@ -57,7 +56,7 @@ await Task.Run(() =>
                     store = LibsignalDBContext.GetSignalStore();
                     Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
-                        App.Store = store;
+                        App.Handle.Store = store;
                     }).AsTask().Wait();
                 });
                 View.Frame.Navigate(typeof(MainPage));

Signal-Windows/ViewModels/LinkPageViewModel.cs

@@ -113,7 +113,6 @@ public async Task BeginLinking()
                     Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
                         UIEnabled = false;
-                        App.Store = store;
                         App.Handle.Store = store;
                     }).AsTask().Wait();
 
@@ -124,7 +123,6 @@ public async Task BeginLinking()
                     store = LibsignalDBContext.GetSignalStore();
                     Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
-                        App.Store = store;
                         App.Handle.Store = store;
                         View.Finish(true);
                     }).AsTask().Wait();