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 #3078 from deltachat/adb/adb-3077

Browse Source 
bugfix: parse results of scanning QR code in NewConversationActivity
This commit is contained in:
Asiel Díaz Benítez
2024-05-21 20:06:42 +02:00
committed by GitHub
parent 99eb6e5a3c 679ba846a6
commit ff80dcfd40
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/NewConversationActivity.java
+16
View File
@@ -29,9 +29,11 @@ import androidx.appcompat.app.AlertDialog;
import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.qr.QrActivity;
import org.thoughtcrime.securesms.qr.QrCodeHandler;
import org.thoughtcrime.securesms.util.MailtoUtil;
import static org.thoughtcrime.securesms.ConversationActivity.CHAT_ID_EXTRA;
@@ -125,6 +127,20 @@ public class NewConversationActivity extends ContactSelectionActivity {
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case IntentIntegrator.REQUEST_CODE:
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
QrCodeHandler qrCodeHandler = new QrCodeHandler(this);
qrCodeHandler.onScanPerformed(scanResult);
break;
default:
break;
}
}
private void openConversation(int chatId) {
Intent intent = new Intent(this, ConversationActivity.class);
intent.putExtra(TEXT_EXTRA, getIntent().getStringExtra(TEXT_EXTRA));