Skip to content

Commit aebfd48

Browse files
committed
Apply visual studio's hints
1 parent f6646db commit aebfd48

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

Signal-Windows.Lib/Storage/DB.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,7 @@ public static SessionRecord LoadSession(SignalProtocolAddress address)
322322
lock (DBLock)
323323
{
324324
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))
327326
{
328327
return record;
329328
}
@@ -1100,27 +1099,27 @@ internal static async Task<List<SignalConversation>> InsertOrUpdateGroups(IList<
11001099
{
11011100
using (var ctx = new SignalDBContext())
11021101
{
1103-
foreach (var receivedGroup in groups)
1102+
foreach (var (group, members) in groups)
11041103
{
11051104
var dbGroup = ctx.Groups
1106-
.Where(g => g.ThreadId == receivedGroup.group.ThreadId)
1105+
.Where(g => g.ThreadId == group.ThreadId)
11071106
.Include(g => g.GroupMemberships)
11081107
.Include(g => g.LastMessage)
11091108
.ThenInclude(m => m.Content)
11101109
.SingleOrDefault();
11111110
if (dbGroup != null)
11121111
{
11131112
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;
11171116
}
11181117
else
11191118
{
1120-
dbGroup = receivedGroup.group;
1119+
dbGroup = group;
11211120
ctx.Groups.Add(dbGroup);
11221121
}
1123-
foreach (var member in receivedGroup.members)
1122+
foreach (var member in members)
11241123
{
11251124
(var contact, var notify) = GetOrCreateContact(ctx, member, 0);
11261125
dbGroup.GroupMemberships.Add(new GroupMembership()

Signal-Windows/App.xaml.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,12 @@ protected override async void OnLaunched(LaunchActivatedEventArgs e)
159159
}
160160
}
161161

162-
var builder = new BackgroundTaskBuilder();
163-
builder.Name = taskName;
164-
builder.TaskEntryPoint = "Signal_Windows.RC.SignalBackgroundTask";
165-
builder.IsNetworkRequested = true;
162+
var builder = new BackgroundTaskBuilder
163+
{
164+
Name = taskName,
165+
TaskEntryPoint = "Signal_Windows.RC.SignalBackgroundTask",
166+
IsNetworkRequested = true
167+
};
166168
builder.SetTrigger(new TimeTrigger(15, false));
167169
builder.AddCondition(new SystemCondition(SystemConditionType.InternetAvailable));
168170
var requestStatus = await BackgroundExecutionManager.RequestAccessAsync();
@@ -302,8 +304,7 @@ private void SetupTopBar()
302304

303305
private async Task<bool> CreateMainWindow(string conversationId)
304306
{
305-
Frame rootFrame = Window.Current.Content as Frame;
306-
if (rootFrame == null)
307+
if (!(Window.Current.Content is Frame rootFrame))
307308
{
308309
rootFrame = new Frame();
309310
rootFrame.NavigationFailed += OnNavigationFailed;

0 commit comments

Comments
 (0)