From c9bff2b942f5da3aaeb75d3d4dc3c1b0f86fc276 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Sun, 19 Mar 2023 07:55:19 -0300
Subject: [PATCH] fix: remove unnecessary SDK_INT < 21 check

---
 .../mesh/service/MeshServiceNotifications.kt       | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
index d2f5f4da1..c9b6ac6b8 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
@@ -15,7 +15,6 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.DrawableCompat
 import com.geeksville.mesh.MainActivity
 import com.geeksville.mesh.R
 import com.geeksville.mesh.android.notificationManager
@@ -102,7 +101,7 @@ class MeshServiceNotifications(
     fun updateMessageNotification(name: String, message: String) =
         notificationManager.notify(
             messageNotifyId,
-            createMessageNotifcation(name, message)
+            createMessageNotification(name, message)
         )
 
     private val openAppIntent: PendingIntent by lazy {
@@ -117,11 +116,8 @@ class MeshServiceNotifications(
      * Generate a bitmap from a vector drawable (even on old builds)
      * https://stackoverflow.com/questions/33696488/getting-bitmap-from-vector-drawable
      */
-    fun getBitmapFromVectorDrawable(drawableId: Int): Bitmap {
-        var drawable = ContextCompat.getDrawable(context, drawableId)!!
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            drawable = DrawableCompat.wrap(drawable).mutate()
-        }
+    private fun getBitmapFromVectorDrawable(drawableId: Int): Bitmap {
+        val drawable = ContextCompat.getDrawable(context, drawableId)!!
         val bitmap = Bitmap.createBitmap(
             drawable.intrinsicWidth,
             drawable.intrinsicHeight, Bitmap.Config.ARGB_8888
@@ -132,7 +128,7 @@ class MeshServiceNotifications(
         return bitmap
     }
 
-    fun commonBuilder(channel: String): NotificationCompat.Builder {
+    private fun commonBuilder(channel: String): NotificationCompat.Builder {
         val builder = NotificationCompat.Builder(context, channel)
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             .setContentIntent(openAppIntent)
@@ -166,7 +162,7 @@ class MeshServiceNotifications(
         return builder.build()
     }
 
-    fun createMessageNotifcation(name: String, message: String): Notification {
+    private fun createMessageNotification(name: String, message: String): Notification {
         val builder = commonBuilder(messageChannelId)
         with(builder) {
             priority = NotificationCompat.PRIORITY_DEFAULT