Skip to content

Commit f44cff9

Browse files
committed
Use type in getParcelableExtra() on Tiramisu+
And ignore the deprecation warning for earlier Android versions. Also use a scope function to remove the local variable in the parent context.
1 parent 24730df commit f44cff9

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.graphics.Matrix
99
import android.graphics.Rect
1010
import android.hardware.Camera
1111
import android.net.Uri
12+
import android.os.Build
1213
import android.os.Bundle
1314
import android.support.design.widget.FloatingActionButton
1415
import android.support.v7.app.AppCompatActivity
@@ -356,16 +357,23 @@ class CameraActivity : AppCompatActivity() {
356357
return
357358
}
358359

359-
// Read text from file
360-
val textUri = intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri?
361-
if (textUri != null) {
360+
// Read text from file.
361+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
362+
@Suppress("DEPRECATION")
363+
intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri?
364+
} else {
365+
intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
366+
}?.let { textUri ->
362367
val file = contentResolver.openFileDescriptor(textUri, "r")
363368
if (file != null) {
364369
val fs = FileInputStream(file.fileDescriptor)
365370
val scn = Scanner(fs).useDelimiter("\\A")
366371
if (scn.hasNext()) {
367-
val fText = scn.next()
368-
startActivity(MainActivity.getEncodeIntent(this, fText, true))
372+
startActivity(
373+
MainActivity.getEncodeIntent(
374+
this, scn.next(), true
375+
)
376+
)
369377
finish()
370378
}
371379
file.close()

0 commit comments

Comments
 (0)