summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorMichael <betheg@bitcloner.org>2015-08-28 23:29:51 +0200
committerMichael <betheg@bitcloner.org>2015-08-29 09:40:54 +0200
commit1a1cc1c29b748692b88f5a16eb7ab9d2e2fe5870 (patch)
treec576ea1264883ad3f34b0c6179a84d8d17b7b118 /app/src/main/java
parentc6c5ffa5dde2cef785f4c66e2ec3322d542f109c (diff)
PgpHandler: fix possible npe.
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java5
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 {