ensure data is not null

zeapo · zeapo · commit 974d8e5f95ca · 2017-07-27T00:45:09.000+01:00
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -565,7 +565,7 @@ protected void onActivityResult(int requestCode, int resultCode,
                     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();
                     }

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ protected void onActivityResult(int requestCode, int resultCode,`
`565`	`565`	`break;`
`566`	`566`	`case PgpHandler.REQUEST_CODE_DECRYPT_AND_VERIFY:`
`567`	`567`	`// if went from decrypt->edit and user saved changes, we need to commitChange`
`568`		`- if (data.getBooleanExtra("needCommit", false)) {`
	`568`	`+ if (data != null && data.getBooleanExtra("needCommit", false)) {`
`569`	`569`	`commitChange(this.getResources().getString(R.string.edit_commit_text) + data.getExtras().getString("NAME"));`
`570`	`570`	`refreshListAdapter();`
`571`	`571`	`}`