From 974d8e5f95cae8d205fb1a23d6442a479aca4ef2 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Thu, 27 Jul 2017 00:42:34 +0100 Subject: ensure data is not null --- app/src/main/java/com/zeapo/pwdstore/PasswordStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index f4ea9ec6..fb8ec8c7 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -565,7 +565,7 @@ public class PasswordStore extends AppCompatActivity { break; case PgpHandler.REQUEST_CODE_DECRYPT_AND_VERIFY: // if went from decrypt->edit and user saved changes, we need to commitChange - if (data.getBooleanExtra("needCommit", false)) { + if (data != null && data.getBooleanExtra("needCommit", false)) { commitChange(this.getResources().getString(R.string.edit_commit_text) + data.getExtras().getString("NAME")); refreshListAdapter(); } -- cgit v1.2.3