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

avoid android.view.WindowManager$BadTokenException in maybeShowConfigurationError

Browse source
This commit is contained in:
adbenitez 2024-09-17 17:54:38 +02:00
parent 529842ad60
commit be4bc8259e
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -403,7 +403,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
private void progressError(String data2) { private void progressError(String data2) {
progressDialog.dismiss(); progressDialog.dismiss();
maybeShowConfigurationError(this, data2); WelcomeActivity.maybeShowConfigurationError(this, data2);
} }
private void progressSuccess() { private void progressSuccess() {
@ -416,22 +416,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
finishAffinity(); finishAffinity();
} }
public static void maybeShowConfigurationError(Activity activity, String data2) {
if (data2 != null && !data2.isEmpty()) {
AlertDialog d = new AlertDialog.Builder(activity)
.setMessage(data2)
.setPositiveButton(android.R.string.ok, null)
.create();
d.show();
try {
//noinspection ConstantConditions
Linkify.addLinks((TextView) d.findViewById(android.R.id.message), Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES);
} catch(NullPointerException e) {
Log.e(TAG, "Linkify failed", e);
}
}
}
@SuppressLint("StaticFieldLeak") @SuppressLint("StaticFieldLeak")
private void createProfile() { private void createProfile() {
if (TextUtils.isEmpty(this.name.getText())) { if (TextUtils.isEmpty(this.name.getText())) {

2
src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
View file

@ -283,6 +283,8 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
} }
public static void maybeShowConfigurationError(Activity activity, String data2) { public static void maybeShowConfigurationError(Activity activity, String data2) {
if (activity.isFinishing()) return; // avoid android.view.WindowManager$BadTokenException
if (data2 != null && !data2.isEmpty()) { if (data2 != null && !data2.isEmpty()) {
AlertDialog d = new AlertDialog.Builder(activity) AlertDialog d = new AlertDialog.Builder(activity)
.setMessage(data2) .setMessage(data2)