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

allow to paste from clipboard in RegistrationQrActivity

Browse source
This commit is contained in:
adbenitez 2024-10-21 21:31:06 +02:00
parent a7647e18e2
commit 5954b13440
4 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -194,9 +194,15 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
break;
case IntentIntegrator.REQUEST_CODE:
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
if (scanResult != null && scanResult.getFormatName() != null) {
setProviderFromQr(scanResult.getContents());
String qrRaw = data.getStringExtra(RegistrationQrActivity.QRDATA_EXTRA);
if (qrRaw == null) {
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
if (scanResult != null && scanResult.getFormatName() != null) {
qrRaw = scanResult.getContents();
}
}
if (qrRaw != null) {
setProviderFromQr(qrRaw);
}
break;
}