From b0ca48740a9ddf79b448365e0d562f937ec146c4 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 12 Dec 2025 15:01:41 +0100 Subject: [PATCH 1/3] avoid NPE in InstantOnboardingActivity.onCreate --- .../securesms/InstantOnboardingActivity.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java index f9d6ded94..057f106b2 100644 --- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java @@ -111,12 +111,14 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements if (DcHelper.getContext(this).isConfigured() == 1) { // if account is configured it means we didn't come from Welcome screen nor from QR scanner, // instead, user clicked a dcaccount:// URI directly, so we need to just offer to add a new relay - Intent intent = new Intent(this, RelayListActivity.class); - String qrData = getIntent().getData().toString(); - intent.putExtra(RelayListActivity.EXTRA_QR_DATA, qrData); - startActivity(intent); - finish(); - return; + Uri uri = getIntent().getData(); + if (uri != null) { + Intent intent = new Intent(this, RelayListActivity.class); + intent.putExtra(RelayListActivity.EXTRA_QR_DATA, uri.toString()); + startActivity(intent); + finish(); + return; + } } getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(!fromWelcome) { From fbc01ff0a294b3b477455115d58efe389463e71d Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 12 Dec 2025 15:05:04 +0100 Subject: [PATCH 2/3] switch to new profile if no URI is available --- .../org/thoughtcrime/securesms/InstantOnboardingActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java index 057f106b2..c9b370ec2 100644 --- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java @@ -119,6 +119,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements finish(); return; } + AccountManager.getInstance().beginAccountCreation(this); } getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(!fromWelcome) { From 0a44d00451811a788b5c651411cc0c3f1c960c91 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 12 Dec 2025 17:04:36 +0100 Subject: [PATCH 3/3] add comment --- .../org/thoughtcrime/securesms/InstantOnboardingActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java index c9b370ec2..aa85a4113 100644 --- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java @@ -119,6 +119,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements finish(); return; } + // if URI is unexpectedly null, then fallback to new profile creation AccountManager.getInstance().beginAccountCreation(this); }