yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-06 11:59:58 +02:00
Code Issues Releases Wiki Activity

fix: Avoid NPE because of progressDialog (#3715)

Browse source
This commit is contained in:
Hocuri 2025-04-03 14:11:08 +02:00 • committed by GitHub
parent 10c4a105bb
commit 05d2d0964f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
View file

@ -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);