From 8bb2ca4263bccb69f98f7984ca45dbdff8e001fd Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Wed, 17 Mar 2021 17:41:07 +0100
Subject: [PATCH] Updated the account omemo info with label support

---
 .../Controls/OMEMO/OmemoDeviceControl.xaml    | 33 +++++++
 .../Controls/OMEMO/OmemoDeviceControl.xaml.cs | 64 +++++++++++++
 .../OMEMO/OmemoDeviceListControl.xaml         | 25 ++---
 .../OMEMO/OmemoDeviceListControl.xaml.cs      | 18 +---
 .../Settings/AccountOmemoInfoControl.xaml     | 96 ++++++++++++++++---
 .../Settings/AccountOmemoInfoControl.xaml.cs  | 48 ++++++++++
 UWPX_UI/UWPX_UI.csproj                        |  7 ++
 .../AccountOmemoInfoControlContext.cs         | 44 ++++++++-
 .../OMEMO/OmemoDeviceControlContext.cs        | 72 ++++++++++++++
 .../Controls/OmemoDeviceListControlContext.cs | 26 +----
 .../AccountOmemoInfoControlDataTemplate.cs    | 29 +-----
 .../OMEMO/OmemoDeviceControlDataTemplate.cs}  | 12 +--
 .../OmemoDeviceListControlDataTemplate.cs     | 15 +--
 UWPX_UI_Context/UWPX_UI_Context.csproj        |  3 +-
 14 files changed, 372 insertions(+), 120 deletions(-)
 create mode 100644 UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml
 create mode 100644 UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml.cs
 create mode 100644 UWPX_UI_Context/Classes/DataContext/Controls/OMEMO/OmemoDeviceControlContext.cs
 rename UWPX_UI_Context/Classes/DataTemplates/{UintDataTemplate.cs => Controls/OMEMO/OmemoDeviceControlDataTemplate.cs} (81%)

