diff options
| author | wongma7 <wongma7@users.noreply.github.com> | 2015-08-29 04:00:19 -0400 |
|---|---|---|
| committer | wongma7 <wongma7@users.noreply.github.com> | 2015-08-29 04:00:19 -0400 |
| commit | 379daad3dc5b78547c3d383419d1c141b34f08b9 (patch) | |
| tree | c576ea1264883ad3f34b0c6179a84d8d17b7b118 /app/src/main/java | |
| parent | c6c5ffa5dde2cef785f4c66e2ec3322d542f109c (diff) | |
| parent | 1a1cc1c29b748692b88f5a16eb7ab9d2e2fe5870 (diff) | |
Merge pull request #126 from betheg/fix_npe
PgpHandler: fix possible npe.
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index d8c47b2a..131e8e51 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -451,7 +451,10 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: { Log.i("PgpHandler", "RESULT_CODE_USER_INTERACTION_REQUIRED"); - findViewById(R.id.progress_bar_label).setVisibility(View.VISIBLE); + View progress_bar_label = findViewById(R.id.progress_bar_label); + if (progress_bar_label != null) { + progress_bar_label.setVisibility(View.VISIBLE); + } PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); try { |