meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

update libs and protos

Browse source
This commit is contained in:
Kevin Hester 2021-01-03 10:22:41 +08:00
parent 026f80c5e1
commit 3d18e5d597
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -30,8 +30,8 @@ android {
applicationId "com.geeksville.mesh"
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 29
versionCode 20122 // format is Mmmss (where M is 1+the numeric major number
versionName "1.1.22"
versionCode 20130 // format is Mmmss (where M is 1+the numeric major number
versionName "1.1.30"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@ -107,7 +107,7 @@ protobuf {
dependencies {
def room_version = "2.2.5"
def room_version = '2.2.6'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

4
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -1097,10 +1097,10 @@ class MeshService : Service(), Logging {
DataPair("dev_error_count", myInfo.errorCount)
)
if (myInfo.errorCode != 0) {
if (myInfo.errorCode.number != 0) {
GeeksvilleApplication.analytics.track(
"dev_error",
DataPair("code", myInfo.errorCode),
DataPair("code", myInfo.errorCode.number),
DataPair("address", myInfo.errorAddress),
// We also include this info, because it is required to correctly decode address from the map file

2
app/src/main/proto

@ -1 +1 @@
Subproject commit 8729bad7f6cfa461be02e3ea65fbde29435b3fe3
Subproject commit dfe7bc1217a00c23eecb9dfcf1d56fe95ebddc3b