diff --git a/UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml b/UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml
new file mode 100644
index 000000000..93cc17b17
--- /dev/null
+++ b/UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml
@@ -0,0 +1,33 @@
+<UserControl x:Class="UWPX_UI.Controls.OMEMO.OmemoDeviceControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:omemo="using:UWPX_UI_Context.Classes.ValueConverter.OMEMO"
+             mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <omemo:OmemoDeviceIdStringValueConverter x:Key="OmemoDeviceIdStringValueConverter"/>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0"
+                   MaxLines="1"
+                   Style="{ThemeResource BaseLineTextBlockStyle}"
+                   Text="{x:Bind VIEW_MODEL.MODEL.Label, Mode=OneWay}"
+                   TextTrimming="CharacterEllipsis"
+                   TextWrapping="NoWrap"/>
+        <TextBlock Grid.Row="1"
+                   Foreground="{ThemeResource CaptionTextBrush}"
+                   MaxLines="1"
+                   Style="{ThemeResource CaptionLineTextBlockStyle}"
+                   Text="{x:Bind Device.deviceId, Mode=OneWay, Converter={StaticResource OmemoDeviceIdStringValueConverter}}"
+                   TextTrimming="CharacterEllipsis"
+                   TextWrapping="NoWrap"
+                   Visibility="{x:Bind Device.deviceLabel, Mode=OneWay, Converter={StaticResource StringEmptyVisibilityValueConverter}}"/>
+    </Grid>
+</UserControl>
diff --git a/UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml.cs b/UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml.cs
new file mode 100644
index 000000000..10b12c2c0
--- /dev/null
+++ b/UWPX_UI/Controls/OMEMO/OmemoDeviceControl.xaml.cs
@@ -0,0 +1,64 @@
+using Storage.Classes.Models.Omemo;
+using UWPX_UI_Context.Classes.DataContext.Controls.OMEMO;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace UWPX_UI.Controls.OMEMO
+{
+    public sealed partial class OmemoDeviceControl: UserControl
+    {
+        //--------------------------------------------------------Attributes:-----------------------------------------------------------------\\
+        #region --Attributes--
+        public OmemoDeviceModel Device
+        {
+            get => (OmemoDeviceModel)GetValue(DeviceProperty);
+            set => SetValue(DeviceProperty, value);
+        }
+        public static readonly DependencyProperty DeviceProperty = DependencyProperty.Register(nameof(Device), typeof(OmemoDeviceModel), typeof(OmemoDeviceControl), new PropertyMetadata(null, OnDeviceChanged));
+
+        public readonly OmemoDeviceControlContext VIEW_MODEL = new OmemoDeviceControlContext();
+        #endregion
+        //--------------------------------------------------------Constructor:----------------------------------------------------------------\\
+        #region --Constructors--
+        public OmemoDeviceControl()
+        {
+            InitializeComponent();
+        }
+
+        #endregion
+        //--------------------------------------------------------Set-, Get- Methods:---------------------------------------------------------\\
+        #region --Set-, Get- Methods--
+
+
+        #endregion
+        //--------------------------------------------------------Misc Methods:---------------------------------------------------------------\\
+        #region --Misc Methods (Public)--
+        private void UpdateView(DependencyPropertyChangedEventArgs e)
+        {
+            VIEW_MODEL.UpdateView(e);
+        }
+
+        #endregion
+
+        #region --Misc Methods (Private)--
+
+
+        #endregion
+
+        #region --Misc Methods (Protected)--
+
+
+        #endregion
+        //--------------------------------------------------------Events:---------------------------------------------------------------------\\
+        #region --Events--
+        private static void OnDeviceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is OmemoDeviceControl control)
+            {
+                control.UpdateView(e);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml b/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml
index c4ace63d2..505ab4a38 100644
--- a/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml
+++ b/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml
@@ -2,30 +2,17 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:datatemplates="using:UWPX_UI_Context.Classes.DataTemplates"
              xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
              xmlns:local="using:UWPX_UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:omemo="using:Storage.Classes.Models.Omemo"
+             xmlns:omemoControls="using:UWPX_UI.Controls.OMEMO"
              mc:Ignorable="d">
 
     <UserControl.Resources>
         <DataTemplate x:Key="DeviceTemplate"
-                      x:DataType="datatemplates:UintDataTemplate">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <TextBlock Grid.Row="0"
-                           VerticalAlignment="Center"
-                           FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                           FontSize="40"
-                           Text="&#xE975;"/>
-                <TextBlock Grid.Column="1"
-                           Margin="10,0,10,0"
-                           VerticalAlignment="Center"
-                           Text="{x:Bind Value}"/>
-            </Grid>
+                      x:DataType="omemo:OmemoDeviceModel">
+            <omemoControls:OmemoDeviceControl Device="{x:Bind}"/>
         </DataTemplate>
     </UserControl.Resources>
 
@@ -52,12 +39,12 @@
                   extensions:ListViewExtensions.StretchItemContainerDirection="Both"
                   Background="{ThemeResource SystemControlBackgroundAltMediumBrush}"
                   ItemTemplate="{StaticResource DeviceTemplate}"
-                  ItemsSource="{x:Bind VIEW_MODEL.MODEL.DEVICES}"
+                  ItemsSource="{x:Bind Account.Client.dbAccount.omemoInfo.devices}"
                   SelectionMode="None"/>
 
         <TextBlock Grid.Row="2"
                    Margin="0,10,0,0">
-            <Run Text="{x:Bind VIEW_MODEL.MODEL.DEVICES.Count.ToString(), Mode=OneWay, FallbackValue='0'}"/>
+            <Run Text="{x:Bind Account.Client.dbAccount.omemoInfo.devices.Count.ToString(), Mode=OneWay, FallbackValue='0'}"/>
             <Run Text="device(s) found."/>
         </TextBlock>
 
diff --git a/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml.cs b/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml.cs
index 49853efbd..d4ff94e8f 100644
--- a/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml.cs
+++ b/UWPX_UI/Controls/OMEMO/OmemoDeviceListControl.xaml.cs
@@ -14,7 +14,7 @@ public AccountDataTemplate Account
             get => (AccountDataTemplate)GetValue(AccountProperty);
             set => SetValue(AccountProperty, value);
         }
-        public static readonly DependencyProperty AccountProperty = DependencyProperty.Register(nameof(Account), typeof(AccountDataTemplate), typeof(OmemoDeviceListControl), new PropertyMetadata(null, OnAccountChanged));
+        public static readonly DependencyProperty AccountProperty = DependencyProperty.Register(nameof(Account), typeof(AccountDataTemplate), typeof(OmemoDeviceListControl), new PropertyMetadata(null));
 
         public readonly OmemoDeviceListControlContext VIEW_MODEL = new OmemoDeviceListControlContext();
 
@@ -39,10 +39,6 @@ public OmemoDeviceListControl()
         #endregion
 
         #region --Misc Methods (Private)--
-        private void UpdateView(DependencyPropertyChangedEventArgs e)
-        {
-            VIEW_MODEL.UpdateView(e);
-        }
 
         #endregion
 
@@ -52,24 +48,16 @@ private void UpdateView(DependencyPropertyChangedEventArgs e)
         #endregion
         //--------------------------------------------------------Events:---------------------------------------------------------------------\\
         #region --Events--
-        private async void Reset_ibtn_Click(object sender, RoutedEventArgs args)
+        private async void Reset_ibtn_Click(IconProgressButtonControl sender, RoutedEventArgs args)
         {
             await VIEW_MODEL.ResetOmemoDevicesAsync(Account.Client);
         }
 
-        private async void Refresh_ibtn_Click(object sender, RoutedEventArgs args)
+        private async void Refresh_ibtn_Click(IconProgressButtonControl sender, RoutedEventArgs args)
         {
             await VIEW_MODEL.RefreshOmemoDevicesAsync(Account.Client);
         }
 
-        private static void OnAccountChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is OmemoDeviceListControl omemoDeviceListControl)
-            {
-                omemoDeviceListControl.UpdateView(e);
-            }
-        }
-
         #endregion
     }
 }
