Merge branch 'main' into 4.10.0

meshtastic · Feb 8, 2024 · 2cf3649 · 2cf3649
2 parents a9272d7 + ede8b77
commit 2cf3649
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -491,3 +491,115 @@ app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/Position$Creator.cla
 app/build/tmp/kotlin-classes/civRelease/com/geeksville/mesh/Position.class
 app/build/tmp/kotlin-classes/civRelease/META-INF/ATAK-Plugin-Meshtastic Plugin-1.0.2-5e7ef0f2-4.8.1_civRelease.kotlin_module
 .DS_Store
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/+Uuux8ZctRn3S+RWt0TurwwbzHo=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/0U0O0IWQtbOyk5oCUjXt04SPfx0=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/2IykhlGekBQCJ+rraiHMnYS_O5Y=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/45iVKpg90TGThvNN94n1PS_0c64=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/4byB_oyWlKOXULRWzEaxzaN+hSk=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/53dP4n5bIc03d1vng7yc6lm2W8E=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/7M0s7m5qkipNoEZFiZiyfPXtFqs=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/9scwMUB74+t6zvSfUqd99pSeSwo=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/dgqlfDK04fyrTWQwP4IGoqLaUOY=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/G9q8KdmzjNchp5TIjaoqWJwMOhY=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/guDVBhOXmF+SESij2Y14ZWxuauA=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/HTuifWEXVSUtYHChJ8fhvtNcWc4=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/kGrAWWSCnalY3CTtBCpMuTaiffs=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/qoRqW7CgnLCOx6IvHLjh4rA_SaM=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/QvGxEgL6CLAeVrQQB5RDsnLO4Zo=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/SSjVlKI4vcjg7BLxS6LAvD93FQA=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/tQtMkhXsZMq6rTRb8mExJWVPVYw=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/U2F5VzsobF+6AGovTnK8dZXttDc=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/V099bA2MduxexIJCtEQTnoMB2x8=
+app/build/intermediates/incremental/civDebug-mergeJavaRes/zip-cache/YfQiiODRvigi6Kj4vjsfmyPhNjU=
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
+app/build/kotlin/compileCivDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i.len
+app/build/kotlin/compileCivDebugKotlin/cacheable/last-build.bin
+app/build/kotlin/compileCivDebugKotlin/dirty-sources.txt
+app/build/kotlin/compileCivDebugKotlin/local-state/build-history.bin
+app/build/tmp/kotlin-classes/civDebug/META-INF/ATAK-Plugin-Meshtastic Plugin-1.0.4-1b891e91-4.8.1_civDebug.kotlin_module
+.gradle/7.3.3/checksums/md5-checksums.bin
+.gradle/7.3.3/checksums/sha1-checksums.bin
+.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,6 +8,7 @@
 
 buildscript {
 
+
     ext.PLUGIN_VERSION = "1.0.5"
     ext.ATAK_VERSION = "4.10.0"
 
@@ -225,6 +226,7 @@ dependencies {
 
 
 
+
 }
 
 protobuf {
@@ -249,4 +251,4 @@ protobuf {
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/com/atakmap/android/meshtastic/MeshtasticMapComponent.java b/app/src/main/java/com/atakmap/android/meshtastic/MeshtasticMapComponent.java
@@ -96,7 +96,6 @@ public enum ServiceConnectionState {
     public static final String STATE_CONNECTED = "CONNECTED";
     public static final String STATE_DISCONNECTED = "DISCONNECTED";
     public static final String STATE_DEVICE_SLEEP = "DEVICE_SLEEP";
-
     public static MeshtasticWidget mw;
     private MeshtasticReceiver mr;
     public static List<byte[]> divideArray(byte[] source, int chunksize) {

diff --git a/local.properties b/local.properties
@@ -4,9 +4,9 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Feb 05 19:08:56 EST 2024
+#Thu Sep 07 14:01:43 EDT 2023
 ndk.dir=/Users/user/Library/Android/Sdk/ndk
-sdk.dir=C\:\\Users\\u\\AppData\\Local\\Android\\Sdk
+sdk.dir=/Users/user/Library/Android/sdk
 takDebugKeyAlias=key0
 takDebugKeyFile=key.jks
 takDebugKeyFilePassword=android
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     buildscript {
         ext.PLUGIN_VERSION = "1.0.5"
         ext.ATAK_VERSION = "4.10.0"
@@ Expand Down Expand Up / @@ -225,6 +226,7 @@ dependencies { @@
     }
     protobuf {
@@ Expand All / @@ -249,4 +251,4 @@ protobuf { @@
                 }
             }
         }
-    }
+    }