From 3d18e5d5973be9d47356397f7a004a6b16878870 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sun, 3 Jan 2021 10:22:41 +0800
Subject: [PATCH] update libs and protos

---
 app/build.gradle                                            | 6 +++---
 .../main/java/com/geeksville/mesh/service/MeshService.kt    | 4 ++--
 app/src/main/proto                                          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6d4c9c306..1aa76e058 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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"
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 30d2e8087..623f66c1e 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -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
diff --git a/app/src/main/proto b/app/src/main/proto
index 8729bad7f..dfe7bc121 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit 8729bad7f6cfa461be02e3ea65fbde29435b3fe3
+Subproject commit dfe7bc1217a00c23eecb9dfcf1d56fe95ebddc3b