Merge branch 'master' into redesign

Author: golf1052

Signal-Windows/Controls/VirtualizedMessagesCollection.cs

@@ -1,4 +1,4 @@
-using Signal_Windows.Models;
+using Signal_Windows.Models;
 using Signal_Windows.Storage;
 using System;
 using System.Collections;
@@ -67,16 +67,28 @@ public object this[int index]
 
         public object SyncRoot => this;
 
+        /// <summary>
+        /// "Adds" a SignalMessageContainer to this virtualized collection.</summary>
+        /// <remarks>
+        /// The method may (if incoming) or may not (if outgoing) already be present in the database, so we explicitly insert at the correct position in the cache line.
+        /// Count is mapped to the SignalConversation's MessagesCount, so callers must update appropriately before calling this method, and no async method must be called in between.</remarks>
+        /// <param name="value">The object to add to the VirtualizedMessagesCollection.</param>
+        /// <returns>The position into which the new element was inserted, or -1 to indicate that the item was not inserted into the collection.</returns>
         public int Add(object value)
         {
             var message = value as SignalMessageContainer;
             int inpageIndex = message.Index % PAGE_SIZE;
             int pageIndex = GetPageIndex(message.Index);
+            Debug.WriteLine($"VirtualizedCollection.Add Id={message.Message.Id} Index={message.Index} PageIndex={pageIndex} InpageIndex={inpageIndex} ");
             if (!Cache.ContainsKey(pageIndex))
             {
                 Cache[pageIndex] = SignalDBContext.GetMessagesLocked(Conversation, pageIndex * PAGE_SIZE, PAGE_SIZE);
             }
-            Cache[pageIndex].Add(message);
+            Cache[pageIndex].Insert(inpageIndex, message);
+            if (Cache[pageIndex].IndexOf(message) != inpageIndex  || message.Index != Count-1)
+            {
+                throw new InvalidOperationException("VirtualizedCollection is in an inconsistent state!");
+            }
             CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, message, message.Index));
             return message.Index;
         }

Signal-Windows/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="d77d01c7-0786-44e4-9ef4-dd3cde64124b" Publisher="CN=Benni" Version="0.1.8.0" />
+  <Identity Name="d77d01c7-0786-44e4-9ef4-dd3cde64124b" Publisher="CN=Benni" Version="0.1.9.0" />
   <mp:PhoneIdentity PhoneProductId="d77d01c7-0786-44e4-9ef4-dd3cde64124b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Signal-Windows</DisplayName>

Signal-Windows/Signal-Windows.csproj

@@ -18,7 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <PackageCertificateKeyFile>Signal-Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <PackageCertificateThumbprint>853DF1D4DABC27DEEF062DB83D09285BAF95B526</PackageCertificateThumbprint>

Signal-Windows/Storage/DB.cs

@@ -780,6 +780,7 @@ public static void SaveMessageLocked(SignalMessage message)
 
         public static List<SignalMessageContainer> GetMessagesLocked(SignalConversation thread, int startIndex, int count)
         {
+            Debug.WriteLine($"GetMessagesLocked {thread.ThreadId} Skip({startIndex}) Take({count})");
             lock (DBLock)
             {
                 using (var ctx = new SignalDBContext())
@@ -793,7 +794,7 @@ public static List<SignalMessageContainer> GetMessagesLocked(SignalConversation
                         .Skip(startIndex)
                         .Take(count);
 
-                    var containers = new List<SignalMessageContainer>();
+                    var containers = new List<SignalMessageContainer>(count);
                     foreach (var message in messages)
                     {
                         containers.Add(new SignalMessageContainer(message, startIndex));

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -51,10 +51,10 @@ public bool ThreadListAlignRight
         private AsyncLock ActionInProgress = new AsyncLock();
         public MainPage View;
         public SignalConversation SelectedThread;
-        private volatile bool Running = true;
+        private volatile bool Running = false;
         private Task IncomingMessagesTask;
         private Task OutgoingMessagesTask;
-        private CancellationTokenSource CancelSource;
+        private CancellationTokenSource CancelSource = new CancellationTokenSource();
         private SignalServiceMessagePipe Pipe;
         private SignalServiceMessageSender MessageSender;
         private SignalServiceMessageReceiver MessageReceiver;
@@ -113,13 +113,22 @@ public MainPageViewModel()
             App.MainPageActive = true;
         }
 
+        public async Task OnNavigatedTo()
+        {
+            if (!Running)
+            {
+                await Init();
+            }
+        }
+
         public async Task Init()
         {
-            CancelSource = new CancellationTokenSource();
             Debug.WriteLine("Init lock wait");
             using (await ActionInProgress.LockAsync(CancelSource.Token))
             {
                 Debug.WriteLine("Init lock grabbed");
+                Running = true;
+                CancelSource = new CancellationTokenSource();
                 try
                 {
                     await Task.Run(async () =>
@@ -184,6 +193,8 @@ await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatch
                 catch (AuthorizationFailedException)
                 {
                     Debug.WriteLine("OWS server rejected our credentials - redirecting to StartPage");
+                    Running = false;
+                    CancelSource.Cancel();
                     View.Frame.Navigate(typeof(StartPage));
                 }
                 catch (Exception e)
@@ -203,11 +214,11 @@ public async Task OnNavigatingFrom()
 
         public async Task Shutdown()
         {
-            Running = false;
-            App.MainPageActive = false;
             Debug.WriteLine("Shutdown lock await");
             using (await ActionInProgress.LockAsync())
             {
+                Running = false;
+                App.MainPageActive = false;
                 Debug.WriteLine("Shutdown lock grabbed");
                 CancelSource.Cancel();
                 await IncomingMessagesTask;
@@ -370,7 +381,6 @@ public async Task UIHandleIncomingMessage(SignalMessage message)
             {
                 Debug.WriteLine("incoming lock grabbed");
                 var thread = ThreadsDictionary[message.ThreadId];
-                thread.MessagesCount += 1;
                 uint unreadCount = thread.UnreadCount;
                 if (SelectedThread == thread)
                 {
@@ -381,6 +391,7 @@ await Task.Run(() =>
                     SignalDBContext.SaveMessageLocked(message);
                 });
                 long? seenId = null;
+                thread.MessagesCount += 1;
                 if (SelectedThread == thread)
                 {
                     var container = new SignalMessageContainer(message, (int) thread.MessagesCount - 1);

Signal-Windows/Views/MainPage.xaml.cs

@@ -90,7 +90,7 @@ public PageStyle GetCurrentViewStyle()
         protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
             base.OnNavigatedTo(e);
-            await Vm.Init();
+            await Vm.OnNavigatedTo();
         }
 
         protected override async void OnNavigatingFrom(NavigatingCancelEventArgs e)