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

added #if EXCLUDE

Browse Source
This commit is contained in:
Philipp Crocoll
2014-05-25 06:12:52 +02:00
parent e871664ff4
commit 3e95b528e3
1 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
src/keepass2android/services/CopyToClipboardService.cs
View File

@@ -40,10 +40,10 @@ namespace keepass2android
/// The notifications require to be displayed by a service in order to be kept when the activity is closed /// The notifications require to be displayed by a service in order to be kept when the activity is closed
/// after searching for a URL. /// after searching for a URL.
[Service] [Service]
public class CopyToClipboardService: Service public class CopyToClipboardService : Service
{ {
public const int NotifyUsername = 1; public const int NotifyUsername = 1;
public const int NotifyPassword = 2; public const int NotifyPassword = 2;
public const int NotifyKeyboard = 3; public const int NotifyKeyboard = 3;
@@ -66,13 +66,13 @@ namespace keepass2android
public static void CancelNotifications(Context ctx) public static void CancelNotifications(Context ctx)
{ {
Intent i = new Intent(ctx, typeof(CopyToClipboardService)); Intent i = new Intent(ctx, typeof(CopyToClipboardService));
i.SetAction(Intents.ClearNotificationsAndData); i.SetAction(Intents.ClearNotificationsAndData);
ctx.StartService(i); ctx.StartService(i);
} }
public CopyToClipboardService (IntPtr javaReference, JniHandleOwnership transfer) public CopyToClipboardService(IntPtr javaReference, JniHandleOwnership transfer)
: base(javaReference, transfer) : base(javaReference, transfer)
{ {
} }
@@ -112,7 +112,7 @@ namespace keepass2android
try try
{ {
if ((App.Kp2a.GetDb().LastOpenedEntry != null) if ((App.Kp2a.GetDb().LastOpenedEntry != null)
&& (entryId.Equals(App.Kp2a.GetDb().LastOpenedEntry.Uuid))) && (entryId.Equals(App.Kp2a.GetDb().LastOpenedEntry.Uuid)))
{ {
entry = App.Kp2a.GetDb().LastOpenedEntry; entry = App.Kp2a.GetDb().LastOpenedEntry;
} }
@@ -120,7 +120,7 @@ namespace keepass2android
{ {
entry = new PwEntryOutput(App.Kp2a.GetDb().Entries[entryId], App.Kp2a.GetDb().KpDatabase); entry = new PwEntryOutput(App.Kp2a.GetDb().Entries[entryId], App.Kp2a.GetDb().KpDatabase);
} }
} }
catch (Exception) catch (Exception)
{ {
@@ -137,16 +137,18 @@ 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)
{ {
TimeoutCopyToClipboard(intent.GetStringExtra(_stringtocopy)); TimeoutCopyToClipboard(intent.GetStringExtra(_stringtocopy));
} }
if (intent.Action == Intents.ActivateKeyboard) if (intent.Action == Intents.ActivateKeyboard)
@@ -157,7 +159,7 @@ namespace keepass2android
{ {
ClearNotifications(); ClearNotifications();
} }
return StartCommandResult.RedeliverIntent; return StartCommandResult.RedeliverIntent;
} }
@@ -171,7 +173,7 @@ namespace keepass2android
private NotificationManager _notificationManager; private NotificationManager _notificationManager;
private int _numElementsToWaitFor; private int _numElementsToWaitFor;
public override void OnDestroy() public override void OnDestroy()
{ {
Kp2aLog.Log("CopyToClipboardService.OnDestroy"); Kp2aLog.Log("CopyToClipboardService.OnDestroy");
@@ -185,12 +187,13 @@ 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);
_numElementsToWaitFor= 0; _numElementsToWaitFor = 0;
ClearKeyboard(true); ClearKeyboard(true);
} }
if (_clearClipboardTask != null) if (_clearClipboardTask != null)
@@ -200,7 +203,7 @@ namespace keepass2android
} }
Kp2aLog.Log("Destroyed Show-Notification-Receiver."); Kp2aLog.Log("Destroyed Show-Notification-Receiver.");
base.OnDestroy(); base.OnDestroy();
} }
@@ -263,12 +266,12 @@ namespace keepass2android
_numElementsToWaitFor++; _numElementsToWaitFor++;
_notificationManager.Notify(NotifyKeyboard, keyboard); _notificationManager.Notify(NotifyKeyboard, keyboard);
//if the app is about to be closed again (e.g. after searching for a URL and returning to the browser: //if the app is about to be closed again (e.g. after searching for a URL and returning to the browser:
// automatically bring up the Keyboard selection dialog // automatically bring up the Keyboard selection dialog
if ((closeAfterCreate) && prefs.GetBoolean(GetString(Resource.String.OpenKp2aKeyboardAutomatically_key), Resources.GetBoolean(Resource.Boolean.OpenKp2aKeyboardAutomatically_default))) if ((closeAfterCreate) && prefs.GetBoolean(GetString(Resource.String.OpenKp2aKeyboardAutomatically_key), Resources.GetBoolean(Resource.Boolean.OpenKp2aKeyboardAutomatically_default)))
{ {
ActivateKp2aKeyboard(); ActivateKp2aKeyboard();
} }
} }
} }
@@ -298,8 +301,8 @@ namespace keepass2android
private bool ClearNotifications() private bool ClearNotifications()
{ {
// Notification Manager // Notification Manager
_notificationManager = (NotificationManager) GetSystemService(NotificationService); _notificationManager = (NotificationManager)GetSystemService(NotificationService);
_notificationManager.Cancel(NotifyPassword); _notificationManager.Cancel(NotifyPassword);
_notificationManager.Cancel(NotifyUsername); _notificationManager.Cancel(NotifyUsername);
@@ -363,7 +366,7 @@ namespace keepass2android
#endif #endif
} }
public void OnWaitElementDeleted(int itemId) public void OnWaitElementDeleted(int itemId)
{ {
_numElementsToWaitFor--; _numElementsToWaitFor--;
@@ -396,48 +399,55 @@ 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);
String sClipClear = prefs.GetString(GetString(Resource.String.clipboard_timeout_key), GetString(Resource.String.clipboard_timeout_default)); String sClipClear = prefs.GetString(GetString(Resource.String.clipboard_timeout_key), GetString(Resource.String.clipboard_timeout_default));
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();
}); });
} }
} }
} }
// Setup to allow the toast to happen in the foreground // Setup to allow the toast to happen in the foreground
readonly Handler _uiThreadCallback = new Handler(); readonly Handler _uiThreadCallback = new Handler();
private ClearClipboardTask _clearClipboardTask; private ClearClipboardTask _clearClipboardTask;
@@ -445,22 +455,23 @@ 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);
if (!String.IsNullOrEmpty(entryName)) if (!String.IsNullOrEmpty(entryName))
title += " (" + entryName +")"; title += " (" + entryName + ")";
Notification notify = new Notification(drawableResId, desc, Java.Lang.JavaSystem.CurrentTimeMillis()); Notification notify = new Notification(drawableResId, desc, Java.Lang.JavaSystem.CurrentTimeMillis());
Intent intent = new Intent(intentText); Intent intent = new Intent(intentText);
intent.SetPackage(PackageName); intent.SetPackage(PackageName);
PendingIntent pending = PendingIntent.GetBroadcast(this, descResId, intent, PendingIntentFlags.CancelCurrent); PendingIntent pending = PendingIntent.GetBroadcast(this, descResId, intent, PendingIntentFlags.CancelCurrent);
notify.SetLatestEventInfo(this, title, desc, pending); notify.SetLatestEventInfo(this, title, desc, pending);
return notify; return notify;
} }
@@ -482,10 +493,10 @@ namespace keepass2android
} }
} }
} }
class NotificationDeletedBroadcastReceiver: BroadcastReceiver
class NotificationDeletedBroadcastReceiver : BroadcastReceiver
{ {
readonly CopyToClipboardService _service; readonly CopyToClipboardService _service;
public NotificationDeletedBroadcastReceiver(CopyToClipboardService service) public NotificationDeletedBroadcastReceiver(CopyToClipboardService service)
@@ -504,54 +515,55 @@ namespace keepass2android
#endregion #endregion
} }
internal void ActivateKp2aKeyboard() internal void ActivateKp2aKeyboard()
{ {
string currentIme = Android.Provider.Settings.Secure.GetString( string currentIme = Android.Provider.Settings.Secure.GetString(
ContentResolver, ContentResolver,
Android.Provider.Settings.Secure.DefaultInputMethod); Android.Provider.Settings.Secure.DefaultInputMethod);
string kp2aIme = PackageName + "/keepass2android.softkeyboard.KP2AKeyboard"; string kp2aIme = PackageName + "/keepass2android.softkeyboard.KP2AKeyboard";
InputMethodManager imeManager = (InputMethodManager)ApplicationContext.GetSystemService(InputMethodService); InputMethodManager imeManager = (InputMethodManager)ApplicationContext.GetSystemService(InputMethodService);
if (imeManager == null) if (imeManager == null)
{ {
Toast.MakeText(this, Resource.String.not_possible_im_picker, ToastLength.Long).Show(); Toast.MakeText(this, Resource.String.not_possible_im_picker, ToastLength.Long).Show();
return; return;
} }
if (currentIme == kp2aIme) if (currentIme == kp2aIme)
{ {
imeManager.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.None); imeManager.ToggleSoftInput(ShowFlags.Forced, HideSoftInputFlags.None);
} }
else else
{ {
IList<InputMethodInfo> inputMethodProperties = imeManager.EnabledInputMethodList; IList<InputMethodInfo> inputMethodProperties = imeManager.EnabledInputMethodList;
if (!inputMethodProperties.Any(imi => imi.Id.Equals(kp2aIme))) if (!inputMethodProperties.Any(imi => imi.Id.Equals(kp2aIme)))
{ {
Toast.MakeText(this, Resource.String.please_activate_keyboard, ToastLength.Long).Show(); Toast.MakeText(this, Resource.String.please_activate_keyboard, ToastLength.Long).Show();
Intent settingsIntent = new Intent(Android.Provider.Settings.ActionInputMethodSettings); Intent settingsIntent = new Intent(Android.Provider.Settings.ActionInputMethodSettings);
settingsIntent.SetFlags(ActivityFlags.NewTask); settingsIntent.SetFlags(ActivityFlags.NewTask);
StartActivity(settingsIntent); StartActivity(settingsIntent);
} }
else else
{ {
#if !EXCLUDE_KEYBOARD #if !EXCLUDE_KEYBOARD
Keepass2android.Kbbridge.ImeSwitcher.SwitchToKeyboard(this, kp2aIme, false); Keepass2android.Kbbridge.ImeSwitcher.SwitchToKeyboard(this, kp2aIme, false);
#endif #endif
} }
} }
} }
} }
[BroadcastReceiver(Permission = "keepass2android." + AppNames.PackagePart + ".permission.CopyToClipboard")] [BroadcastReceiver(Permission = "keepass2android." + AppNames.PackagePart + ".permission.CopyToClipboard")]
[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)
{ {
} }
@@ -568,7 +580,7 @@ namespace keepass2android
//this should always be non-null, but if the OS has killed the app, it might occur. //this should always be non-null, but if the OS has killed the app, it might occur.
if (App.Kp2a.GetDb().LastOpenedEntry == null) if (App.Kp2a.GetDb().LastOpenedEntry == null)
{ {
Intent i = new Intent(context, typeof (AppKilledInfo)); Intent i = new Intent(context, typeof(AppKilledInfo));
i.SetFlags(ActivityFlags.ClearTask | ActivityFlags.NewTask); i.SetFlags(ActivityFlags.ClearTask | ActivityFlags.NewTask);
context.StartActivity(i); context.StartActivity(i);
return; return;