From 63d95b1265404753eb359eaf8a590ecb30ba7405 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 19 Nov 2022 22:57:34 +0800
Subject: [PATCH] Guard some methods

---
 app/src/main/java/com/hippo/image/Image.kt        | 12 ++----------
 app/src/main/java/com/hippo/util/ClipboardUtil.kt |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/hippo/image/Image.kt b/app/src/main/java/com/hippo/image/Image.kt
index dee87c29f..f47d99ff1 100644
--- a/app/src/main/java/com/hippo/image/Image.kt
+++ b/app/src/main/java/com/hippo/image/Image.kt
@@ -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,
diff --git a/app/src/main/java/com/hippo/util/ClipboardUtil.kt b/app/src/main/java/com/hippo/util/ClipboardUtil.kt
index cda360c5e..8dc7e664e 100644
--- a/app/src/main/java/com/hippo/util/ClipboardUtil.kt
+++ b/app/src/main/java/com/hippo/util/ClipboardUtil.kt
@@ -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
         ) {