fixes for version 1.2.6 release

2fast-team · May 8, 2023 · 3f68400 · 3f68400
1 parent d5e5f29
commit 3f68400
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 14 deletions.
diff --git a/Project2FA.Shared/Strings/de/Resources.resw b/Project2FA.Shared/Strings/de/Resources.resw
@@ -734,7 +734,9 @@ 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>- Fehlerbehebungen
+    <value>- Über 200 neue Unternehmen-Logos hinzugefügt
+- Überarbeitung des initialen Tutorials
+- Fehlerbehebungen
 - Aktualisierung von Drittanbieter-Bibliotheken</value>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
@@ -1119,4 +1121,7 @@ In den nachfolgenden Abschnitten wird die Funktionsweise dieser Anwendung in die
   <data name="TutorialContentDialogInteractionAccountHeader.Text" xml:space="preserve">
     <value>Interaktionsmöglichkeiten für Konten</value>
   </data>
+  <data name="AddAccountContentDialogScreenclipNotFound" xml:space="preserve">
+    <value>Die benötigte Systemanwendung „Ausschneiden und Skizzieren“ konnte nicht gefunden werden: https://apps.microsoft.com/store/detail/snipping-tool/9MZ95KL8MR0L</value>
+  </data>
 </root>
diff --git a/Project2FA.Shared/Strings/en/Resources.generated.cs b/Project2FA.Shared/Strings/en/Resources.generated.cs
@@ -1751,6 +1751,19 @@ public static string TutorialPageItemShowCodeBTNTitle
             }
         }
         #endregion
+
+        #region AddAccountContentDialogScreenclipNotFound
+        /// <summary>
+        ///   Looks up a localized string similar to: Snipping tool not found
+        /// </summary>
+        public static string AddAccountContentDialogScreenclipNotFound
+        {
+            get
+            {
+                return _resourceLoader.GetString("AddAccountContentDialogScreenclipNotFound");
+            }
+        }
+        #endregion
     }
 
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("DotNetPlus.ReswPlus", "2.1.3")]

diff --git a/Project2FA.Shared/Strings/en/Resources.resw b/Project2FA.Shared/Strings/en/Resources.resw
@@ -730,8 +730,10 @@ 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>- Bug fixes
-- Updating third-party libraries</value>
+    <value>- Over 200 new company logos added
+- Revision of the initial tutorial
+- Bug fixes
+- Third party libraries updated</value>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
     <value>New features &amp; changes</value>
@@ -1062,7 +1064,7 @@ In the following sections, the functionality of this application is explained in
     <value>Use file/image for import</value>
   </data>
   <data name="ApplicationName" xml:space="preserve">
-    <value>[Beta] 2fast - two factor authenticator supporting TOTP</value>
+    <value>[Beta] 2fast - two factor authenticator</value>
   </data>
   <data name="TutorialPageBackButton.Text" xml:space="preserve">
     <value>Back</value>
@@ -1112,4 +1114,7 @@ In the following sections, the functionality of this application is explained in
   <data name="TutorialContentDialogInteractionAccountHeader.Text" xml:space="preserve">
     <value>Interaction options for accounts</value>
   </data>
+  <data name="AddAccountContentDialogScreenclipNotFound" xml:space="preserve">
+    <value>The required system application "Snipping Tool" could not be found: https://apps.microsoft.com/store/detail/snipping-tool/9MZ95KL8MR0L</value>
+  </data>
 </root>
diff --git a/Project2FA.Shared/ViewModels/AccountCodePageViewModel.cs b/Project2FA.Shared/ViewModels/AccountCodePageViewModel.cs
@@ -172,7 +172,7 @@ private async Task LogoutCommandTask()
             }
             else
             {
-                LoginPage loginPage = App.Current.Container.Resolve<LoginPage>();
+                LoginPage loginPage = new LoginPage(true);
                 WinUIWindow.Current.Content = loginPage;
             }
         }

diff --git a/Project2FA.Shared/ViewModels/Base/AddAccountViewModelBase.cs b/Project2FA.Shared/ViewModels/Base/AddAccountViewModelBase.cs
@@ -271,7 +271,7 @@ private void Current_Activated(object sender, WindowActivatedEventArgs e)
         public async Task ScanClipboardQRCode()
         {
             bool result = await Windows.System.Launcher.LaunchUriAsync(new Uri(
-                string.Format("ms-screenclip:edit?source={0}&delayInSeconds={1}&clippingMode=Window",
+                string.Format("ms-screenclip:edit?source={0}&delayInSeconds={1}",
                     Strings.Resources.ApplicationName,
                     OpeningSeconds)));
             if (result)
@@ -280,8 +280,13 @@ public async Task ScanClipboardQRCode()
             }
             else
             {
-
+                MessageDialog dialog = new MessageDialog(Strings.Resources.AddAccountContentDialogScreenclipNotFound, Strings.Resources.Error);
+                await dialog.ShowAsync();
             }
+    //        bool result = await Windows.System.Launcher.LaunchUriAsync(new Uri(
+    //string.Format("ms-screenclip:edit?source={0}&delayInSeconds={1}&clippingMode=Window",
+    //    Strings.Resources.ApplicationName,
+    //    OpeningSeconds)));
 
             //// The GraphicsCapturePicker follows the same pattern the
             //// file pickers do.

diff --git a/Project2FA/Project2FA.UWP/App.xaml.cs b/Project2FA/Project2FA.UWP/App.xaml.cs
@@ -316,7 +316,6 @@ private async void FocusLostTimer_Tick(object sender, object e)
                 if (timeDiff.TotalMinutes >= SettingsService.Instance.AutoLogoutMinutes)
                 {
                     _focusLostTimer.Stop();
-                    bool isLogout = true;
                     var dialogService = Current.Container.Resolve<IDialogService>();
                     if (await dialogService.IsDialogRunning())
                     {
@@ -330,7 +329,7 @@ private async void FocusLostTimer_Tick(object sender, object e)
                     }
                     else
                     {
-                        var loginPage = new LoginPage(isLogout);
+                        var loginPage = new LoginPage(true);
                         Window.Current.Content = loginPage;
                     }
                 }

diff --git a/Project2FA/Project2FA.UWP/Package.appxmanifest b/Project2FA/Project2FA.UWP/Package.appxmanifest
@@ -5,8 +5,8 @@
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
          xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"
          IgnorableNamespaces="uap mp rescap uap6">
-	<Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=J.P.Weber IT" Version="1.2.6.0" />
-	<mp:PhoneIdentity PhoneProductId="7288b17f-197f-4356-b520-fc13fab44621" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+	<Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.2.6.0" />
+	<mp:PhoneIdentity PhoneProductId="ebe850c9-6e4f-4d91-a52e-8040b0ae33df" 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,8 +23,8 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>1F71EC50F3ECBB45724B21A55C7EF0FA86999DE3</PackageCertificateThumbprint>
+    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
+    <PackageCertificateThumbprint>EE7C273F92500269D23ABD081383DBE749638BD0</PackageCertificateThumbprint>
     <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>

diff --git a/Project2FA/Project2FA.UWP/Project2FA.UWP_TemporaryKey.pfx b/Project2FA/Project2FA.UWP/Project2FA.UWP_TemporaryKey.pfx
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,7 +172,7 @@ private async Task LogoutCommandTask() @@
                 }
                 else
                 {
-                    LoginPage loginPage = App.Current.Container.Resolve<LoginPage>();
+                    LoginPage loginPage = new LoginPage(true);
                     WinUIWindow.Current.Content = loginPage;
                 }
             }
@@ Expand Down @@