diff --git a/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml b/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml
index df0751e79..a16a86089 100644
--- a/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml
+++ b/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml
@@ -1,17 +1,24 @@
 <UserControl x:Class="UWPX_UI.Controls.Settings.AccountOmemoInfoControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:chat="using:UWPX_UI.Controls.Chat"
              xmlns:controls="using:UWPX_UI.Controls"
              xmlns:controlsOmemo="using:UWPX_UI.Controls.OMEMO"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:omemo="using:UWPX_UI_Context.Classes.ValueConverter.OMEMO"
+             Loaded="UserControl_Loaded"
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <omemo:OmemoHelperStateStringValueConverter x:Key="OmemoHelperStateStringValueConverter"/>
-        <omemo:OmemoHelperStateBrushValueConverter x:Key="OmemoHelperStateBrushValueConverter"/>
-        <omemo:OmemoDeviceIdStringValueConverter x:Key="OmemoDeviceIdStringValueConverter"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///Resources/Styles/Button/TransparentThemeButtonStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <omemo:OmemoHelperStateStringValueConverter x:Key="OmemoHelperStateStringValueConverter"/>
+            <omemo:OmemoHelperStateBrushValueConverter x:Key="OmemoHelperStateBrushValueConverter"/>
+            <omemo:OmemoDeviceIdStringValueConverter x:Key="OmemoDeviceIdStringValueConverter"/>
+        </ResourceDictionary>
     </UserControl.Resources>
 
     <ScrollViewer Margin="0,0,-10,0"
@@ -25,11 +32,6 @@
                      Text="{x:Bind VIEW_MODEL.MODEL.OmemoState, Mode=OneWay, Converter={StaticResource OmemoHelperStateStringValueConverter}}"/>
             </TextBlock>
 
-            <controls:IconTextBlockControl HorizontalAlignment="Left"
-                                           Glyph="&#xE783;"
-                                           GlyphForeground="Red"
-                                           Text="{x:Bind VIEW_MODEL.MODEL.ErrorText, Mode=OneWay}"
-                                           Visibility="{x:Bind VIEW_MODEL.MODEL.ErrorText, Converter={StaticResource StringEmptyVisibilityValueConverter}}"/>
             <controls:SeperatorControl Margin="-10,0,0,0"
                                        Text="Fingerprint:"/>
             <controlsOmemo:OmemoOwnFingerprintControl Margin="0,10,0,0"
@@ -37,14 +39,82 @@
 
             <controls:SeperatorControl Margin="-10,0,0,0"
                                        Text="Devices:"/>
