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

avoid potential NullReferenceException

Browse Source
This commit is contained in:
Philipp Crocoll
2019-08-05 06:36:40 +02:00
parent b0f61038e3
commit 428c360abf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/keepass2android/PasswordActivity.cs
View File

@@ -1793,12 +1793,12 @@ namespace keepass2android
if ((int) Build.VERSION.SdkInt >= 26)
{
Android.Content.ClipboardManager clipboardManager = (ClipboardManager)GetSystemService(Context.ClipboardService);
if (clipboardManager.PrimaryClip.Description.Timestamp <
Java.Lang.JavaSystem.CurrentTimeMillis() - 5000)
if (clipboardManager?.PrimaryClip?.Description == null || (clipboardManager.PrimaryClip.Description.Timestamp <
Java.Lang.JavaSystem.CurrentTimeMillis() - 5000))
return; //data older than 5 seconds
}
string clipboardContent = Util.GetClipboard(this);
if (_otpInfo.OtpLength != clipboardContent.Length)
if (clipboardContent == null || (_otpInfo.OtpLength != clipboardContent.Length))
{
return;
}
@@ -1814,7 +1814,7 @@ namespace keepass2android
foreach (int otpId in _otpTextViewIds)
{
EditText otpEdit = FindViewById<EditText>(otpId);
if (otpEdit.Visibility == ViewStates.Visible)
if (otpEdit?.Visibility == ViewStates.Visible)
{
if (string.IsNullOrEmpty(otpEdit.Text))
{