Skip to content

Commit 5f471ba

Browse files
committed
switch to w10 anniversary update, switch ulong FKs to long
turns out ef core does NOT like ulong foreign keys and inserts negative ids
1 parent 8b25941 commit 5f471ba

15 files changed

+23
-23
lines changed

Signal-Windows/Controls/Conversation.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public sealed partial class Conversation : UserControl, INotifyPropertyChanged
2121
{
2222
public event PropertyChangedEventHandler PropertyChanged;
2323

24-
private Dictionary<ulong, Message> OutgoingCache = new Dictionary<ulong, Message>();
24+
private Dictionary<long, Message> OutgoingCache = new Dictionary<long, Message>();
2525

2626
public RangeObservableCollection<object> Messages { get; set; } = new RangeObservableCollection<object>();
2727
private SignalUnreadMarker UnreadMarker = new SignalUnreadMarker();

Signal-Windows/Models/SignalAttachment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ namespace Signal_Windows.Models
55
{
66
public class SignalAttachment
77
{
8-
public ulong Id { get; set; }
9-
public ulong MessageId { get; set; }
8+
public long Id { get; set; }
9+
public long MessageId { get; set; }
1010
public SignalMessage Message { get; set; }
1111
public string FileName { get; set; }
1212
public string SentFileName { get; set; }

Signal-Windows/Models/SignalConversation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Signal_Windows.Models
55
{
66
public class SignalConversation
77
{
8-
public ulong Id { get; set; }
8+
public long Id { get; set; }
99
public string ThreadId { get; set; }
1010
public string ThreadDisplayName { get; set; }
1111
public long LastActiveTimestamp { get; set; }
@@ -14,9 +14,9 @@ public class SignalConversation
1414
public uint UnreadCount { get; set; }
1515
public bool CanReceive { get; set; }
1616
public uint ExpiresInSeconds { get; set; }
17-
public ulong? LastMessageId { get; set; }
17+
public long? LastMessageId { get; set; }
1818
public SignalMessage LastMessage { get; set; }
19-
public ulong? LastSeenMessageId { get; set; }
19+
public long? LastSeenMessageId { get; set; }
2020
public SignalMessage LastSeenMessage { get; set; }
2121
[NotMapped] public ConversationListElement View;
2222
}

Signal-Windows/Models/SignalGroup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ public class SignalGroup : SignalConversation
99

1010
public class GroupMembership
1111
{
12-
public ulong Id { get; set; }
13-
public ulong GroupId { get; set; }
12+
public long Id { get; set; }
13+
public long GroupId { get; set; }
1414
public SignalGroup Group { get; set; }
15-
public ulong ContactId { get; set; }
15+
public long ContactId { get; set; }
1616
public SignalContact Contact { get; set; }
1717
}
1818
}

Signal-Windows/Models/SignalIdentity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace Signal_Windows.Models
22
{
33
public class SignalIdentity
44
{
5-
public ulong Id { get; set; }
5+
public long Id { get; set; }
66
public string Username { get; set; }
77
public string IdentityKey { get; set; }
88
public VerifiedStatus VerifiedStatus { get; set; }

Signal-Windows/Models/SignalMessage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ namespace Signal_Windows.Models
66
{
77
public class SignalMessage
88
{
9-
public ulong Id { get; set; }
9+
public long Id { get; set; }
1010
public SignalMessageDirection Direction { get; set; }
1111
public SignalMessageType Type { get; set; }
1212
public SignalMessageStatus Status { get; set; }
1313
public SignalMessageContent Content { get; set; }
1414
public string ThreadId { get; set; }
15-
public ulong? AuthorId { get; set; }
15+
public long? AuthorId { get; set; }
1616
public SignalContact Author { get; set; }
1717
public uint DeviceId { get; set; }
1818
public bool Read { get; set; }

Signal-Windows/Models/SignalMessageContent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Signal_Windows.Models
55
public class SignalMessageContent
66
{
77
[Key]
8-
public ulong rowid { get; set; }
8+
public long rowid { get; set; }
99

1010
public string Content { get; set; }
1111
}

Signal-Windows/Models/SignalPreKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class SignalPreKey
44
{
5-
public ulong Id { get; set; }
5+
public long Id { get; set; }
66
public string Key { get; set; }
77
}
88
}

Signal-Windows/Models/SignalSession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class SignalSession
44
{
5-
public ulong Id { get; set; }
5+
public long Id { get; set; }
66
public string Username { get; set; }
77
public uint DeviceId { get; set; }
88
public string Session { get; set; }

Signal-Windows/Models/SignalSignedPreKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
public class SignalSignedPreKey
44
{
5-
public ulong Id { get; set; }
5+
public long Id { get; set; }
66
public string Key { get; set; }
77
}
88
}

0 commit comments

Comments
 (0)