awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge pull request #3299 from deltachat/adb/issue-3289

Browse Source 
avoid android.view.WindowManager$BadTokenException in maybeShowConfigurationError
This commit is contained in:
Asiel Díaz Benítez
2024-09-17 22:58:28 +02:00
committed by GitHub
parent 5c9afb910d be4bc8259e
commit 0bd2c2f825
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+1 -17
View File
@@ -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())) {
src/main/java/org/thoughtcrime/securesms/WelcomeActivity.java
+2
View File
@@ -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)