mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-19 21:17:33 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

setPackage on encode intent internally

Browse source
This commit is contained in:
Sean Owen 2020-02-16 08:46:36 -06:00
parent c1fc401d9a
commit 24a5f9c654
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/src/com/google/zxing/client/android/share/ShareActivity.java
View file

@ -104,11 +104,8 @@ public final class ShareActivity extends Activity {
};
private void launchSearch(String text) {
Intent intent = new Intent(Intents.Encode.ACTION);
intent.addFlags(Intents.FLAG_NEW_DOC);
intent.putExtra(Intents.Encode.TYPE, Contents.Type.TEXT);
Intent intent = buildEncodeIntent(Contents.Type.TEXT);
intent.putExtra(Intents.Encode.DATA, text);
intent.putExtra(Intents.Encode.FORMAT, BarcodeFormat.QR_CODE.toString());
startActivity(intent);
}
@ -156,11 +153,8 @@ public final class ShareActivity extends Activity {
if (text == null) {
return; // Show error?
}
Intent intent = new Intent(Intents.Encode.ACTION);
intent.addFlags(Intents.FLAG_NEW_DOC);
intent.putExtra(Intents.Encode.TYPE, Contents.Type.TEXT);
Intent intent = buildEncodeIntent(Contents.Type.TEXT);
intent.putExtra(Intents.Encode.DATA, text);
intent.putExtra(Intents.Encode.FORMAT, BarcodeFormat.QR_CODE.toString());
startActivity(intent);
}
@ -249,15 +243,20 @@ public final class ShareActivity extends Activity {
}
}
Intent intent = new Intent(Intents.Encode.ACTION);
intent.addFlags(Intents.FLAG_NEW_DOC);
intent.putExtra(Intents.Encode.TYPE, Contents.Type.CONTACT);
Intent intent = buildEncodeIntent(Contents.Type.CONTACT);
intent.putExtra(Intents.Encode.DATA, bundle);
intent.putExtra(Intents.Encode.FORMAT, BarcodeFormat.QR_CODE.toString());
startActivity(intent);
}
private static Intent buildEncodeIntent(String type) {
Intent intent = new Intent(Intents.Encode.ACTION);
intent.setPackage("com.google.zxing.client.android");
intent.addFlags(Intents.FLAG_NEW_DOC);
intent.putExtra(Intents.Encode.TYPE, type);
intent.putExtra(Intents.Encode.FORMAT, BarcodeFormat.QR_CODE.toString());
return intent;
}
private static String massageContactData(String data) {
// For now -- make sure we don't put newlines in shared contact data. It messes up
// any known encoding of contact data. Replace with space.