From 05d2d0964f4d1d5bec1127c1c779b57592851eee Mon Sep 17 00:00:00 2001 From: Hocuri Date: Thu, 3 Apr 2025 14:11:08 +0200 Subject: [PATCH] fix: Avoid NPE because of progressDialog (#3715) --- .../securesms/InstantOnboardingActivity.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java index 5830eac8a..fe575a452 100644 --- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java @@ -88,7 +88,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements private AttachmentManager attachmentManager; private Bitmap avatarBmp; - private ProgressDialog progressDialog; + private @Nullable ProgressDialog progressDialog; private DcContext dcContext; @Override @@ -416,17 +416,23 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements private void progressUpdate(int progress) { int percent = progress / 10; - progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent)); + if (progressDialog != null) { + progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent)); + } } private void progressError(String data2) { - progressDialog.dismiss(); + if (progressDialog != null) { + progressDialog.dismiss(); + } WelcomeActivity.maybeShowConfigurationError(this, data2); } private void progressSuccess() { DcHelper.getEventCenter(this).endCaptureNextError(); - progressDialog.dismiss(); + if (progressDialog != null) { + progressDialog.dismiss(); + } Intent intent = new Intent(getApplicationContext(), ConversationListActivity.class); intent.putExtra(ConversationListActivity.FROM_WELCOME, true);