Merge branch 'ShelbyBoss-fix_add_attchment_mobile'

Author: golf1052

Signal-Windows.Lib/Migrations/SignalDB/20210305185855_m7.Designer.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Signal_Windows.Migrations
+{
+    public partial class m7 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DraftFileTokens",
+                table: "SignalConversation",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DraftFileTokens",
+                table: "SignalConversation");
+        }
+    }
+}

Signal-Windows.Lib/Migrations/SignalDB/20210305185855_m7.cs

@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Signal_Windows.Storage;
+using Signal_Windows.Models;
 
 namespace Signal_Windows.Migrations
 {
@@ -13,7 +14,7 @@ partial class SignalDBContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
             modelBuilder
-                .HasAnnotation("ProductVersion", "1.1.4");
+                .HasAnnotation("ProductVersion", "1.1.5");
 
             modelBuilder.Entity("Signal_Windows.Models.GroupMembership", b =>
                 {
@@ -81,6 +82,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<string>("Draft");
 
+                    b.Property<string>("DraftFileTokens");
+
                     b.Property<uint>("ExpiresInSeconds");
 
                     b.Property<long>("LastActiveTimestamp");
@@ -151,7 +154,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Property<int>("Direction");
 
-                    b.Property<uint>("ExpiresAt");
+                    b.Property<long>("ExpiresAt");
 
                     b.Property<bool>("Read");
 

Signal-Windows.Lib/Migrations/SignalDB/SignalDBContextModelSnapshot.cs

@@ -11,6 +11,7 @@ public abstract class SignalConversation
         public string ThreadDisplayName { get; set; }
         public long LastActiveTimestamp { get; set; }
         public string Draft { get; set; }
+        public string DraftFileTokens { get; set; } // comma seperated list of tokens
         public string AvatarFile { get; set; }
         public long MessagesCount { get; set; }
         public uint UnreadCount { get; set; }

Signal-Windows.Lib/Models/SignalConversation.cs

@@ -106,6 +106,10 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Migrations\SignalDB\20210305185855_m7.cs" />
+    <Compile Include="Migrations\SignalDB\20210305185855_m7.designer.cs">
+      <DependentUpon>20210305185855_m7.cs</DependentUpon>
+    </Compile>
     <Compile Include="Settings\AppConfig.cs" />
     <Compile Include="DisappearingMessagesManager.cs" />
     <Compile Include="Events\SignalMessageEventArgs.cs" />