Merge 31d587b574 into 4203b28a45

README.md

@@ -26,7 +26,7 @@ width="32%">](https://apt.izzysoft.de/fdroid/index/apk/com.geeksville.mesh)
 alt="Download at https://play.google.com/store/apps/details?id=com.geeksville.mesh]"
 width="32%">](https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source%3Dgithub-android-readme)
 
-If you want to join the Play Store beta program go to [this URL](https://play.google.com/apps/testing/com.geeksville.mesh) and opt-in to the alpha/beta test.
+If you want to join the Play Store testing program go to [this URL](https://play.google.com/apps/testing/com.geeksville.mesh) and opt-in to become a tester.
 If you encounter any problems or have questions, [post in the forum](https://meshtastic.discourse.group/) and we'll help.
 
 However, if you must use 'raw' APKs you can get them from our [github releases](https://github.com/meshtastic/Meshtastic-Android/releases). This is not recommended because if you manually install an APK it will not automatically update.

app/build.gradle

@@ -36,8 +36,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdk 33
-        versionCode 30305 // format is Mmmss (where M is 1+the numeric major number
-        versionName "2.3.5"
+        versionCode 30306 // format is Mmmss (where M is 1+the numeric major number
+        versionName "2.3.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio
@@ -210,7 +210,7 @@ dependencies {
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
     // Osmdroid & Maps
-    def osmdroid_version = '6.1.14'
+    def osmdroid_version = '6.1.18'
     implementation "org.osmdroid:osmdroid-android:$osmdroid_version"
     implementation "org.osmdroid:osmdroid-wms:$osmdroid_version"
     implementation("org.osmdroid:osmdroid-geopackage:$osmdroid_version") {

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

@@ -1751,7 +1751,7 @@ class MeshService : Service(), Logging {
                 serviceBroadcasts.broadcastMessageStatus(p)
 
                 // Keep a record of DataPackets, so GUIs can show proper chat history
-                rememberDataPacket(p)
+                rememberDataPacket(p, false)
 
                 GeeksvilleApplication.analytics.track(
                     "data_send",

app/src/main/proto

@@ -1 +1 @@
-Subproject commit 0d08acd9c51c4e5575f3ea42368834ec990b2278
+Subproject commit 86640f20db7b9b5be42949d18e8d96ad10d47a68

app/src/main/res/values-cs/strings.xml

@@ -95,7 +95,7 @@
     <string name="provide_location_to_mesh">Poskytnout polohu síti</string>
     <string name="camera_required">Oprávnění přístupu k fotoaparátu</string>
     <string name="why_camera_required">Pro čtení QR kódů musíme mít přístup k fotoaparátu. Žádné obrázky nebo videa nebudou uloženy.</string>
-    <string name="notification_required">Notification permission</string>
+    <string name="notification_required">Povolení oznámení</string>
     <string name="why_notification_required">Meshtastic needs permission for service and message notifications.</string>
     <string name="notification_denied">Notification permission denied. To turn on notifications, access: Android Settings &gt; Apps &gt; Meshtastic &gt; Notifications.</string>
     <string name="modem_config_slow_short">Short Range / Slow</string>
@@ -144,8 +144,8 @@
     <string name="nodedb_reset">Reset NodeDB</string>
     <string name="nodedb_reset_description">Tímto vymažete všechny uzly z tohoto seznamu.</string>
     <string name="ignore">Ignorovat</string>
-    <string name="ignore_add">Add \'%s\' to ignore list? Your radio will reboot after making this change.</string>
-    <string name="ignore_remove">Remove \'%s\' from ignore list? Your radio will reboot after making this change.</string>
+    <string name="ignore_add">Add \'%s\' to ignore list?</string>
+    <string name="ignore_remove">Odstranit \'%s\' ze seznamu ignorování?</string>
     <string name="map_select_download_region">Vyberte oblast stahování</string>
     <string name="map_tile_download_estimate">Odhad stažení dlaždic:</string>
     <string name="map_start_download">Zahájit stahování</string>
@@ -167,9 +167,9 @@
     <string name="map_download_errors">Stahování dokončeno s %d chybami</string>
     <string name="map_cache_tiles">%d dlaždic</string>
     <string name="map_subDescription">směr: %1$d° vzdálenost: %2$s</string>
-    <string name="waypoint_edit">Edit waypoint</string>
-    <string name="waypoint_delete">Delete waypoint?</string>
-    <string name="waypoint_new">New waypoint</string>
-    <string name="waypoint_received">Received waypoint: %s</string>
+    <string name="waypoint_edit">Upravit waypoint</string>
+    <string name="waypoint_delete">Smazat waypoint?</string>
+    <string name="waypoint_new">Nový waypoint</string>
+    <string name="waypoint_received">Přijatý waypoint: %s</string>
     <string name="error_duty_cycle">Byl dosažen limit pro cyklus. Momentálně nelze odesílat zprávy, zkuste to prosím později.</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -101,7 +101,7 @@
     <string name="modem_config_slow_short">Krátky dosah / Pomalé</string>
     <string name="modem_config_slow_medium">Stredný dosah / Pomalé</string>
     <plurals name="delete_messages">
-        <item quantity="one">Delete message?</item>
+        <item quantity="one">Odstrániť správu?</item>
         <item quantity="few">Vymazať %s správy?</item>
         <item quantity="many">Delete %s messages?</item>
         <item quantity="other">Vymazať správy?</item>
@@ -129,7 +129,7 @@
     <string name="intro_started">Poďme začať!</string>
     <string name="intro_started_text">Pripojte vaše Meshtastic zariadenie pomocou Bluetooth, Serial, alebo WiFi. \n\nZistite, ktoré zariadenia sú kompatibilné na www.meshtastic.org/docs/hardware</string>
     <string name="intro_encryption">"Nastavenie enkryptovania"</string>
-    <string name="intro_encryption_text">As standard, a default encryption key is set. To enable your own channel and enhanced encryption, go to the channel tab and change the channel name, this will set a random key for AES256 encryption. \n\nTo communicate with other devices they will need to scan your QR code or follow the shared link to configure the channel settings.</string>
+    <string name="intro_encryption_text">Štandardne je nastavený predvolený šifrovací kľúč. Ak chcete povoliť vlastný kanál a vylepšené šifrovanie, prejdite na kartu Nastavenie kanálu a zmeňte názov kanálu, čím sa nastaví náhodný kľúč pre šifrovanie AES256. \n\nNa komunikáciu s inými zariadeniami, budu musieť naskenovať váš QR kód alebo kliknúť na zdieľaný odkaz a nakonfigurovať nastavenia kanála.</string>
     <string name="message">Správa</string>
     <string name="quick_chat">Nastavenia rýchleho četu</string>
     <string name="quick_chat_new">Nový rýchly čet</string>
@@ -139,7 +139,7 @@
     <string name="factory_reset">Obnova do výrobných nastavení</string>
     <string name="factory_reset_description">Toto vymaže všetky nastavenia zariadenia.</string>
     <string name="bluetooth_disabled">Bluetooth vypnutý</string>
-    <string name="permission_missing_31">Meshtastic needs Nearby devices permission to find and connect to devices via Bluetooth. You can turn it off when not in use.</string>
+    <string name="permission_missing_31">Meshtastic potrebuje povolenie Zariadenia v okolí, aby mohol nájsť zariadenia a pripojiť sa k nim cez Bluetooth. Môžete ho vypnúť, keď sa nepoužíva.</string>
     <string name="direct_message">Priama správa</string>
     <string name="nodedb_reset">Reset databázy uzlov</string>
     <string name="nodedb_reset_description">Toto vymaže všetky uzlové body zo zoznamu.</string>
@@ -156,17 +156,17 @@
     <string name="add">Pridať</string>
     <string name="calculating">Prepočítavanie…</string>
     <string name="map_offline_manager">Offline manager</string>
-    <string name="map_cache_size">Current Cache size</string>
-    <string name="map_cache_info">Cache Capacity: %1$.2f MB\nCache Usage: %2$.2f MB</string>
-    <string name="map_clear_tiles">Clear Downloaded Tiles</string>
-    <string name="map_tile_source">Tile Source</string>
+    <string name="map_cache_size">Aktuálna veľkosť cache</string>
+    <string name="map_cache_info">Kapacita cache: %1$.2f MB\nVyužitie cache: %2$.2f MB</string>
+    <string name="map_clear_tiles">Vymazať mapové podklady</string>
+    <string name="map_tile_source">Zdroj mapových podkladov</string>
     <string name="map_purge_success">SQL Cache purged for %s</string>
     <string name="map_purge_fail">SQL Cache purge failed, see logcat for details</string>
     <string name="map_cache_manager">Cache Manager</string>
     <string name="map_download_complete">Sťahovanie dokončené!</string>
     <string name="map_download_errors">Sťahovanie ukončené s %d chybami</string>
-    <string name="map_cache_tiles">%d tiles</string>
-    <string name="map_subDescription">bearing: %1$d° distance: %2$s</string>
+    <string name="map_cache_tiles">%d mapových podkladov</string>
+    <string name="map_subDescription">smer: %1$d° vzdialenosť: %2$s</string>
     <string name="waypoint_edit">Editovať cieľový bod</string>
     <string name="waypoint_delete">Vymazať cieľový bod?</string>
     <string name="waypoint_new">Nový cieľový bod</string>