mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix: remove unnecessary SDK_INT < 21 check

pull/608/head
andrekir 2023-03-19 07:55:19 -03:00
rodzic 8a74a234da
commit c9bff2b942
1 zmienionych plików z 5 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
Wyświetl plik

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