added changelog for version 1.2.4

2fast-team · Mar 22, 2023 · 0b996e1 · 0b996e1
1 parent 13b16fe
commit 0b996e1
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 60 deletions.
diff --git a/Project2FA.Shared/Project2FA.Shared.projitems b/Project2FA.Shared/Project2FA.Shared.projitems
@@ -2291,7 +2291,6 @@
     <Content Include="$(MSBuildThisFileDirectory)Assets\Images\LargeTile.scale-150.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\Images\LargeTile.scale-200.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\Images\LargeTile.scale-400.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Images\schluessel.svg" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\Images\SmallTile.scale-100.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\Images\SmallTile.scale-125.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\Images\SmallTile.scale-150.png" />

diff --git a/Project2FA.Shared/Services/DataService.cs b/Project2FA.Shared/Services/DataService.cs
@@ -574,7 +574,7 @@ public async Task WriteLocalDatafile()
                 // set new template version for data file
                 var prevíousVersion = new Version(SystemInformation.Instance.ApplicationVersion.ToFormattedString());
                 var compareVersion = new Version("1.3.0.0");
-                var result = compareVersion.CompareTo(prevíousVersion);
+                var result = prevíousVersion.CompareTo(compareVersion);
                 int version = result >= 0 ? 2 : 1;
                 // create the new datafile model
                 DatafileModel fileModel = new DatafileModel() { IV = iv, Collection = Collection, Version = version };

diff --git a/Project2FA.Shared/Strings/de/Resources.resw b/Project2FA.Shared/Strings/de/Resources.resw
@@ -492,7 +492,7 @@ Die Datendatei wird bei der Zurücksetzung **nicht** entfernt.</value>
   <data name="WelcomePageIntro.Text" xml:space="preserve">
     <value>Willkommen!
 
-Starten Sie direkt durch und bringen mehr Sicherheit durch einen zweiten Faktor in ihr Leben.</value>
+Starten Sie direkt durch und bringen Sie mehr Sicherheit durch einen zweiten Faktor in Ihr Leben.</value>
   </data>
   <data name="WelcomePageLoadDatafile.Content" xml:space="preserve">
     <value>Vorhandene Datendatei laden</value>
@@ -734,11 +734,8 @@ Bitte synchronisieren Sie die Uhrzeit in den Einstellungen.</value>
     <value>Für die Überprüfung der korrekten Uhrzeit des Systems kann ein NTP Server verwendet werden. Bei einer größeren Abweichung der Uhrzeit würde die Erstellung der Codes für die Accounts nicht mehr korrekt sein. Falls eine Abweichung größer als dreißig Sekunden besteht, würde eine Benachrichtigung erscheinen und die Erstellung der Codes mit der Uhrzeit des NTP Servers erfolgen.</value>
   </data>
   <data name="NewAppFeaturesContent" xml:space="preserve">
-    <value>• Windows Hello kann nun in den Einstellungen für die generelle Anmeldung deaktiviert werden
-• Aktualisierung von Drittanbieter Bibliotheken
-• Behebung eines Fehlers, dass bei dem Starten von .2fa Datendateien nicht alle Rechte zum Lesen zur Verfügung standen
-• Verschlüsselung des eingegebenen Passwortes bei dem Starten von .2fa Dateien
-• Zuverlässigkeit der WebDAV-Komponente wurde erhöht</value>
+    <value>- Fehlerbehebungen
+- Aktualisierung von Drittanbieter-Bibliotheken</value>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
     <value>Neue Funktionen &amp; Änderungen</value>

diff --git a/Project2FA.Shared/Strings/en/Resources.resw b/Project2FA.Shared/Strings/en/Resources.resw
@@ -730,11 +730,8 @@ Please synchronize the time in the settings.</value>
     <value>An NTP server can be used to check the correct time of the system. If there is a greater deviation in the time, the creation of the codes for the accounts would no longer be correct. If there is a deviation greater than thirty seconds, a notification would appear and the creation of the codes would be done with the time of the NTP server.</value>
   </data>
   <data name="NewAppFeaturesContent" xml:space="preserve">
