mirror/BinaryEye
0
0
Fork 0
mirror of https://github.com/markusfisch/BinaryEye.git synced 2024-09-19 19:42:18 +02:00
Code

Use type in getParcelableExtra() on Tiramisu+

Browse Source 
And ignore the deprecation warning for earlier Android versions.

Also use a scope function to remove the local variable in the
parent context.
This commit is contained in:
Markus Fisch 2024-06-30 19:06:02 +02:00
parent 24730dfde3
commit f44cff9912
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import android.graphics.Matrix
import android.graphics.Rect
import android.hardware.Camera
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.design.widget.FloatingActionButton
import android.support.v7.app.AppCompatActivity
@ -356,16 +357,23 @@ class CameraActivity : AppCompatActivity() {
return
}
// Read text from file
val textUri = intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri?
if (textUri != null) {
// Read text from file.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
@Suppress("DEPRECATION")
intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri?
} else {
intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
}?.let { textUri ->
val file = contentResolver.openFileDescriptor(textUri, "r")
if (file != null) {
val fs = FileInputStream(file.fileDescriptor)
val scn = Scanner(fs).useDelimiter("\\A")
if (scn.hasNext()) {
val fText = scn.next()
startActivity(MainActivity.getEncodeIntent(this, fText, true))
startActivity(
MainActivity.getEncodeIntent(
this, scn.next(), true
)
)
finish()
}
file.close()