qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added message that kdb-support is readonly

Browse Source
This commit is contained in:
Philipp Crocoll
2014-03-25 06:15:05 +01:00
parent fd08518270
commit 59525f8378
9 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/KeePassLib2Android/IDatabaseLoader.cs
View File

@@ -11,5 +11,6 @@ namespace KeePassLib
byte[] HashOfLastStream { get; } byte[] HashOfLastStream { get; }
bool CanWrite { get; } bool CanWrite { get; }
string SuccessMessage { get; }
} }
} }

2
src/KeePassLib2Android/KeePassLib2Android.csproj
View File

@@ -20,7 +20,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<OutputPath>bin\Debug</OutputPath> <OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants> <DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>

3
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
View File

@@ -20,7 +20,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants> <DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@@ -55,7 +55,6 @@
<Compile Include="database\CheckDatabaseForChanges.cs" /> <Compile Include="database\CheckDatabaseForChanges.cs" />
<Compile Include="database\edit\EditGroup.cs" /> <Compile Include="database\edit\EditGroup.cs" />
<Compile Include="database\edit\MoveElement.cs" /> <Compile Include="database\edit\MoveElement.cs" />
<Compile Include="database\DatabaseV1.cs" />
<Compile Include="database\KdbDatabaseLoader.cs" /> <Compile Include="database\KdbDatabaseLoader.cs" />
<Compile Include="database\KdbxDatabaseLoader.cs" /> <Compile Include="database\KdbxDatabaseLoader.cs" />
<Compile Include="database\SynchronizeCachedDatabase.cs" /> <Compile Include="database\SynchronizeCachedDatabase.cs" />

5
src/Kp2aBusinessLogic/database/KdbDatabaseLoader.cs
View File

@@ -164,6 +164,11 @@ namespace keepass2android
#endif #endif
public byte[] HashOfLastStream { get; private set; } public byte[] HashOfLastStream { get; private set; }
public bool CanWrite { get { return false; } } public bool CanWrite { get { return false; } }
public string SuccessMessage { get
{
return
".kdb-support is read-only. Export as .kdbx if you want to modify the database. This app is for use with Keepass 2.x!";
} }
} }

1
src/Kp2aBusinessLogic/database/KdbxDatabaseLoader.cs
View File

@@ -28,5 +28,6 @@ namespace keepass2android
public byte[] HashOfLastStream { get; private set; } public byte[] HashOfLastStream { get; private set; }
public bool CanWrite { get { return true; } } public bool CanWrite { get { return true; } }
public string SuccessMessage { get { return null; } }
} }
} }

2
src/Kp2aBusinessLogic/database/edit/LoadDB.cs
View File

@@ -115,7 +115,7 @@ namespace keepass2android
_app.LoadDatabase(_ioc, workingCopy, _compositeKey, StatusLogger, _loader); _app.LoadDatabase(_ioc, workingCopy, _compositeKey, StatusLogger, _loader);
SaveFileData(_ioc, _keyfileOrProvider); SaveFileData(_ioc, _keyfileOrProvider);
Kp2aLog.Log("LoadDB OK"); Kp2aLog.Log("LoadDB OK");
Finish(true); Finish(true, _loader.SuccessMessage);
} }
catch (OldFormatException) catch (OldFormatException)
{ {

2
src/Kp2aUnitTests/TestLoadDb.cs
View File

@@ -99,6 +99,8 @@ namespace Kp2aUnitTests
[TestMethod] [TestMethod]
public void LoadFromRemoteWithDomain() public void LoadFromRemoteWithDomain()
{ {
//warning, looks like credentials are no longer valid
var ioc = RemoteDomainIoc; //note: this property is defined in "TestLoadDbCredentials.cs" which is deliberately excluded from Git because the credentials are not public! var ioc = RemoteDomainIoc; //note: this property is defined in "TestLoadDbCredentials.cs" which is deliberately excluded from Git because the credentials are not public!
var app = new TestKp2aApp(); var app = new TestKp2aApp();
app.ServerCertificateErrorResponse = true; //accept invalid cert app.ServerCertificateErrorResponse = true; //accept invalid cert

4
src/keepass2android/PasswordActivity.cs
View File

@@ -1132,10 +1132,8 @@ namespace keepass2android
GC.Collect(); // Ensure temporary memory used while loading is collected GC.Collect(); // Ensure temporary memory used while loading is collected
} }
else
{
DisplayMessage(_act); DisplayMessage(_act);
}
} }
} }

2
src/keepass2android/keepass2android.csproj
View File

@@ -30,7 +30,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath> <OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants> <DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause> <ConsolePause>False</ConsolePause>