Merge pull request #164 from 2fast-team/master

Merge

Project2FA.Core/Project2FA.Core.csproj

@@ -29,7 +29,7 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Project2FA.Repository/Project2FA.Repository.csproj

@@ -26,7 +26,7 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Project2FA.Shared/Strings/de/Resources.resw

@@ -1356,7 +1356,7 @@ Für die zentrale Verwaltung der Anwendung im Unternehmen unterstützt die Anwen
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>![Erste Schritte](ms-appx:///Assets/Images/firstSteps_DE.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>Das eingegebene, neue Passwort ist nicht korrekt.</value>
   </data>
 </root>

Project2FA.Shared/Strings/en/Resources.resw

@@ -732,7 +732,8 @@ Please synchronize the time in the settings.</value>
   <data name="NewAppFeaturesContent" xml:space="preserve">
     <value>- Update of third-party libraries
 - Further languages have been added: Spanish, French, Italian, Japanese, Chinese
-- Categories can now be set directly in new accounts (Pro function)</value>
+- Categories can now be set directly in new accounts (Pro function)
+- Fixed a bug where the password could not be changed if the currently saved password is invalid</value>
     <comment>[ReswT:always]</comment>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
@@ -1354,7 +1355,7 @@ The application supports an MDM configuration for centralised management of the
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>![First steps](ms-appx:///Assets/Images/firstSteps_EN.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>The new password entered is not correct.</value>
   </data>
 </root>

Project2FA.Shared/Strings/es/Resources.resw

@@ -735,7 +735,8 @@ Sincronice la hora en los parámetros.</value>
   <data name="NewAppFeaturesContent" xml:space="preserve">
     <value>- Actualización de las bibliotecas de terceros
 - Se han añadido más idiomas: español, francés, italiano, japonés, chino
-- Ahora se pueden establecer categorías directamente en las cuentas nuevas (función Pro)</value>
+- Ahora se pueden establecer categorías directamente en las cuentas nuevas (función Pro)
+- Se ha corregido un error que impedía cambiar la contraseña si la contraseña guardada no era válida</value>
     <comment>[ReswT:always]</comment>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
@@ -1359,7 +1360,7 @@ La aplicación toma a cargo una configuración MDM para una gestión centralizad
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>![Premiers pas](ms-appx:///Assets/Images/firstSteps_EN.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>La nueva contraseña introducida no es correcta.</value>
   </data>
 </root>

Project2FA.Shared/Strings/fr/Resources.resw

@@ -735,7 +735,8 @@ Veuillez synchroniser l'heure dans les paramètres.</value>
   <data name="NewAppFeaturesContent" xml:space="preserve">
     <value>- Mise à jour des bibliothèques tierces
 - D'autres langues ont été ajoutées : espagnol, français, italien, japonais, chinois.
-- Les catégories peuvent désormais être définies directement dans les nouveaux comptes (fonction Pro)</value>
+- Les catégories peuvent désormais être définies directement dans les nouveaux comptes (fonction Pro)
+- Correction d'un bogue qui empêchait la modification du mot de passe si le mot de passe actuellement enregistré n'était pas valide.</value>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
     <value>Nouvelles fonctionnalités et changements</value>
@@ -1357,7 +1358,7 @@ L'application prend en charge une configuration MDM pour une gestion centralisé
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>![Premiers pas](ms-appx:///Assets/Images/firstSteps_EN.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>Le nouveau mot de passe introduit n'est pas correct.</value>
   </data>
 </root>

Project2FA.Shared/Strings/it/Resources.resw

@@ -735,7 +735,8 @@ Sincronizzare l'ora nelle impostazioni.</value>
   <data name="NewAppFeaturesContent" xml:space="preserve">
     <value>- Aggiornamento delle librerie di terze parti
 - Sono state aggiunte altre lingue: spagnolo, francese, italiano, giapponese e cinese.
-- Le categorie possono ora essere impostate direttamente nei nuovi account (funzione Pro)</value>
+- Le categorie possono ora essere impostate direttamente nei nuovi account (funzione Pro)
+- Corretto un bug per cui non era possibile modificare la password se quella attualmente salvata non era valida</value>
     <comment>[ReswT:always]</comment>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
@@ -1358,7 +1359,7 @@ L'applicazione supporta una configurazione MDM per la gestione centralizzata del
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>![Primi passi](ms-appx:///Assets/Images/firstSteps_EN.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>La nuova password inserita non è corretta.</value>
   </data>
 </root>

Project2FA.Shared/Strings/ja/Resources.resw

@@ -735,7 +735,8 @@
   <data name="NewAppFeaturesContent" xml:space="preserve">
     <value>- サードパーティ製ライブラリの更新
 - スペイン語、フランス語、イタリア語、日本語、中国語が追加されました。
-- 新しいアカウントでカテゴリーを直接設定できるようになりました。</value>
+- 新しいアカウントでカテゴリを直接設定できるようになりました。
+- 現在保存されているパスワードが無効な場合、パスワードを変更できないバグを修正しました。</value>
     <comment>[ReswT:always]</comment>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
@@ -1358,7 +1359,7 @@
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>ファーストステップ](ms-appx:///Assets/Images/firstSteps_EN.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>入力された新しいパスワードが正しくありません。</value>
   </data>
 </root>

Project2FA.Shared/Strings/zh/Resources.resw

@@ -734,7 +734,8 @@
   <data name="NewAppFeaturesContent" xml:space="preserve">
     <value>- 更新第三方库
 - 新增语言：西班牙语、法语、意大利语、日语和中文
-- 现在可直接在新账户中设置类别（专业版功能）</value>
+- 现在可直接在新账户中设置类别（专业版功能）
+- 修正了一个错误，即如果当前保存的密码无效，则无法更改密码</value>
     <comment>[ReswT:always]</comment>
   </data>
   <data name="NewAppFeaturesTitle" xml:space="preserve">
@@ -1357,7 +1358,7 @@
   <data name="TutorialContentDialogCreateOrLoad.Text" xml:space="preserve">
     <value>第一步](ms-appx://Assets/Images/firstSteps_EN.png)</value>
   </data>
-  <data name="ChangeDatafilePasswordContentDialogNewPasswordError" xml:space="preserve">
+  <data name="ChangeDatafilePasswordContentDialogNewPasswordError.Text" xml:space="preserve">
     <value>输入的新密码不正确。</value>
   </data>
 </root>

Project2FA.Shared/ViewModels/ContentDialogs/ChangeDatafilePasswordContentDialogViewModel.cs

@@ -115,15 +115,18 @@ public async Task ChangePasswordInFileAndDB()
                 hash = model.Hash;
                 // save new pw in the secret vault
                 SecretService.Helper.WriteSecret(Constants.ContainerName, hash, NewPassword);
-                // reload collection
-                await DataService.Instance.ReloadDatafile();
             }
 
             //datafile must not changed when password was invalid (written already by other app)
             if (InvalidPassword == false)
             {
                 await DataService.Instance.WriteLocalDatafile();
             }
+            else
+            {
+                // reload collection
+                await DataService.Instance.ReloadDatafile();
+            }
             PasswordChanged = true;
         }
 

Project2FA.Shared/ViewModels/SettingPageViewModel.cs

@@ -772,12 +772,9 @@ public DatafilePartViewModel(IDialogService dialogService, ISecretService secret
                     NotifyPasswordChanged = false;
                 }
                 var result = await _dialogService.ShowDialogAsync(dialog, param);
-                if (result == ContentDialogResult.Primary)
+                if (dialog.ViewModel.PasswordChanged)
                 {
-                    if (dialog.ViewModel.PasswordChanged)
-                    {
-                        NotifyPasswordChanged = true;
-                    }
+                    NotifyPasswordChanged = true;
                 }
             });
 #pragma warning restore AsyncFixer03 // Fire-and-forget async-void methods or delegates

Project2FA.UNO.MauiControls/Project2FA.UNO.MauiControls.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
+	<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.90" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.90" />
   </ItemGroup>
 
   <ItemGroup>

Project2FA/Project2FA.UNO.Mobile/Project2FA.UNO.Mobile.csproj

@@ -57,28 +57,28 @@
     <RunAOTCompilation>False</RunAOTCompilation>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Remove="Android\SoftwareBitmap.Android.cs" />
+    <Compile Remove="Platforms\Android\SoftwareBitmap.Android.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Remove="Android\Resources\drawable\splash.png" />
-    <None Remove="Android\Resources\drawable\Splash.xml" />
-    <None Remove="Android\Resources\values-night\colors.xml" />
-    <None Remove="Android\Resources\values\colors.xml" />
+    <None Remove="Platforms\Android\Resources\drawable\splash.png" />
+    <None Remove="Platforms\Android\Resources\drawable\Splash.xml" />
+    <None Remove="Platforms\Android\Resources\values-night\colors.xml" />
+    <None Remove="Platforms\Android\Resources\values\colors.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.1.240821" />
-	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.61" />
-	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.61" />
+	<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.90" />
+	<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.90" />
     <PackageReference Include="DryIoc" Version="5.4.3" />
     <PackageReference Include="Prism.Core" Version="8.1.97" />
-    <PackageReference Include="Svg.Skia" Version="2.0.0" />
-    <PackageReference Include="Uno.Cupertino.WinUI" Version="5.1.7" />
+    <PackageReference Include="Svg.Skia" Version="2.0.0.1" />
+    <PackageReference Include="Uno.Cupertino.WinUI" Version="5.1.9" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
     <PackageReference Include="Uno.Extensions.Maui.WinUI" Version="4.2.2" />
     <PackageReference Include="Uno.Resizetizer" Version="1.5.2">
@@ -87,28 +87,28 @@
     </PackageReference>
     <PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="6.1.8" />
     <PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="6.1.8" />
-    <PackageReference Include="Uno.WinUI" Version="5.3.123" />
-    <PackageReference Include="Uno.WinUI.Lottie" Version="5.3.123" />
-	<PackageReference Include="Uno.WinUI.DevServer" Version="5.3.123" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.123" />
+    <PackageReference Include="Uno.WinUI" Version="5.3.144" />
+    <PackageReference Include="Uno.WinUI.Lottie" Version="5.3.144" />
+	<PackageReference Include="Uno.WinUI.DevServer" Version="5.3.144" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.144" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Uno.WinUI.Svg" Version="5.3.123" />
+    <PackageReference Include="Uno.WinUI.Svg" Version="5.3.144" />
     <PackageReference Include="ZXing.Net" Version="0.16.9" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(TargetFramework)'=='net8.0-android'">
       <ItemGroup>
-        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.1" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.7.5" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.7.5" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.7.7.5" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.7.7.5" />
-		<PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.2" />
-		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.2" />
+        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.2" />
+		<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.0" />
+		<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.0" />
+		<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.0" />
+		<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.0" />
+		<PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.3" />
+		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3" />
         <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.37" />
       </ItemGroup>
       <ItemGroup>
-        <AndroidEnvironment Include="Android/environment.conf" />
+        <AndroidEnvironment Include="Platforms\Android\environment.conf" />
       </ItemGroup>
     </When>
     <When Condition="'$(TargetFramework)'=='net8.0-ios'">
@@ -151,7 +151,7 @@
   <Import Project="..\..\UNOversalTemplate\UNOversalTemplate.IoC.DryIoC\UNOversalTemplate.IoC.DryIoC.projitems" Label="Shared" />
   <Import Project="..\..\UNOversalTemplate\UNOversalTemplate.Core\UNOversalTemplate.Core.projitems" Label="Shared" />
   <ItemGroup>
-    <_Globbed_Compile Remove="Android\SoftwareBitmap.Android.cs" />
+    <_Globbed_Compile Remove="Platforms\Android\SoftwareBitmap.Android.cs" />
   </ItemGroup>
   <ItemGroup>
 	<UnoIcon Include="..\..\Project2FA.Shared\Assets\Icons\schluessel.svg" Color="#FF009BC1" />

Project2FA/Project2FA.UWP/Package.appxmanifest

@@ -6,7 +6,7 @@
          xmlns:uap6="http://schemas.microsoft.com/appx/manifest/uap/windows10/6"
          IgnorableNamespaces="uap mp rescap uap6">
 	<Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.3.1.0" />
-	<mp:PhoneIdentity PhoneProductId="ab3ff8b2-0244-4555-87a9-9ba796af1437" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+	<mp:PhoneIdentity PhoneProductId="370d1e8a-eeda-4285-9f6c-0d90b9006e18" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 	<Properties>
 		<DisplayName>2fast (Beta)</DisplayName>
 		<PublisherDisplayName>Jan Philipp Weber</PublisherDisplayName>

Project2FA/Project2FA.UWP/Project2FA.UWP.csproj

@@ -366,7 +366,7 @@
       <Version>8.1.97</Version>
     </PackageReference>
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3">
-      <Version>2.1.9</Version>
+      <Version>2.1.10</Version>
     </PackageReference>
     <PackageReference Include="ZXing.Net">
       <Version>0.16.9</Version>

WebDAVClientPortable/WebDAVClientPortable.csproj

@@ -14,7 +14,7 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

global.json

@@ -1,11 +1,11 @@
 {
 	"sdk": {
-		"version": "8.0.400",
+		"version": "8.0.401",
 		"allowPrerelease": true,
 		"rollForward": "latestPatch"
 	},
 	"tools": {
-		"dotnet": "8.0.400"
+		"dotnet": "8.0.401"
 	},
 	"msbuild-sdks": {
 		"MSBuild.Sdk.Extras": "3.0.44"