From 65e553f3d1286d1a43a8d39d062e074e1f4e67d3 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 4 Feb 2021 11:24:55 +0800 Subject: [PATCH 1/5] update kotlin version --- geeksville-androidlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geeksville-androidlib b/geeksville-androidlib index f3812d848..d7c3fa8ab 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit f3812d8484c571f62c72d1509a1e02357fda5b8e +Subproject commit d7c3fa8ab6a47169e5dc8761d03d24588c3dd845 From 97d2ecbd0f3fe5070fbb51d6e9e41daee36f544b Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 4 Feb 2021 23:07:16 +0800 Subject: [PATCH 2/5] fix autobug: don't let users try to update firmware over USB --- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 47e05df48..677704698 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1085,6 +1085,9 @@ class MeshService : Service(), Logging { setFirmwareUpdateFilename(myInfo) + val a = RadioInterfaceService.getBondedDeviceAddress(this) + val isBluetoothInterface = a != null && a.startsWith("x") + val mi = with(myInfo) { MyNodeInfo( myNodeNum, @@ -1093,7 +1096,7 @@ class MeshService : Service(), Logging { hwModel, firmwareVersion, firmwareUpdateFilename != null, - SoftwareUpdateService.shouldUpdate( + isBluetoothInterface && SoftwareUpdateService.shouldUpdate( this@MeshService, DeviceVersion(firmwareVersion) ), From d11e7674f6a6dfa4db87b7fe3f16497fab174b63 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 4 Feb 2021 23:39:44 +0800 Subject: [PATCH 3/5] fix autobug: don't spam crashlytics when we expect position sending to fail --- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 4 +++- .../java/com/geeksville/mesh/service/RadioInterfaceService.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 677704698..5090fe03f 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -73,7 +73,9 @@ class MeshService : Service(), Logging { class IdNotFoundException(id: String) : Exception("ID not found $id") class NodeNumNotFoundException(id: Int) : Exception("NodeNum not found $id") - class IsUpdatingException() : Exception("Operation prohibited during firmware update") + + /** We treat software update as similar to loss of comms to the regular bluetooth service (so things like sendPosition for background GPS ignores the problem */ + class IsUpdatingException() : RadioNotConnectedException("Operation prohibited during firmware update") /** * Talk to our running service and try to set a new device address. And then immediately diff --git a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt index c24e5aa87..78890c334 100644 --- a/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt @@ -22,7 +22,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.cancel -class RadioNotConnectedException(message: String = "Not connected to radio") : +open class RadioNotConnectedException(message: String = "Not connected to radio") : BLEException(message) From 2c3b73ae88d86bcb6e1cfd6986dd009cb89e051b Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 5 Feb 2021 09:31:25 +0800 Subject: [PATCH 4/5] fix(?) for cyanogen problem with custom statusbar icons --- .../geeksville/mesh/service/MeshService.kt | 3 ++ .../mesh/service/MeshServiceNotifications.kt | 46 ++++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 5090fe03f..b8a4ff2f4 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -344,6 +344,9 @@ class MeshService : Service(), Logging { radio.close() saveSettings() + stopForeground(true) // Make sure we aren't using the notification first + serviceNotifications.close() + super.onDestroy() serviceJob.cancel() } 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 207ea93a1..1217c4699 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt @@ -6,27 +6,40 @@ import android.app.NotificationManager import android.app.PendingIntent import android.content.Context import android.content.Intent +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas import android.graphics.Color 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.DataPacket import com.geeksville.mesh.MainActivity import com.geeksville.mesh.R import com.geeksville.mesh.android.notificationManager import com.geeksville.mesh.utf8 +import java.io.Closeable + class MeshServiceNotifications( private val context: Context -) { +) : Closeable +{ private val notificationManager: NotificationManager get() = context.notificationManager val notifyId = 101 + private var largeIcon: Bitmap? = null @RequiresApi(Build.VERSION_CODES.O) private fun createNotificationChannel(): String { val channelId = "my_service" val channelName = context.getString(R.string.meshtastic_service_notifications) - val channel = NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_HIGH).apply { + val channel = NotificationChannel( + channelId, + channelName, + NotificationManager.IMPORTANCE_HIGH + ).apply { lightColor = Color.BLUE importance = NotificationManager.IMPORTANCE_NONE lockscreenVisibility = Notification.VISIBILITY_PRIVATE @@ -61,6 +74,25 @@ class MeshServiceNotifications( PendingIntent.getActivity(context, 0, Intent(context, MainActivity::class.java), 0) } + /** + * 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() + } + val bitmap = Bitmap.createBitmap( + drawable.intrinsicWidth, + drawable.intrinsicHeight, Bitmap.Config.ARGB_8888 + ) + val canvas = Canvas(bitmap) + drawable.setBounds(0, 0, canvas.width, canvas.height) + drawable.draw(canvas) + return bitmap + } + /** * Generate a new version of our notification - reflecting current app state */ @@ -69,11 +101,16 @@ class MeshServiceNotifications( summaryString: String, senderName: String ): Notification { + // We delay making this bitmap until we know we need it + if(largeIcon == null) + largeIcon = getBitmapFromVectorDrawable(R.mipmap.ic_launcher2) + val category = if (recentReceivedText != null) Notification.CATEGORY_SERVICE else Notification.CATEGORY_MESSAGE val builder = NotificationCompat.Builder(context, channelId).setOngoing(true) .setPriority(NotificationCompat.PRIORITY_MIN) .setCategory(category) .setSmallIcon(if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) R.drawable.app_icon_novect else R.drawable.app_icon) // vector form icons don't work reliably on older androids + .setLargeIcon(largeIcon) // we must include a large icon because of a bug in cyanogenmod https://github.com/open-keychain/open-keychain/issues/1356#issue-89493995 .setContentTitle(summaryString) // leave this off for now so our notification looks smaller .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setContentIntent(openAppIntent) @@ -93,4 +130,9 @@ class MeshServiceNotifications( return builder.build() } + + override fun close() { + largeIcon?.recycle() + largeIcon = null + } } From 48d870a035b3809502ebd4af75f18b31f02962f9 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 5 Feb 2021 09:31:58 +0800 Subject: [PATCH 5/5] 1.1.42 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fb75ed47a..589fa3613 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "com.geeksville.mesh" minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works) targetSdkVersion 29 - versionCode 20141 // format is Mmmss (where M is 1+the numeric major number - versionName "1.1.41" + versionCode 20142 // format is Mmmss (where M is 1+the numeric major number + versionName "1.1.42" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // per https://developer.android.com/studio/write/vector-asset-studio