From 428c360abfcc0a0b934527fd87a4b79825918975 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 5 Aug 2019 06:36:40 +0200 Subject: [PATCH] avoid potential NullReferenceException --- src/keepass2android/PasswordActivity.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index 8f0261d1..12777d88 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -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(otpId); - if (otpEdit.Visibility == ViewStates.Visible) + if (otpEdit?.Visibility == ViewStates.Visible) { if (string.IsNullOrEmpty(otpEdit.Text)) {