@@ -322,8 +322,7 @@ public static SessionRecord LoadSession(SignalProtocolAddress address)
322
322
lock ( DBLock )
323
323
{
324
324
string index = GetSessionCacheIndex ( address . Name , address . DeviceId ) ;
325
- SessionRecord record ;
326
- if ( SessionsCache . TryGetValue ( index , out record ) )
325
+ if ( SessionsCache . TryGetValue ( index , out SessionRecord record ) )
327
326
{
328
327
return record ;
329
328
}
@@ -1100,27 +1099,27 @@ internal static async Task<List<SignalConversation>> InsertOrUpdateGroups(IList<
1100
1099
{
1101
1100
using ( var ctx = new SignalDBContext ( ) )
1102
1101
{
1103
- foreach ( var receivedGroup in groups )
1102
+ foreach ( var ( group , members ) in groups )
1104
1103
{
1105
1104
var dbGroup = ctx . Groups
1106
- . Where ( g => g . ThreadId == receivedGroup . group . ThreadId )
1105
+ . Where ( g => g . ThreadId == group . ThreadId )
1107
1106
. Include ( g => g . GroupMemberships )
1108
1107
. Include ( g => g . LastMessage )
1109
1108
. ThenInclude ( m => m . Content )
1110
1109
. SingleOrDefault ( ) ;
1111
1110
if ( dbGroup != null )
1112
1111
{
1113
1112
dbGroup . GroupMemberships . Clear ( ) ;
1114
- dbGroup . ThreadDisplayName = receivedGroup . group . ThreadDisplayName ;
1115
- dbGroup . CanReceive = receivedGroup . group . CanReceive ;
1116
- dbGroup . ExpiresInSeconds = receivedGroup . group . ExpiresInSeconds ;
1113
+ dbGroup . ThreadDisplayName = group . ThreadDisplayName ;
1114
+ dbGroup . CanReceive = group . CanReceive ;
1115
+ dbGroup . ExpiresInSeconds = group . ExpiresInSeconds ;
1117
1116
}
1118
1117
else
1119
1118
{
1120
- dbGroup = receivedGroup . group ;
1119
+ dbGroup = group ;
1121
1120
ctx . Groups . Add ( dbGroup ) ;
1122
1121
}
1123
- foreach ( var member in receivedGroup . members )
1122
+ foreach ( var member in members )
1124
1123
{
1125
1124
( var contact , var notify ) = GetOrCreateContact ( ctx , member , 0 ) ;
1126
1125
dbGroup . GroupMemberships . Add ( new GroupMembership ( )
0 commit comments