-            <TextBlock Margin="0,10,0,0">
-                <Run FontWeight="Bold"
-                     Text="Your OMEMO device ID:"/>
-                <Run Text="{x:Bind VIEW_MODEL.MODEL.DeviceId, Mode=OneWay, Converter={StaticResource OmemoDeviceIdStringValueConverter}}"/>
-            </TextBlock>
+
+            <TextBlock Margin="0,10,0,0"
+                       FontWeight="Bold"
+                       Text="This device:"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock x:Name="name_tbx"
+                           Grid.Column="0"
+                           VerticalAlignment="Center"
+                           IsTextSelectionEnabled="True"
+                           MaxLines="1"
+                           Style="{StaticResource SubtitleTextBlockStyle}"
+                           Text="{x:Bind VIEW_MODEL.MODEL.DeviceLabel, Mode=OneWay}"
+                           TextTrimming="CharacterEllipsis"/>
+                <chat:EnterTextBox x:Name="editLabel_tbx"
+                                   Grid.Column="0"
+                                   BeforeTextChanging="EditLabel_tbx_BeforeTextChanging"
+                                   EnterKeyDown="EditLabel_tbx_EnterKeyDown"
+                                   PlaceholderText="{x:Bind Account.Client.dbAccount.omemoInfo.deviceId, Mode=OneWay, Converter={StaticResource OmemoDeviceIdStringValueConverter}}"
+                                   Text="{x:Bind VIEW_MODEL.MODEL.DeviceLabel, Mode=TwoWay}"
+                                   Visibility="Collapsed"/>
+                <Button x:Name="editLabel_btn"
+                        Grid.Column="1"
+                        Margin="5,0,0,0"
+                        Padding="0"
+                        VerticalAlignment="Center"
+                        Click="EditLabel_btn_Click"
+                        Content="&#xE70F;"
+                        FontWeight="Normal"
+                        Style="{ThemeResource TransparentThemeButtonStyle}"/>
+            </Grid>
+            <TextBlock Grid.Row="1"
+                       Margin="0,10,0,0"
+                       Foreground="{ThemeResource CaptionTextBrush}"
+                       MaxLines="1"
+                       Style="{ThemeResource CaptionLineTextBlockStyle}"
+                       Text="{x:Bind Account.Client.dbAccount.omemoInfo.deviceId, Mode=OneWay, Converter={StaticResource OmemoDeviceIdStringValueConverter}}"
+                       TextTrimming="CharacterEllipsis"
+                       TextWrapping="NoWrap"
+                       Visibility="{x:Bind Account.Client.dbAccount.omemoInfo.deviceLabel, Mode=OneWay, Converter={StaticResource StringEmptyVisibilityValueConverter}}"/>
+
+            <Grid Margin="0,10,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+            </Grid>
 
             <controlsOmemo:OmemoDeviceListControl Margin="0,10,0,0"
                                                   Account="{x:Bind Account, Mode=OneWay}"/>
         </StackPanel>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="EditLabelGroup">
+                <VisualState x:Name="DisplayLabelState">
+                    <VisualState.Setters>
+                        <Setter Target="editLabel_btn.Content" Value="&#xE70F;"/>
+                        <Setter Target="name_tbx.Visibility" Value="Visible"/>
+                        <Setter Target="editLabel_tbx.Visibility" Value="Collapsed"/>
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="EditLabelState">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="editLabel_btn.Content" Value="&#xE74E;"/>
+                        <Setter Target="name_tbx.Visibility" Value="Collapsed"/>
+                        <Setter Target="editLabel_tbx.Visibility" Value="Visible"/>
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </ScrollViewer>
 </UserControl>
diff --git a/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml.cs b/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml.cs
index f649b3d1b..3c23263b5 100644
--- a/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml.cs
+++ b/UWPX_UI/Controls/Settings/AccountOmemoInfoControl.xaml.cs
@@ -2,6 +2,7 @@
 using UWPX_UI_Context.Classes.DataTemplates;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
 
 namespace UWPX_UI.Controls.Settings
 {
@@ -17,6 +18,7 @@ public AccountDataTemplate Account
         public static readonly DependencyProperty AccountProperty = DependencyProperty.Register(nameof(Account), typeof(AccountDataTemplate), typeof(AccountOmemoInfoControl), new PropertyMetadata(null, OnAccountChanged));
 
         public readonly AccountOmemoInfoControlContext VIEW_MODEL = new AccountOmemoInfoControlContext();
+        private bool editingLabel = false;
 
         #endregion
         //--------------------------------------------------------Constructor:----------------------------------------------------------------\\
@@ -44,6 +46,27 @@ private void UpdateView(DependencyPropertyChangedEventArgs e)
             VIEW_MODEL.UpdateView(e);
         }
 
+        private void UpdateViewState(string state)
+        {
+            VisualStateManager.GoToState(this, state, true);
+        }
+
+        private void UpdateEditLabelViewState()
+        {
+            if (editingLabel)
+            {
+                editLabel_tbx.Text = VIEW_MODEL.MODEL.DeviceLabel;
+                UpdateViewState(EditLabelState.Name);
+                ToolTipService.SetToolTip(editLabel_btn, new ToolTip { Content = "Save" });
+            }
+            else
+            {
+                UpdateViewState(DisplayLabelState.Name);
+                VIEW_MODEL.SaveDeviceLabel(editLabel_tbx.Text, Account.Client.dbAccount.omemoInfo);
+                ToolTipService.SetToolTip(editLabel_btn, new ToolTip { Content = "Change device label" });
+            }
+        }
+
         #endregion
 
         #region --Misc Methods (Protected)--
