mirror/BinaryEye
0
0
Fork 0
mirror of https://github.com/markusfisch/BinaryEye.git synced 2024-09-20 03:52:16 +02:00
Code

handle Intent.SEND correctly, directly opening EncodeFragment

Browse Source
This commit is contained in:
Ialokim 2018-07-29 19:20:37 +02:00
parent d3ab28f2b3
commit 1e9c303646
No known key found for this signature in database
GPG Key ID: 4603DB89AD1A9A0A
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -29,7 +29,7 @@
<activity
android:name=".activity.CameraActivity"
android:label="@string/scan_code">
<intent-filter>
<intent-filter android:label="@string/compose_barcode">
<action android:name="android.intent.action.SEND"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="text/plain"/>

4
app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt
View File

@ -113,6 +113,7 @@ class CameraActivity : AppCompatActivity() {
returnResult = "com.google.zxing.client.android.SCAN".equals(
intent.action
)
handleSendText(intent)
if (hasCameraPermission()) {
cameraView.openAsync(
CameraView.findCameraId(
@ -183,7 +184,8 @@ class CameraActivity : AppCompatActivity() {
// consume this intent
intent.setAction(null)
startActivity(MainActivity.getEncodeIntent(this, text))
startActivity(MainActivity.getEncodeIntent(this, text, true))
finish()
}
private fun hasCameraPermission(): Boolean {

7
app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt
View File

@ -59,9 +59,14 @@ class MainActivity : AppCompatActivity() {
private const val DECODE = "decode"
private const val DECODE_FORMAT = "decode_format"
fun getEncodeIntent(context: Context, text: String? = ""): Intent {
fun getEncodeIntent(context: Context, text: String? = "", external: Boolean = false): Intent {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra(ENCODE, text)
if (external) {
intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NO_HISTORY or
android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK or
android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
}
return intent
}