diff --git a/ModernKeePass/ModernKeePass.App.csproj b/ModernKeePass/ModernKeePass.App.csproj
index 32c70a5..725b170 100644
--- a/ModernKeePass/ModernKeePass.App.csproj
+++ b/ModernKeePass/ModernKeePass.App.csproj
@@ -393,8 +393,8 @@
-
- ..\packages\Portable.BouncyCastle.1.8.2\lib\netstandard1.0\BouncyCastle.Crypto.dll
+
+ ..\packages\Portable.BouncyCastle.1.8.3\lib\netstandard1.0\BouncyCastle.Crypto.dll
True
@@ -421,24 +421,24 @@
..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
True
-
- ..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll
+
+ ..\packages\System.Composition.AttributedModel.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll
True
-
- ..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll
+
+ ..\packages\System.Composition.Convention.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll
True
-
- ..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll
+
+ ..\packages\System.Composition.Hosting.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll
True
-
- ..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll
+
+ ..\packages\System.Composition.Runtime.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll
True
-
- ..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll
+
+ ..\packages\System.Composition.TypedParts.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll
True
diff --git a/ModernKeePass/ViewModels/MainVm.cs b/ModernKeePass/ViewModels/MainVm.cs
index f0dee88..6569e83 100644
--- a/ModernKeePass/ViewModels/MainVm.cs
+++ b/ModernKeePass/ViewModels/MainVm.cs
@@ -62,7 +62,7 @@ namespace ModernKeePass.ViewModels
Destination = destinationFrame,
Parameter = databaseFile,
SymbolIcon = Symbol.Page2,
- IsSelected = databaseFile != null
+ IsSelected = databaseFile != null && !database.IsOpen
},
new MainMenuItemVm
{
diff --git a/ModernKeePass/ViewModels/OpenVm.cs b/ModernKeePass/ViewModels/OpenVm.cs
index 4ae900a..f6a91d4 100644
--- a/ModernKeePass/ViewModels/OpenVm.cs
+++ b/ModernKeePass/ViewModels/OpenVm.cs
@@ -12,16 +12,8 @@ namespace ModernKeePass.ViewModels
public string Name => DatabaseFile?.DisplayName;
public StorageFile DatabaseFile { get; private set; }
-
- public OpenVm() : this(null) { }
-
- public OpenVm(StorageFile file)
- {
- if (!IsFileSelected) return;
- OpenFile(file);
- }
-
- public void OpenFile(StorageFile file)
+
+ internal void OpenFile(StorageFile file)
{
OpenFile(file, RecentService.Instance);
}
diff --git a/ModernKeePass/packages.config b/ModernKeePass/packages.config
index 90810db..87f3852 100644
--- a/ModernKeePass/packages.config
+++ b/ModernKeePass/packages.config
@@ -10,16 +10,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ModernKeePassApp.Test/Mock/RecentServiceMock.cs b/ModernKeePassApp.Test/Mock/RecentServiceMock.cs
index e23e4e1..78d69fc 100644
--- a/ModernKeePassApp.Test/Mock/RecentServiceMock.cs
+++ b/ModernKeePassApp.Test/Mock/RecentServiceMock.cs
@@ -3,21 +3,24 @@ using System.Collections.ObjectModel;
using System.Threading.Tasks;
using ModernKeePass.Interfaces;
using Windows.Storage;
+using System.Collections.Generic;
namespace ModernKeePassApp.Test.Mock
{
class RecentServiceMock : IRecentService
{
+ private Dictionary _recentItems = new Dictionary();
+
public int EntryCount => 0;
public void Add(IStorageItem file, string metadata)
{
- throw new NotImplementedException();
+ _recentItems.Add(metadata, file);
}
public void ClearAll()
{
- throw new NotImplementedException();
+ _recentItems.Clear();
}
public ObservableCollection GetAllFiles(bool removeIfNonExistant = true)
@@ -27,7 +30,7 @@ namespace ModernKeePassApp.Test.Mock
public Task GetFileAsync(string token)
{
- throw new NotImplementedException();
+ return Task.Run(() => _recentItems[token]);
}
}
}
diff --git a/ModernKeePassApp.Test/ModernKeePass.AppTest.csproj b/ModernKeePassApp.Test/ModernKeePass.AppTest.csproj
index 639fe01..8c72c54 100644
--- a/ModernKeePassApp.Test/ModernKeePass.AppTest.csproj
+++ b/ModernKeePassApp.Test/ModernKeePass.AppTest.csproj
@@ -159,12 +159,12 @@
-
- ..\packages\Portable.BouncyCastle.1.8.2\lib\netstandard1.0\BouncyCastle.Crypto.dll
+
+ ..\packages\Portable.BouncyCastle.1.8.3\lib\netstandard1.0\BouncyCastle.Crypto.dll
True
-
- ..\packages\ModernKeePassLib.2.38.2\lib\netstandard1.2\ModernKeePassLib.dll
+
+ ..\packages\ModernKeePassLib.2.39.1\lib\netstandard1.2\ModernKeePassLib.dll
True
diff --git a/ModernKeePassApp.Test/ViewModelsTests.cs b/ModernKeePassApp.Test/ViewModelsTests.cs
index affb584..d01d31d 100644
--- a/ModernKeePassApp.Test/ViewModelsTests.cs
+++ b/ModernKeePassApp.Test/ViewModelsTests.cs
@@ -63,9 +63,10 @@ namespace ModernKeePassApp.Test
{
var databaseFile = Package.Current.InstalledLocation.GetFileAsync(@"Data\TestDatabase.kdbx")
.GetAwaiter().GetResult();
- var openVm = new OpenVm(databaseFile);
- Assert.IsTrue(openVm.IsFileSelected);
- Assert.AreEqual("MockDatabase", openVm.Name);
+ var openVm = new OpenVm();
+ Assert.IsFalse(openVm.IsFileSelected);
+ openVm.OpenFile(databaseFile, new RecentServiceMock());
+ Assert.AreEqual("TestDatabase.kdbx", openVm.Name);
}
/*[TestMethod]
diff --git a/ModernKeePassApp.Test/packages.config b/ModernKeePassApp.Test/packages.config
index 3987df1..2040c4e 100644
--- a/ModernKeePassApp.Test/packages.config
+++ b/ModernKeePassApp.Test/packages.config
@@ -1,10 +1,10 @@
-
+
-
+
-
+
diff --git a/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs b/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs
index 5a363c4..f2d5e8d 100644
--- a/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs
+++ b/ModernKeePassLib.Test/Keys/KcpKeyFileTests.cs
@@ -23,7 +23,7 @@ namespace ModernKeePassLib.Test.Keys
"\t\t";
private const string ExpectedFileEnd = "\t\r\n" +
- "\r\n";
+ "";
[TestMethod]
public void TestConstruct()
@@ -70,7 +70,7 @@ namespace ModernKeePassLib.Test.Keys
{
var fileContents = FileIO.ReadTextAsync(file).GetAwaiter().GetResult();
- Assert.AreEqual(fileContents.Length, 187);
+ Assert.AreEqual(185, fileContents.Length);
Assert.IsTrue(fileContents.StartsWith(ExpectedFileStart));
Assert.IsTrue(fileContents.EndsWith(ExpectedFileEnd));
}
diff --git a/ModernKeePassLib.Test/ModernKeePass.LibTest.csproj b/ModernKeePassLib.Test/ModernKeePass.LibTest.csproj
index ca4c1f1..6ccaa1e 100644
--- a/ModernKeePassLib.Test/ModernKeePass.LibTest.csproj
+++ b/ModernKeePassLib.Test/ModernKeePass.LibTest.csproj
@@ -148,8 +148,12 @@
-
- ..\packages\Portable.BouncyCastle.1.8.2\lib\netstandard1.0\BouncyCastle.Crypto.dll
+
+ ..\packages\Portable.BouncyCastle.1.8.3\lib\netstandard1.0\BouncyCastle.Crypto.dll
+ True
+
+
+ ..\packages\ModernKeePassLib.2.39.1\lib\netstandard1.2\ModernKeePassLib.dll
True
@@ -183,12 +187,6 @@
PreserveNewest
-
-
- {2e710089-9559-4967-846c-e763dd1f3acb}
- ModernKeePass.Lib
-
-
14.0
diff --git a/ModernKeePassLib.Test/packages.config b/ModernKeePassLib.Test/packages.config
index e6da36c..0a38eab 100644
--- a/ModernKeePassLib.Test/packages.config
+++ b/ModernKeePassLib.Test/packages.config
@@ -1,10 +1,10 @@
-
+
-
+
-
+