fixed critical bug, which does not allow to create a new data file

2fast-team · Dec 22, 2021 · 285815e · 285815e
1 parent 30c87d8
commit 285815e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Project2FA.UWP/Package.appxmanifest b/Project2FA.UWP/Package.appxmanifest
@@ -4,10 +4,10 @@
          xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" 
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
          IgnorableNamespaces="uap mp rescap">
-  <Identity Name="38343JanPhilippWeber.2fastTwoFactorAuthenticatorSu" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.0.6.0" />
-  <mp:PhoneIdentity PhoneProductId="341c0caf-157c-448c-9b6f-6a772307d8c1" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Identity Name="38343JanPhilippWeber.2fastBeta" Publisher="CN=31DBFF9D-D4FF-4E73-808A-7B49119D08D3" Version="1.0.6.0" />
+  <mp:PhoneIdentity PhoneProductId="a751a3c0-a275-4d3b-882f-e28ce6eda007" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>2fast – Two Factor Authenticator Supporting TOTP</DisplayName>
+    <DisplayName>2fast (Beta)</DisplayName>
     <PublisherDisplayName>Jan Philipp Weber</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -19,7 +19,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Project2FA.UWP.App">
-      <uap:VisualElements DisplayName="2fast - two factor authenticator supporting TOTP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent" Description="Project2FA">
+      <uap:VisualElements DisplayName="[Beta] 2fast - two factor authenticator supporting TOTP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent" Description="Project2FA">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png" ShortName="2fast">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="wide310x150Logo"/>

diff --git a/Project2FA.UWP/Services/DataService.cs b/Project2FA.UWP/Services/DataService.cs
@@ -10,7 +10,6 @@
 using System.Collections.Specialized;
 using OtpNet;
 using Windows.UI.Xaml.Controls;
-using Template10.Services.Dialog;
 using Prism.Commands;
 using Prism.Logging;
 using Project2FA.Core.Utils;
@@ -32,6 +31,7 @@
 using Project2FA.UWP.Services.WebDAV;
 using Windows.Storage.Streams;
 using WebDAVClient.Types;
+using Prism.Services.Dialogs;
 
 namespace Project2FA.UWP.Services
 {
@@ -366,7 +366,7 @@ public async Task ShowFileOrFolderNotFoundError()
             {
                 selectedOption = true;
                 dialog.Hide();
-                ContentDialogResult result = await dialogService.ShowAsync(new UpdateDatafileContentDialog());
+                ContentDialogResult result = await dialogService.ShowDialogAsync(new UpdateDatafileContentDialog(), new DialogParameters());
                 if (result == ContentDialogResult.Primary)
                 {
                     ErrorResolved();
@@ -417,11 +417,11 @@ async void Dialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args
                 {
                     if (!selectedOption)
                     {
-                        await dialogService.ShowAsync(dialog);
+                        await dialogService.ShowDialogAsync(dialog, new DialogParameters());
                     }
                 }
             }
-            await dialogService.ShowAsync(dialog);
+            await dialogService.ShowDialogAsync(dialog, new DialogParameters());
         }
 
         /// <summary>

diff --git a/Project2FA.UWP/Utils/WebDAVUtils.cs b/Project2FA.UWP/Utils/WebDAVUtils.cs
@@ -4,7 +4,7 @@
 using Prism.Ioc;
 using WebDAVClient.Exceptions;
 using Template10.Services.Resources;
-using Template10.Services.Dialog;
+using Prism.Services.Dialogs;
 
 namespace Project2FA.UWP.Utils
 {

diff --git a/Project2FA.UWP/ViewModels/WelcomePageViewModel.cs b/Project2FA.UWP/ViewModels/WelcomePageViewModel.cs
@@ -3,12 +3,12 @@
 using System;
 using Project2FA.UWP.Views;
 using System.Windows.Input;
-using Template10.Services.Dialog;
 using Windows.Storage;
 using Windows.UI.Xaml.Controls;
 using Prism.Navigation;
 using Project2FA.UWP.Utils;
 using System.Threading.Tasks;
+using Prism.Services.Dialogs;
 
 namespace Project2FA.UWP.ViewModels
 {
@@ -59,15 +59,15 @@ public WelcomePageViewModel(IDialogService dialogService, INavigationService nav
                 {
                     IsTutorialOpen = false;
                 }
-                await _dialogService.ShowAsync(dialog);
+                await _dialogService.ShowDialogAsync(dialog,new DialogParameters());
             });
 #pragma warning restore AsyncFixer03 // Fire-and-forget async-void methods or delegates
         }
 
         private async Task NewDatafile()
         {
             var dialog = new NewDatafileContentDialog();
-            var result = await _dialogService.ShowAsync(dialog);
+            var result = await _dialogService.ShowDialogAsync(dialog, new DialogParameters());
             if (result == ContentDialogResult.Primary)
             {
                 //_canNavigate = true;
@@ -85,7 +85,7 @@ private async Task UseExistDatafile()
                 StorageFile file = await StorageFile.GetFileFromPathAsync(path);
 
                 UseDatafileContentDialog dialog = new UseDatafileContentDialog();
-                ContentDialogResult result = await _dialogService.ShowAsync(dialog);
+                ContentDialogResult result = await _dialogService.ShowDialogAsync(dialog, new DialogParameters());
 
                 //result is also none, when the datafileDB is correct created
                 if (result == ContentDialogResult.None)

diff --git a/Project2FA.UWP/Views/AccountCodePage.xaml.cs b/Project2FA.UWP/Views/AccountCodePage.xaml.cs
@@ -6,12 +6,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Template10.Services.Dialog;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
+using Prism.Services.Dialogs;
 
 namespace Project2FA.UWP.Views
 {