@@ -60,6 +83,31 @@ private static void OnAccountChanged(DependencyObject d, DependencyPropertyChang
             }
         }
 
+        private void EditLabel_tbx_BeforeTextChanging(TextBox sender, TextBoxBeforeTextChangingEventArgs args)
+        {
+            if (!string.Equals(args.NewText, args.NewText.TrimStart()))
+            {
+                args.Cancel = true;
+            }
+        }
+
+        private void EditLabel_tbx_EnterKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            editingLabel = false;
+            UpdateEditLabelViewState();
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            UpdateEditLabelViewState();
+        }
+
+        private void EditLabel_btn_Click(object sender, RoutedEventArgs e)
+        {
+            editingLabel = !editingLabel;
+            UpdateEditLabelViewState();
+        }
+
         #endregion
     }
 }
diff --git a/UWPX_UI/UWPX_UI.csproj b/UWPX_UI/UWPX_UI.csproj
index deb32f4d3..992192fd9 100644
--- a/UWPX_UI/UWPX_UI.csproj
+++ b/UWPX_UI/UWPX_UI.csproj
@@ -299,6 +299,9 @@
     <Compile Include="Controls\OMEMO\OmemoButtonControl.xaml.cs">
       <DependentUpon>OmemoButtonControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\OMEMO\OmemoDeviceControl.xaml.cs">
+      <DependentUpon>OmemoDeviceControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\OMEMO\OmemoDeviceListControl.xaml.cs">
       <DependentUpon>OmemoDeviceListControl.xaml</DependentUpon>
     </Compile>
@@ -836,6 +839,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\OMEMO\OmemoDeviceControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\OMEMO\OmemoDeviceListControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/UWPX_UI_Context/Classes/DataContext/Controls/AccountOmemoInfoControlContext.cs b/UWPX_UI_Context/Classes/DataContext/Controls/AccountOmemoInfoControlContext.cs
index 613f6190a..7833f62ff 100644
--- a/UWPX_UI_Context/Classes/DataContext/Controls/AccountOmemoInfoControlContext.cs
+++ b/UWPX_UI_Context/Classes/DataContext/Controls/AccountOmemoInfoControlContext.cs
@@ -1,6 +1,9 @@
-using UWPX_UI_Context.Classes.DataTemplates;
+using System.ComponentModel;
+using Storage.Classes.Models.Omemo;
+using UWPX_UI_Context.Classes.DataTemplates;
 using UWPX_UI_Context.Classes.DataTemplates.Controls;
 using Windows.UI.Xaml;
+using XMPP_API.Classes.Network;
 
 namespace UWPX_UI_Context.Classes.DataContext.Controls
 {
@@ -25,20 +28,45 @@ public sealed class AccountOmemoInfoControlContext
         #region --Misc Methods (Public)--
         public void UpdateView(DependencyPropertyChangedEventArgs e)
         {
-            if (e.NewValue is AccountDataTemplate account)
+            if (e.NewValue is AccountDataTemplate newAccount)
             {
-                MODEL.UpdateView(account);
+                newAccount.Client.dbAccount.omemoInfo.PropertyChanged += OnOmemoInfoPropertyChanged;
+                UpdateView(newAccount);
+                UpdateView(newAccount.Client.dbAccount.omemoInfo);
+            }
+        }
+
+        public void SaveDeviceLabel(string deviceLabel, OmemoAccountInformationModel omemoInfo)
+        {
+            if (string.IsNullOrEmpty(deviceLabel) || string.Equals(deviceLabel, omemoInfo.deviceLabel))
+            {
+                omemoInfo.deviceLabel = null;
             }
             else
             {
-                MODEL.UpdateView(null);
+                omemoInfo.deviceLabel = deviceLabel;
             }
+            omemoInfo.Update();
         }
 
         #endregion
 
         #region --Misc Methods (Private)--
+        private void UpdateView(OmemoAccountInformationModel omemoInfo)
+        {
+            if (!(omemoInfo is null))
+            {
+                MODEL.DeviceLabel = string.IsNullOrEmpty(omemoInfo.deviceLabel) ? (omemoInfo.deviceId == 0 ? "-" : omemoInfo.deviceId.ToString()) : omemoInfo.deviceLabel;
+            }
+        }
 
+        public void UpdateView(AccountDataTemplate account)
+        {
+            if (!(account is null))
+            {
+                MODEL.OmemoState = account.Client.xmppClient.getOmemoHelper()?.STATE ?? OmemoHelperState.DISABLED;
+            }
+        }
 
         #endregion
 
@@ -48,7 +76,13 @@ public void UpdateView(DependencyPropertyChangedEventArgs e)
         #endregion
         //--------------------------------------------------------Events:---------------------------------------------------------------------\\
         #region --Events--
-
+        private void OnOmemoInfoPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (sender is OmemoAccountInformationModel omemoInfo)
+            {
+                UpdateView(omemoInfo);
+            }
+        }
 
         #endregion
     }
