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 #4119 from deltachat/adb/issue-4118

Browse Source 
avoid NPE in InstantOnboardingActivity.onCreate
This commit is contained in:
adb
2025-12-12 17:14:38 +01:00
committed by GitHub
parent 353b2c0488 0a44d00451
commit 64d33bebbd
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+10 -6
View File
@@ -110,12 +110,16 @@ 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;
}
// if URI is unexpectedly null, then fallback to new profile creation
AccountManager.getInstance().beginAccountCreation(this);
}
getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(!fromWelcome) {