* show toast for cache messages in the center of the screen to avoid hiding the keyboard when entering passwords

* Bug fix with FTP access
* Bug fix with Group editing/adding
* Integrated Input Language Selection for keyboard
-> 0.9.3-r3
This commit is contained in:
Philipp Crocoll
2014-02-19 21:49:18 +01:00
parent ccde65d233
commit 736bbd5ec3
16 changed files with 133 additions and 47 deletions

View File

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

View File

@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.34003
// Laufzeitversion:4.0.30319.34011
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.

View File

@@ -362,22 +362,56 @@ namespace KeePassLib.Serialization
public override void Close()
{
base.Close();
RepeatWithDigestOnFail(ioc, req =>
WebRequest testReq = WebRequest.Create(ioc.Path);
if (testReq is HttpWebRequest)
{
req.Headers.Add("Translate: f");
if (method != null)
req.Method = method;
var data = this.ToArray();
using (Stream s = req.GetRequestStream())
RepeatWithDigestOnFail(ioc, req =>
{
s.Write(data, 0, data.Length);
req.GetResponse();
s.Close();
req.Headers.Add("Translate: f");
if (method != null)
req.Method = method;
var data = this.ToArray();
using (Stream s = req.GetRequestStream())
{
s.Write(data, 0, data.Length);
req.GetResponse();
s.Close();
}
});
}
else
{
try
{
uploadData(IOConnection.CreateWebClient(ioc, false));
}
});
catch (WebException ex)
{
//todo: does this make sense for FTP at all? Remove?
if ((ex.Response is HttpWebResponse) && (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.Unauthorized))
uploadData(IOConnection.CreateWebClient(ioc, true));
else
throw;
}
}
}
void uploadData(WebClient webClient)
{
if (method != null)
{
webClient.UploadData(destinationFilePath, method, this.ToArray());
}
else
{
webClient.UploadData(destinationFilePath, this.ToArray());
}
}