-    <value>• Windows Hello can now be disabled in the settings for general login
-• Update of third party libraries
-• Fixed a bug where not all rights were available to read when starting .2fa files
-• Encryption of the password entered when starting .2fa files
-• Increased reliability of the WebDAV component</value>
+    <value>- Bug fixes
+- Updating third-party libraries</value>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
     <value>New features &amp; changes</value>

diff --git a/Project2FA.Shared/ViewModels/Base/AddAccountViewModelBase.cs b/Project2FA.Shared/ViewModels/Base/AddAccountViewModelBase.cs
@@ -703,33 +703,42 @@ private async Task InitializeCameraAsync()
 
         private async void CameraHelper_FrameArrived(object sender, FrameEventArgs e)
         {
-            _currentVideoFrame = e.VideoFrame;
-
-            // analyse only every _vidioFrameDivider value
-            if (_videoFrameCounter % _vidioFrameDivider == 0 && SelectedPivotIndex == 1)
+            try
             {
-                var luminanceSource = new Project2FA.ZXing.SoftwareBitmapLuminanceSource(_currentVideoFrame.SoftwareBitmap);
-                if (luminanceSource != null)
+                _currentVideoFrame = e.VideoFrame;
+
+                // analyse only every _vidioFrameDivider value
+                if (_videoFrameCounter % _vidioFrameDivider == 0 && SelectedPivotIndex == 1)
                 {
-                    var barcodeReader = new Project2FA.ZXing.BarcodeReader
-                    {
-                        AutoRotate = true,
-                        Options = { TryHarder = true }
-                    };
-                    var decodedStr = barcodeReader.Decode(luminanceSource);
-                    if (decodedStr != null)
+                    var luminanceSource = new Project2FA.ZXing.SoftwareBitmapLuminanceSource(_currentVideoFrame.SoftwareBitmap);
+                    if (luminanceSource != null)
                     {
-                        if (decodedStr.Text.StartsWith("otpauth"))
+                        var barcodeReader = new Project2FA.ZXing.BarcodeReader
                         {
-                            await CleanUpCamera();
-                            _qrCodeStr = decodedStr.Text;
-                            await ReadAuthenticationFromString();
+                            AutoRotate = true,
+                            Options = { TryHarder = true }
+                        };
+                        var decodedStr = barcodeReader.Decode(luminanceSource);
+                        if (decodedStr != null)
+                        {
+                            if (decodedStr.Text.StartsWith("otpauth"))
+                            {
+                                await CleanUpCamera();
+                                _qrCodeStr = decodedStr.Text;
+                                await ReadAuthenticationFromString();
+                            }
                         }
                     }
                 }
             }
-            _videoFrameCounter++;
-
+            catch (Exception)
+            {
+                // ignore errors
+            }
+            finally
+            {
+                _videoFrameCounter++;
+            }
         }
 
 

diff --git a/Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj b/Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj
@@ -50,14 +50,14 @@
     <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Core" Version="7.1.100" />
     <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.100" />
     <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Media" Version="7.1.100" />
-    <PackageReference Include="Uno.Toolkit.WinUI" Version="2.5.4" />
-    <PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="2.5.4" />
-    <PackageReference Include="Uno.WinUI" Version="4.8.0-dev.792" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="4.8.0-dev.792" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.0-dev.792" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.0-dev.792" />
+    <PackageReference Include="Uno.Toolkit.WinUI" Version="2.5.5" />
+    <PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="2.5.5" />
+    <PackageReference Include="Uno.WinUI" Version="4.8.15" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="4.8.15" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.15" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.15" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Uno.WinUI.Svg" Version="4.8.0-dev.792" />
+    <PackageReference Include="Uno.WinUI.Svg" Version="4.8.15" />
     <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
   <Choose>

