mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-08-13 17:03:49 -04:00
Small fixes for 0.9.1
This commit is contained in:
parent
be9f18d996
commit
fd06b3d772
@ -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;EXCLUDE_KEYTRANSFORM;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE</DefineConstants>
|
<DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<ConsolePause>False</ConsolePause>
|
<ConsolePause>False</ConsolePause>
|
||||||
|
@ -11,7 +11,7 @@ using Android.Runtime;
|
|||||||
using Android.Views;
|
using Android.Views;
|
||||||
using Android.Widget;
|
using Android.Widget;
|
||||||
using KeePassLib.Serialization;
|
using KeePassLib.Serialization;
|
||||||
|
#if !EXCLUDE_JAVAFILESTORAGE
|
||||||
namespace keepass2android.Io
|
namespace keepass2android.Io
|
||||||
{
|
{
|
||||||
public class GoogleDriveFileStorage : JavaFileStorage
|
public class GoogleDriveFileStorage : JavaFileStorage
|
||||||
@ -24,3 +24,4 @@ namespace keepass2android.Io
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
@ -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;EXCLUDE_KEYTRANSFORM;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE</DefineConstants>
|
<DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
@ -84,39 +84,6 @@ namespace keepass2android
|
|||||||
return;
|
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");
|
Kp2aLog.Log("LoadDB OK");
|
||||||
Finish(true);
|
Finish(true);
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@ namespace keepass2android
|
|||||||
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
|
AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
|
||||||
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
|
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
|
||||||
String[] changeLog = {
|
String[] changeLog = {
|
||||||
|
ctx.GetString(Resource.String.ChangeLog_0_9_1),
|
||||||
ctx.GetString(Resource.String.ChangeLog_0_9),
|
ctx.GetString(Resource.String.ChangeLog_0_9),
|
||||||
ctx.GetString(Resource.String.ChangeLog_0_8_6),
|
ctx.GetString(Resource.String.ChangeLog_0_8_6),
|
||||||
ctx.GetString(Resource.String.ChangeLog_0_8_5),
|
ctx.GetString(Resource.String.ChangeLog_0_8_5),
|
||||||
|
6714
src/keepass2android/Resources/Resource.designer.cs
generated
6714
src/keepass2android/Resources/Resource.designer.cs
generated
File diff suppressed because it is too large
Load Diff
@ -342,6 +342,13 @@
|
|||||||
|
|
||||||
<string name="ChangeLog_title">Change log</string>
|
<string name="ChangeLog_title">Change log</string>
|
||||||
|
|
||||||
|
<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">
|
<string name="ChangeLog_0_9">
|
||||||
<b>Version 0.9</b>\n
|
<b>Version 0.9</b>\n
|
||||||
|
@ -49,10 +49,10 @@ namespace KeePass.Util
|
|||||||
|
|
||||||
/*NOT SUPPORTED CURRENTLY if((ctx.Flags & SprCompileFlags.NewPassword) != SprCompileFlags.None)
|
/*NOT SUPPORTED CURRENTLY if((ctx.Flags & SprCompileFlags.NewPassword) != SprCompileFlags.None)
|
||||||
str = ReplaceNewPasswordPlaceholder(str, ctx);
|
str = ReplaceNewPasswordPlaceholder(str, ctx);
|
||||||
*/
|
|
||||||
if((ctx.Flags & SprCompileFlags.HmacOtp) != SprCompileFlags.None)
|
if((ctx.Flags & SprCompileFlags.HmacOtp) != SprCompileFlags.None)
|
||||||
str = ReplaceHmacOtpPlaceholder(str, ctx);
|
str = ReplaceHmacOtpPlaceholder(str, ctx);
|
||||||
|
*/
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -281,8 +281,8 @@ namespace keepass2android
|
|||||||
|
|
||||||
IOConnectionInfo ioc = _DbHelper.CursorToIoc(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)
|
private void OnOpenButton(String fileName)
|
||||||
{
|
{
|
||||||
|
@ -24,7 +24,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;EXCLUDE_KEYTRANSFORM;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE</DefineConstants>
|
<DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;EXCLUDE_KEYTRANSFORM;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<ConsolePause>False</ConsolePause>
|
<ConsolePause>False</ConsolePause>
|
||||||
|
Loading…
Reference in New Issue
Block a user