Guard some methods

This commit is contained in:
tarsin committed 2022-11-19 22:57:34 +08:00
1 parent d173e83e01
commit 63d95b1265
2 files changed
+3 -11

No files matched your search

+2 -10
View File
@@ -28,11 +28,6 @@ import android.graphics.PixelFormat
import android.graphics.drawable.AnimatedImageDrawable
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import androidx.core.graphics.component1
import androidx.core.graphics.component2
import androidx.core.graphics.component3
import androidx.core.graphics.component4
import androidx.core.graphics.drawable.toBitmap
import androidx.core.graphics.drawable.toDrawable
import java.io.FileInputStream
import java.nio.channels.FileChannel
@@ -84,10 +79,7 @@ class Image private constructor(source: Source?, drawable: Drawable? = null,
private fun updateBitmap() {
prepareBitmap()
val (oldLeft, oldTop, oldRight, oldBottom) = mObtainedDrawable!!.bounds
mObtainedDrawable!!.setBounds(0, 0, width, height)
mObtainedDrawable!!.draw(Canvas(mBitmap!!))
mObtainedDrawable!!.setBounds(oldLeft, oldTop, oldRight, oldBottom)
}
fun render(
@@ -99,7 +91,7 @@ class Image private constructor(source: Source?, drawable: Drawable? = null,
updateBitmap()
mBitmap!!
} else {
mObtainedDrawable!!.toBitmap()
(mObtainedDrawable as BitmapDrawable).bitmap
}
nativeRender(
bitmap,
@@ -119,7 +111,7 @@ class Image private constructor(source: Source?, drawable: Drawable? = null,
updateBitmap()
mBitmap!!
} else {
mObtainedDrawable!!.toBitmap()
(mObtainedDrawable as BitmapDrawable).bitmap
}
nativeTexImage(
bitmap,
@@ -59,7 +59,7 @@ fun ClipboardManager.getTextFromClipboard(context: Context): String? {
}
fun ClipboardManager.getUrlFromClipboard(context: Context): String? {
if (primaryClipDescription?.classificationStatus == ClipDescription.CLASSIFICATION_COMPLETE) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && primaryClipDescription?.classificationStatus == ClipDescription.CLASSIFICATION_COMPLETE) {
if ((primaryClipDescription?.getConfidenceScore(TextClassifier.TYPE_URL)
?.let { it <= 0 }) == true
) {