mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-20 00:02:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Added null checking throughout autofill service

Browse source
This commit is contained in:
Kyle Spearrin 2017-02-22 19:00:50 -05:00
parent 27202fd740
commit 98a6a5c93d
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Android/AutofillService.cs
View file

@ -54,8 +54,8 @@ namespace Bit.Android
public override void OnAccessibilityEvent(AccessibilityEvent e)
{
var root = RootInActiveWindow;
if(string.IsNullOrWhiteSpace(e.PackageName) || e.PackageName == SystemUiPackage ||
root?.PackageName != e.PackageName)
if(e == null || root == null || string.IsNullOrWhiteSpace(e.PackageName) ||
e.PackageName == SystemUiPackage || root.PackageName != e.PackageName)
{
return;
}
@ -67,7 +67,7 @@ namespace Bit.Android
testNodes = null;
*/
var notificationManager = ((NotificationManager)GetSystemService(NotificationService));
var notificationManager = (NotificationManager)GetSystemService(NotificationService);
switch(e.EventType)
{
case EventTypes.WindowContentChanged:
@ -76,7 +76,7 @@ namespace Bit.Android
if(e.PackageName == BitwardenPackage)
{
notificationManager.Cancel(AutoFillNotificationId);
notificationManager?.Cancel(AutoFillNotificationId);
break;
}
@ -112,14 +112,14 @@ namespace Bit.Android
if(cancelNotification)
{
notificationManager.Cancel(AutoFillNotificationId);
notificationManager?.Cancel(AutoFillNotificationId);
}
break;
default:
break;
}
notificationManager.Dispose();
notificationManager?.Dispose();
notificationManager = null;
root.Dispose();
root = null;
@ -201,11 +201,16 @@ namespace Bit.Android
private static bool EditText(AccessibilityNodeInfo n)
{
return n.ClassName != null && n.ClassName.Contains("EditText");
return n?.ClassName?.Contains("EditText") ?? false;
}
private void NotifyToAutofill(string uri, NotificationManager notificationManager)
{
if(notificationManager == null || string.IsNullOrWhiteSpace(uri))
{
return;
}
var intent = new Intent(this, typeof(AutofillActivity));
intent.PutExtra("uri", uri);
intent.SetFlags(ActivityFlags.NewTask | ActivityFlags.SingleTop | ActivityFlags.ClearTop);
@ -234,10 +239,10 @@ namespace Bit.Android
private void FillCredentials(AccessibilityNodeInfo usernameNode, IEnumerable<AccessibilityNodeInfo> passwordNodes)
{
FillEditText(usernameNode, AutofillActivity.LastCredentials.Username);
FillEditText(usernameNode, AutofillActivity.LastCredentials?.Username);
foreach(var n in passwordNodes)
{
FillEditText(n, AutofillActivity.LastCredentials.Password);
FillEditText(n, AutofillActivity.LastCredentials?.Password);
}
}