diff --git a/Project2FA/Project2FA.UWP/Package.appxmanifest b/Project2FA/Project2FA.UWP/Package.appxmanifest
@@ -5,7 +5,7 @@
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
          IgnorableNamespaces="uap mp rescap">
 	<Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.2.4.0" />
-	<mp:PhoneIdentity PhoneProductId="6b516233-0d1d-4a0e-90f0-db5403687189" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+	<mp:PhoneIdentity PhoneProductId="6e07ecc6-51e6-4bf6-be38-e290abf62222" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 	<Properties>
 		<DisplayName>2fast (Beta)</DisplayName>
 		<PublisherDisplayName>Jan Philipp Weber</PublisherDisplayName>

diff --git a/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj b/Project2FA/Project2FA.UWP/Project2FA.UWP.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Project2FA.UWP</AssemblyName>
     <DefaultLanguage>en</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -23,7 +23,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
     <PackageCertificateThumbprint>5603522399507011BC16B020D4E00718C66AB93F</PackageCertificateThumbprint>
     <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>

diff --git a/Project2FA/Project2FA.UWP/Views/ShellPage.xaml.cs b/Project2FA/Project2FA.UWP/Views/ShellPage.xaml.cs
@@ -18,6 +18,7 @@
 using UNOversal.Services.Dialogs;
 using Project2FA.ViewModels;
 using Windows.System;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 
 namespace Project2FA.UWP.Views
 {
@@ -163,24 +164,26 @@ private async void ShellPage_Loaded(object sender, RoutedEventArgs e)
                 }
             }
 
-            //if (SystemInformation.Instance.IsAppUpdated)
-            //{
-            //    //if (SystemInformation.Instance.PreviousVersionInstalled.Equals(PackageVersionHelper.ToPackageVersion("1.0.5.0")))
-            //    //{
-            //    //    if (SystemInformation.Instance.OperatingSystemVersion.Build >= 22000)
-            //    //    {
-            //    //        // set the round corner for Windows 11+
-            //    //        SettingsService.Instance.UseRoundCorner = true;
-            //    //    }
-            //    //}
-
-            //    ContentDialog dialog = new ContentDialog();
-            //    dialog.Title = Strings.Resources.NewAppFeaturesTitle;
-            //    dialog.Content = Strings.Resources.NewAppFeaturesContent;
-            //    dialog.PrimaryButtonText = Strings.Resources.Confirm;
-            //    dialog.PrimaryButtonStyle = App.Current.Resources["AccentButtonStyle"] as Style;
-            //    await dialogService.ShowDialogAsync(dialog, new DialogParameters());
-            //}
+            if (SystemInformation.Instance.IsAppUpdated)
+            {
+                //if (SystemInformation.Instance.PreviousVersionInstalled.Equals(PackageVersionHelper.ToPackageVersion("1.0.5.0")))
+                //{
+                //    if (SystemInformation.Instance.OperatingSystemVersion.Build >= 22000)
+                //    {
+                //        // set the round corner for Windows 11+
+                //        SettingsService.Instance.UseRoundCorner = true;
+                //    }
+                //}
+
+                ContentDialog dialog = new ContentDialog();
+                dialog.Title = Strings.Resources.NewAppFeaturesTitle;
+                var markdown = new MarkdownTextBlock();
+                markdown.Text = Strings.Resources.NewAppFeaturesContent;
+                dialog.Content = markdown;
+                dialog.PrimaryButtonText = Strings.Resources.Confirm;
+                dialog.PrimaryButtonStyle = App.Current.Resources["AccentButtonStyle"] as Style;
+                await dialogService.ShowDialogAsync(dialog, new DialogParameters());
+            }
 
             // If this is the first run, activate the ntp server checks
             // else => UseNTPServerCorrection is false