moparisthebest
/
keepass2android
mirror of https://github.com/moparisthebest/keepass2android
1
0
Fork 0
Code Issues Releases Wiki Activity

Small fixes for 0.9.1

This commit is contained in:
Philipp Crocoll 2013-11-06 20:11:01 +01:00
parent be9f18d996
commit fd06b3d772
10 changed files with 2030 additions and 4756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KeePassLib2Android/KeePassLib2Android.csproj
View File

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

5
src/Kp2aBusinessLogic/Io/GDriveFileStorage.cs
View File

@ -11,7 +11,7 @@ using Android.Runtime;
using Android.Views;
using Android.Widget;
using KeePassLib.Serialization;
#if !EXCLUDE_JAVAFILESTORAGE
namespace keepass2android.Io
{
public class GoogleDriveFileStorage : JavaFileStorage
@ -23,4 +23,5 @@ namespace keepass2android.Io
}
}
}
#endif

2
src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
View File

@ -20,7 +20,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE</DefineConstants>
<DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

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

@ -84,39 +84,6 @@ namespace keepass2android
return;
}
/* catch (InvalidPasswordException e) {
finish(false, Ctx.GetString(Resource.String.InvalidPassword));
return;
} catch (FileNotFoundException e) {
finish(false, Ctx.GetString(Resource.String.FileNotFound));
return;
} catch (IOException e) {
finish(false, e.getMessage());
return;
} catch (KeyFileEmptyException e) {
finish(false, Ctx.GetString(Resource.String.keyfile_is_empty));
return;
} catch (InvalidAlgorithmException e) {
finish(false, Ctx.GetString(Resource.String.invalid_algorithm));
return;
} catch (InvalidKeyFileException e) {
finish(false, Ctx.GetString(Resource.String.keyfile_does_not_exist));
return;
} catch (InvalidDBSignatureException e) {
finish(false, Ctx.GetString(Resource.String.invalid_db_sig));
return;
} catch (InvalidDBVersionException e) {
finish(false, Ctx.GetString(Resource.String.unsupported_db_version));
return;
} catch (InvalidDBException e) {
finish(false, Ctx.GetString(Resource.String.error_invalid_db));
return;
} catch (OutOfMemoryError e) {
finish(false, Ctx.GetString(Resource.String.error_out_of_memory));
return;
}
*/
Kp2aLog.Log("LoadDB OK");
Finish(true);
}

1
src/keepass2android/ChangeLog.cs
View File

@ -22,6 +22,7 @@ namespace keepass2android
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
String[] changeLog = {
ctx.GetString(Resource.String.ChangeLog_0_9_1),
ctx.GetString(Resource.String.ChangeLog_0_9),
ctx.GetString(Resource.String.ChangeLog_0_8_6),
ctx.GetString(Resource.String.ChangeLog_0_8_5),

6714
src/keepass2android/Resources/Resource.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

11
src/keepass2android/Resources/values/strings.xml
View File

@ -341,9 +341,16 @@
<string name="error_adding_keyfile">Error while adding the keyfile!</string>
<string name="ChangeLog_title">Change log</string>
<string name="ChangeLog_0_9">
<string name="ChangeLog_0_9_1">
<b>Version 0.9.1</b>\n
* Integrated SkyDrive support (Keepass2Android regular edition only)\n
* Fixed problems with Google Drive integration\n
* Added NTLM support
</string>
<string name="ChangeLog_0_9">
<b>Version 0.9</b>\n
* Integrated Dropbox and Google Drive support (read/write databases; Keepass2Android regular edition only)\n
* Integrated custom file browser (based on android-filechooser by HBA)\n

10
src/keepass2android/Utils/EntryUtil.cs
View File

@ -47,12 +47,12 @@ namespace KeePass.Util
string str = strText;
/*NOT SUPPORTED CURRENTLY if((ctx.Flags & SprCompileFlags.NewPassword) != SprCompileFlags.None)
str = ReplaceNewPasswordPlaceholder(str, ctx);
*/
if((ctx.Flags & SprCompileFlags.HmacOtp) != SprCompileFlags.None)
str = ReplaceHmacOtpPlaceholder(str, ctx);
/*NOT SUPPORTED CURRENTLY if((ctx.Flags & SprCompileFlags.NewPassword) != SprCompileFlags.None)
str = ReplaceNewPasswordPlaceholder(str, ctx);
if((ctx.Flags & SprCompileFlags.HmacOtp) != SprCompileFlags.None)
str = ReplaceHmacOtpPlaceholder(str, ctx);
*/
return str;
}

6
src/keepass2android/fileselect/FileSelectActivity.cs
View File

@ -280,9 +280,9 @@ namespace keepass2android
StartManagingCursor(cursor);
IOConnectionInfo ioc = _DbHelper.CursorToIoc(cursor);
LaunchPasswordActivityForIoc(ioc);
App.Kp2a.GetFileStorage(ioc)
.PrepareFileUsage(new FileStorageSetupInitiatorActivity(this, OnActivityResult, null), ioc, 0);
}
private void OnOpenButton(String fileName)
{

2
src/keepass2android/keepass2android.csproj
View File

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