Properly fetch device name from view

Author: Trolldemorted

Signal-Windows/ViewModels/LinkPageViewModel.cs

@@ -23,9 +23,6 @@ public class LinkPageViewModel : ViewModelBase
         public LinkPage View;
         private CancellationTokenSource CancelSource;
         private bool UIEnabled = true;
-
-        public string DeviceName { get; set; } = "Signal on Windows";
-
         private Visibility _QRVisible;
 
         public Visibility QRVisible
@@ -70,7 +67,6 @@ public async Task BeginLinking()
         {
             try
             {
-                Debug.WriteLine(SynchronizationContext.Current);
                 CancelSource = new CancellationTokenSource();
                 // clean the database from stale values
                 await Task.Run(() =>
@@ -98,7 +94,7 @@ await Task.Run(() =>
                 int registrationId = (int)KeyHelper.generateRegistrationId(false);
 
                 var provisionMessage = await accountManager.GetProvisioningMessage(CancelSource.Token, tmpIdentity);
-                int deviceId = await accountManager.FinishNewDeviceRegistration(CancelSource.Token, provisionMessage, tmpSignalingKey, password, false, true, registrationId, DeviceName);
+                int deviceId = await accountManager.FinishNewDeviceRegistration(CancelSource.Token, provisionMessage, tmpSignalingKey, password, false, true, registrationId, View.GetDeviceName());
                 SignalStore store = new SignalStore()
                 {
                     DeviceId = (uint)deviceId,

Signal-Windows/Views/LinkPage.xaml

@@ -35,7 +35,7 @@
             <Image Grid.Row="0" x:Name="QRCode" Stretch="Fill" Visibility="{x:Bind Vm.QRVisible, Mode=OneWay}" Width="250" Height="250" Margin="20 20 20 20" />
             <TextBlock Grid.Row="1" Foreground="White" TextWrapping="WrapWholeWords" Text="Open Signal on your phone and navigate to Settings > Linked devices. Tap the button to add a new device, then scan the code above." HorizontalAlignment="Center" Margin="20 20 20 20"></TextBlock>
             <TextBlock Grid.Row="2" Foreground="White" TextWrapping="WrapWholeWords" HorizontalAlignment="Center">This device's name will be</TextBlock>
-            <TextBox Grid.Row="3" Name="DeviceName" Text="{x:Bind Vm.DeviceName, Mode=TwoWay}" Margin="20 20 20 20" Width="240" HorizontalAlignment="Center" />
+            <TextBox Grid.Row="3" Name="DeviceName" Text="Signal on Windows" Margin="20 20 20 20" Width="240" HorizontalAlignment="Center" />
             <TextBlock Grid.Row="4" Foreground="White" Text="{x:Bind Vm.QRCodeString, Mode=OneWay}" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Bottom" IsTextSelectionEnabled="True" Margin="20 20 20 20" />
         </Grid>
     </Grid>

Signal-Windows/Views/LinkPage.xaml.cs

@@ -54,6 +54,11 @@ public void SetQR(string qr)
             QRCode.Source = writer.Write(qr);
         }
 
+        public string GetDeviceName()
+        {
+            return DeviceName.Text;
+        }
+
         public async Task Finish(bool success)
         {
             if (success)