added #if EXCLUDE

This commit is contained in:
Philipp Crocoll 2014-05-25 06:12:52 +02:00
parent e871664ff4
commit 3e95b528e3

View File

@ -137,11 +137,13 @@ namespace keepass2android
} }
else //UpdateKeyboard else //UpdateKeyboard
{ {
#if !EXCLUDE_KEYBOARD
//this action is received when the data in the entry has changed (e.g. by plugins) //this action is received when the data in the entry has changed (e.g. by plugins)
//update the keyboard data. //update the keyboard data.
//Check if keyboard is (still) available //Check if keyboard is (still) available
if (Keepass2android.Kbbridge.KeyboardData.EntryId == entry.Uuid.ToHexString()) if (Keepass2android.Kbbridge.KeyboardData.EntryId == entry.Uuid.ToHexString())
MakeAccessibleForKeyboard(entry); MakeAccessibleForKeyboard(entry);
#endif
} }
} }
if (intent.Action == Intents.CopyStringToClipboard) if (intent.Action == Intents.CopyStringToClipboard)
@ -185,7 +187,8 @@ namespace keepass2android
{ {
UnregisterReceiver(_notificationDeletedBroadcastReceiver); UnregisterReceiver(_notificationDeletedBroadcastReceiver);
} }
if ( _notificationManager != null ) { if (_notificationManager != null)
{
_notificationManager.Cancel(NotifyPassword); _notificationManager.Cancel(NotifyPassword);
_notificationManager.Cancel(NotifyUsername); _notificationManager.Cancel(NotifyUsername);
_notificationManager.Cancel(NotifyKeyboard); _notificationManager.Cancel(NotifyKeyboard);
@ -397,7 +400,8 @@ namespace keepass2android
private readonly Timer _timer = new Timer(); private readonly Timer _timer = new Timer();
internal void TimeoutCopyToClipboard(String text) { internal void TimeoutCopyToClipboard(String text)
{
Util.CopyToClipboard(this, text); Util.CopyToClipboard(this, text);
ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this); ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
@ -406,31 +410,37 @@ namespace keepass2android
long clipClearTime = long.Parse(sClipClear); long clipClearTime = long.Parse(sClipClear);
_clearClipboardTask = new ClearClipboardTask(this, text, _uiThreadCallback); _clearClipboardTask = new ClearClipboardTask(this, text, _uiThreadCallback);
if ( clipClearTime > 0 ) { if (clipClearTime > 0)
{
_numElementsToWaitFor++; _numElementsToWaitFor++;
_timer.Schedule(_clearClipboardTask, clipClearTime); _timer.Schedule(_clearClipboardTask, clipClearTime);
} }
} }
// Task which clears the clipboard, and sends a toast to the foreground. // Task which clears the clipboard, and sends a toast to the foreground.
private class ClearClipboardTask : TimerTask { private class ClearClipboardTask : TimerTask
{
private readonly String _clearText; private readonly String _clearText;
private readonly CopyToClipboardService _service; private readonly CopyToClipboardService _service;
private readonly Handler _handler; private readonly Handler _handler;
public ClearClipboardTask(CopyToClipboardService service, String clearText, Handler handler) { public ClearClipboardTask(CopyToClipboardService service, String clearText, Handler handler)
{
_clearText = clearText; _clearText = clearText;
_service = service; _service = service;
_handler = handler; _handler = handler;
} }
public override void Run() { public override void Run()
{
String currentClip = Util.GetClipboard(_service); String currentClip = Util.GetClipboard(_service);
_handler.Post(() => _service.OnWaitElementDeleted(ClearClipboard)); _handler.Post(() => _service.OnWaitElementDeleted(ClearClipboard));
if ( currentClip.Equals(_clearText) ) { if (currentClip.Equals(_clearText))
{
Util.CopyToClipboard(_service, ""); Util.CopyToClipboard(_service, "");
_handler.Post( () => { _handler.Post(() =>
{
Toast.MakeText(_service, Resource.String.ClearClipboard, ToastLength.Long).Show(); Toast.MakeText(_service, Resource.String.ClearClipboard, ToastLength.Long).Show();
}); });
} }
@ -445,7 +455,8 @@ namespace keepass2android
private Notification GetNotification(String intentText, int descResId, int drawableResId, String entryName) { private Notification GetNotification(String intentText, int descResId, int drawableResId, String entryName)
{
String desc = GetString(descResId); String desc = GetString(descResId);
String title = GetString(Resource.String.app_name); String title = GetString(Resource.String.app_name);
@ -551,7 +562,8 @@ namespace keepass2android
[IntentFilter(new[] { Intents.CopyUsername, Intents.CopyPassword, Intents.CheckKeyboard })] [IntentFilter(new[] { Intents.CopyUsername, Intents.CopyPassword, Intents.CheckKeyboard })]
class CopyToClipboardBroadcastReceiver : BroadcastReceiver class CopyToClipboardBroadcastReceiver : BroadcastReceiver
{ {
public CopyToClipboardBroadcastReceiver(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer) public CopyToClipboardBroadcastReceiver(IntPtr javaReference, JniHandleOwnership transfer)
: base(javaReference, transfer)
{ {
} }