From be4bc8259e2ff17572797f74665347eabd728f01 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Tue, 17 Sep 2024 17:54:38 +0200
Subject: [PATCH] avoid android.view.WindowManager$BadTokenException in
 maybeShowConfigurationError

---
 .../securesms/InstantOnboardingActivity.java   | 18 +-----------------
 .../securesms/WelcomeActivity.java             |  2 ++
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index 4918a57d8..7eee049ff 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -403,7 +403,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
 
   private void progressError(String data2) {
     progressDialog.dismiss();
-    maybeShowConfigurationError(this, data2);
+    WelcomeActivity.maybeShowConfigurationError(this, data2);
   }
 
   private void progressSuccess() {
@@ -416,22 +416,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
     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")
   private void createProfile() {
     if (TextUtils.isEmpty(this.name.getText())) {
diff --git a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
index b141216ea..54d45c075 100644
--- a/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -283,6 +283,8 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
     }
 
     public static void maybeShowConfigurationError(Activity activity, String data2) {
+        if (activity.isFinishing()) return;  // avoid android.view.WindowManager$BadTokenException
+
         if (data2 != null && !data2.isEmpty()) {
             AlertDialog d = new AlertDialog.Builder(activity)
                 .setMessage(data2)