diff --git a/UWPX_UI_Context/Classes/DataContext/Controls/OMEMO/OmemoDeviceControlContext.cs b/UWPX_UI_Context/Classes/DataContext/Controls/OMEMO/OmemoDeviceControlContext.cs
new file mode 100644
index 000000000..48410d2dc
--- /dev/null
+++ b/UWPX_UI_Context/Classes/DataContext/Controls/OMEMO/OmemoDeviceControlContext.cs
@@ -0,0 +1,72 @@
+using System.ComponentModel;
+using Storage.Classes.Models.Omemo;
+using UWPX_UI_Context.Classes.DataTemplates.Controls.OMEMO;
+using Windows.UI.Xaml;
+
+namespace UWPX_UI_Context.Classes.DataContext.Controls.OMEMO
+{
+    public sealed class OmemoDeviceControlContext
+    {
+        //--------------------------------------------------------Attributes:-----------------------------------------------------------------\\
+        #region --Attributes--
+        public readonly OmemoDeviceControlDataTemplate MODEL = new OmemoDeviceControlDataTemplate();
+
+        #endregion
+        //--------------------------------------------------------Constructor:----------------------------------------------------------------\\
+        #region --Constructors--
+
+
+        #endregion
+        //--------------------------------------------------------Set-, Get- Methods:---------------------------------------------------------\\
+        #region --Set-, Get- Methods--
+
+
+        #endregion
+        //--------------------------------------------------------Misc Methods:---------------------------------------------------------------\\
+        #region --Misc Methods (Public)--
+        public void UpdateView(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue is OmemoDeviceModel oldDevice)
+            {
+                oldDevice.PropertyChanged -= NewDevice_PropertyChanged;
+            }
+
+            if (e.NewValue is OmemoDeviceModel newDevice)
+            {
+                newDevice.PropertyChanged += NewDevice_PropertyChanged;
+                UpdateView(newDevice);
+            }
+        }
+
+        public void UpdateView(OmemoDeviceModel device)
+        {
+            if (!(device is null))
+            {
+                MODEL.Label = string.IsNullOrEmpty(device.deviceLabel) ? (device.deviceId == 0 ? "-" : device.deviceId.ToString()) : device.deviceLabel;
+            }
+        }
+
+        #endregion
+
+        #region --Misc Methods (Private)--
+
+
+        #endregion
+
+        #region --Misc Methods (Protected)--
+
+
+        #endregion
+        //--------------------------------------------------------Events:---------------------------------------------------------------------\\
+        #region --Events--
+        private void NewDevice_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (sender is OmemoDeviceModel device)
+            {
+                UpdateView(device);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/UWPX_UI_Context/Classes/DataContext/Controls/OmemoDeviceListControlContext.cs b/UWPX_UI_Context/Classes/DataContext/Controls/OmemoDeviceListControlContext.cs
index c3549e9f3..d08681a7b 100644
--- a/UWPX_UI_Context/Classes/DataContext/Controls/OmemoDeviceListControlContext.cs
+++ b/UWPX_UI_Context/Classes/DataContext/Controls/OmemoDeviceListControlContext.cs
@@ -1,10 +1,7 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Logging;
 using Manager.Classes;
-using UWPX_UI_Context.Classes.DataTemplates;
 using UWPX_UI_Context.Classes.DataTemplates.Controls;
-using Windows.UI.Xaml;
 using XMPP_API.Classes.Network.XML.Messages;
 using XMPP_API.Classes.Network.XML.Messages.Helper;
 using XMPP_API.Classes.Network.XML.Messages.XEP_0384;
@@ -39,11 +36,6 @@ public async Task ResetOmemoDevicesAsync(Client client)
             MODEL.ResettingDevices = false;
         }
 
-        private void OnResetDeviceListResult(bool success)
-        {
-            MODEL.ResettingDevices = false;
-        }
-
         public async Task RefreshOmemoDevicesAsync(Client client)
         {
             MODEL.RefreshingDevices = true;
@@ -52,8 +44,8 @@ public async Task RefreshOmemoDevicesAsync(Client client)
             {
                 if (result.RESULT is OmemoDeviceListResultMessage deviceListResultMessage)
                 {
-                    MODEL.DEVICES.Clear();
-                    MODEL.DEVICES.AddRange(deviceListResultMessage.DEVICES.DEVICES.Select(x => new UintDataTemplate { Value = x.ID }));
+                    // MODEL.DEVICES.Clear();
+                    // MODEL.DEVICES.AddRange(deviceListResultMessage.DEVICES.DEVICES.Select(x => new UintDataTemplate { Value = x.ID }));
                 }
                 else
                 {
@@ -67,18 +59,6 @@ public async Task RefreshOmemoDevicesAsync(Client client)
             MODEL.RefreshingDevices = false;
         }
 
-        public void UpdateView(DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is AccountDataTemplate account)
-            {
-                MODEL.UpdateView(account);
-            }
-            else
-            {
-                MODEL.UpdateView(null);
-            }
-        }
-
         #endregion
 
         #region --Misc Methods (Private)--
diff --git a/UWPX_UI_Context/Classes/DataTemplates/Controls/AccountOmemoInfoControlDataTemplate.cs b/UWPX_UI_Context/Classes/DataTemplates/Controls/AccountOmemoInfoControlDataTemplate.cs
index 9e9c01ffd..84f65623b 100644
--- a/UWPX_UI_Context/Classes/DataTemplates/Controls/AccountOmemoInfoControlDataTemplate.cs
+++ b/UWPX_UI_Context/Classes/DataTemplates/Controls/AccountOmemoInfoControlDataTemplate.cs
@@ -13,17 +13,11 @@ public OmemoHelperState OmemoState
             get => _OmemoState;
             set => SetProperty(ref _OmemoState, value);
         }
-        private uint _DeviceId;
-        public uint DeviceId
+        private string _DeviceLabel;
+        public string DeviceLabel
         {
-            get => _DeviceId;
-            set => SetProperty(ref _DeviceId, value);
-        }
-        private string _ErrorText;
-        public string ErrorText
-        {
-            get => _ErrorText;
-            set => SetProperty(ref _ErrorText, value);
+            get => _DeviceLabel;
+            set => SetProperty(ref _DeviceLabel, value);
         }
 
         #endregion
@@ -39,20 +33,7 @@ public string ErrorText
         #endregion
         //--------------------------------------------------------Misc Methods:---------------------------------------------------------------\\
         #region --Misc Methods (Public)--
-        public void UpdateView(AccountDataTemplate account)
-        {
-            if (account is null)
-            {
-                OmemoState = OmemoHelperState.DISABLED;
-                DeviceId = 0;
-                ErrorText = "";
-            }
-            else
-            {
-                OmemoState = account.Client.xmppClient.getOmemoHelper()?.STATE ?? OmemoHelperState.DISABLED;
-                DeviceId = account.Client.dbAccount.omemoInfo.deviceId;
-            }
-        }
+
 
         #endregion
 
diff --git a/UWPX_UI_Context/Classes/DataTemplates/UintDataTemplate.cs b/UWPX_UI_Context/Classes/DataTemplates/Controls/OMEMO/OmemoDeviceControlDataTemplate.cs
similarity index 81%
rename from UWPX_UI_Context/Classes/DataTemplates/UintDataTemplate.cs
rename to UWPX_UI_Context/Classes/DataTemplates/Controls/OMEMO/OmemoDeviceControlDataTemplate.cs
index 3605b4799..cdbcbdf41 100644
--- a/UWPX_UI_Context/Classes/DataTemplates/UintDataTemplate.cs
+++ b/UWPX_UI_Context/Classes/DataTemplates/Controls/OMEMO/OmemoDeviceControlDataTemplate.cs
@@ -1,16 +1,16 @@
 using Shared.Classes;
 
-namespace UWPX_UI_Context.Classes.DataTemplates
+namespace UWPX_UI_Context.Classes.DataTemplates.Controls.OMEMO
 {
-    public sealed class UintDataTemplate: AbstractDataTemplate
+    public class OmemoDeviceControlDataTemplate: AbstractDataTemplate
     {
         //--------------------------------------------------------Attributes:-----------------------------------------------------------------\\
         #region --Attributes--
-        private uint _Value;
-        public uint Value
+        private string _Label;
+        public string Label
         {
-            get => _Value;
-            set => SetProperty(ref _Value, value);
+            get => _Label;
+            set => SetProperty(ref _Label, value);
         }
 
         #endregion
diff --git a/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoDeviceListControlDataTemplate.cs b/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoDeviceListControlDataTemplate.cs
index cc084d525..19e203ca8 100644
--- a/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoDeviceListControlDataTemplate.cs
+++ b/UWPX_UI_Context/Classes/DataTemplates/Controls/OmemoDeviceListControlDataTemplate.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-using Shared.Classes;
-using Shared.Classes.Collections;
+using Shared.Classes;
 
 namespace UWPX_UI_Context.Classes.DataTemplates.Controls
 {
@@ -8,8 +6,6 @@ public sealed class OmemoDeviceListControlDataTemplate: AbstractDataTemplate
     {
         //--------------------------------------------------------Attributes:-----------------------------------------------------------------\\
         #region --Attributes--
-        public readonly CustomObservableCollection<UintDataTemplate> DEVICES = new CustomObservableCollection<UintDataTemplate>(true);
-
         private bool _RefreshingDevices;
         public bool RefreshingDevices
         {
@@ -36,16 +32,7 @@ public bool ResettingDevices
         #endregion
         //--------------------------------------------------------Misc Methods:---------------------------------------------------------------\\
         #region --Misc Methods (Public)--
-        public void UpdateView(AccountDataTemplate account)
-        {
-            DEVICES.Clear();
-            if (account is null)
-            {
-                return;
-            }
 
-            DEVICES.AddRange(account.Client.xmppClient.getOmemoHelper().DEVICES.DEVICES.Select(d => new UintDataTemplate { Value = d.ID }));
-        }
 
         #endregion
 
diff --git a/UWPX_UI_Context/UWPX_UI_Context.csproj b/UWPX_UI_Context/UWPX_UI_Context.csproj
index 029bd7080..5a94eceff 100644
--- a/UWPX_UI_Context/UWPX_UI_Context.csproj
+++ b/UWPX_UI_Context/UWPX_UI_Context.csproj
@@ -171,6 +171,7 @@
     <Compile Include="Classes\DataContext\Controls\LogLevelControlContext.cs" />
     <Compile Include="Classes\DataContext\Controls\OmemoButtonControlContext.cs" />
     <Compile Include="Classes\DataContext\Controls\OmemoDeviceListControlContext.cs" />
+    <Compile Include="Classes\DataContext\Controls\OMEMO\OmemoDeviceControlContext.cs" />
     <Compile Include="Classes\DataContext\Controls\OMEMO\OmemoFingerprintControlContext.cs" />
     <Compile Include="Classes\DataContext\Controls\OMEMO\OmemoOwnFingerprintControlContext.cs" />
     <Compile Include="Classes\DataContext\Controls\OMEMO\OmemoTrustFingerprintControlContext.cs" />
@@ -249,6 +250,7 @@
     <Compile Include="Classes\DataTemplates\Controls\LogLevelControlDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\Controls\OmemoButtonControlDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\Controls\OmemoDeviceListControlDataTemplate.cs" />
+    <Compile Include="Classes\DataTemplates\Controls\OMEMO\OmemoDeviceControlDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\Controls\OMEMO\OmemoFingerprintControlDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\Controls\OMEMO\OmemoOwnFingerprintControlDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\Controls\OMEMO\OmemoTrustFingerprintControlDataTemplate.cs" />
@@ -297,7 +299,6 @@
     <Compile Include="Classes\DataTemplates\Selectors\SpeechBubbleConentDataTemplateSelector.cs" />
     <Compile Include="Classes\DataTemplates\Selectors\SpeechBubbleDataTemplateSelector.cs" />
     <Compile Include="Classes\DataTemplates\SettingsPageButtonDataTemplate.cs" />
-    <Compile Include="Classes\DataTemplates\UintDataTemplate.cs" />
     <Compile Include="Classes\DataTemplates\ClientDataTemplate.cs" />
     <Compile Include="Classes\Events\FieldValueChangedByUserEventArgs.cs" />
     <Compile Include="Classes\Events\FrameArrivedEventArgs.cs" />