Merge pull request #70 from geeksville/dev

Dev

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Mesh Util</name>
+	<comment>Project MeshUtil created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/usr/lib/jvm/java-8-oracle
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

README.md

@@ -60,6 +60,7 @@ This project is the work of volunteers:
 * @eriktheV-king: Contributed Dutch and French translations.
 * @Lgoix: Contributed tooltip for radio mode
 * @Eugene: Contributed Russian translation.
+* @Jinx17: Contributed Slovenian translation.
 * @Konradrundfunk: Contributed German fixes.
 * @Mango-sauce: Contributed Chinese translation.
 * @NEKLAN: Contributed Japanese translation.

TODO.md

@@ -1,10 +1,11 @@
 # Remaining tasks before declaring 1.0
 
+- Android frontend should refetch the android messages from backend service on Resume
 - disable software update button after update finishes
 - first message sent is still doubled for some people
-- Android frontend should refetch the android messages from backend service on Resume
 - let users set arbitrary params in android
 * add a low level settings screen (let user change any of the RadioConfig parameters)
+- optionally include firmware files in debug builds - currently they are release only.  per https://developer.android.com/studio/build/build-variants
 
 Things for the betaish period.
 

app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

app/build.gradle

@@ -35,7 +35,7 @@ android {
     defaultConfig {
         // We have to list all translated languages here, because some of our libs have bogus languages that google play
         // doesn't like and we need to strip them (gr)
-        resConfigs "cs", "de", "en", "es", "fi", "fr", "ga", "it", "ja", "nl", "ru", "sk", "sv", "tr", "zh"
+        resConfigs "cs", "de", "en", "es", "fi", "fr", "ga", "it", "ja", "nl", "ru", "sk", "sl", "sv", "tr", "zh"
 
         // Needed to make mapbox work inside the firebase testlab - FIXME, alas, still doesn't work
         ndk {

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

@@ -1442,7 +1442,7 @@ class MeshService : Service(), Logging {
     /***
      * Return the filename we will install on the device
      */
-    fun setFirmwareUpdateFilename(info: MeshProtos.MyNodeInfo) {
+    private fun setFirmwareUpdateFilename(info: MeshProtos.MyNodeInfo) {
         firmwareUpdateFilename = try {
             if (info.region != null && info.firmwareVersion != null && info.hwModel != null)
                 SoftwareUpdateService.getUpdateFilename(

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

@@ -219,7 +219,7 @@ class SoftwareUpdateService : JobIntentService(), Logging {
             hwVerIn: String,
             swVer: String,
             mfg: String
-        ): String {
+        ): String? {
             val curver = context.getString(R.string.cur_firmware_version)
 
             val regionRegex = Regex(".+-(.+)")
@@ -230,7 +230,12 @@ class SoftwareUpdateService : JobIntentService(), Logging {
             val (region) = regionRegex.find(hwVer)?.destructured
                 ?: throw Exception("Malformed hw version")
 
-            return "firmware/firmware-$mfg-$region-$curver.bin"
+            val name = "firmware/firmware-$mfg-$region-$curver.bin"
+            // Check to see if the file exists (some builds might not include update files for size reasons)
+            return if (!context.assets.list(name).isNullOrEmpty())
+                name
+            else
+                null
         }
 
         /** Return the filename this device needs to use as an update (or null if no update needed)

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

@@ -28,9 +28,9 @@
     <string name="are_you_sure_channel">チャンネルを変更しますか？新しいチャンネル設定をシェアするまで他のノードとの通信はすべて停止します。</string>
     <string name="new_channel_rcvd">新しいチャンネルURLを受信しました</string>
     <string name="do_you_want_switch">\'%s\チャンネルに変更しますか？</string>
-    <string name="map_not_allowed">解析がオフになっています。残念ながら地図プロバイダ（mapbox）は無料プランの場合、解析をオンにする必要があります。マップビューをオフにしました。\n\n
-        マップを表示したい場合は設定パネルで解析をオンにする必要があります（また当分の間アプリを強制的に再起動する必要があります）。\n\n
-        mapboxの有償プラン（または代替地図プロバイダ）を検討される方は meshtastic.discourse.group に書き込んでください。</string>
+    <string name="map_not_allowed">解析が無効になっています。残念ながら地図プロバイダ（mapbox）は無料プランの場合、解析を有効にする必要があります。マップビューをオフにしました。\n\n
+マップを表示したい場合は設定パネルで匿名の診断情報と不具合報告にチェックする必要があります（また当分の間アプリを強制停止して再起動する必要があります）。\n\n
+mapboxの有償プラン（または代替地図プロバイダ）を検討される方は meshtastic.discourse.group に書き込んでください。</string>
     <string name="permission_missing">必要なアクセス権限が拒否されているため、アプリが正常に動作しません。設定により権限を許可してください。</string>
     <string name="radio_sleeping">Meshtasticデバイスはスリープ状態です。チャンネルを変更できませんでした。</string>
     <string name="report_bug">バグ報告</string>

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

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Nastavitve</string>
+    <string name="channel_name">Ime kanala</string>
+    <string name="channel_options">Možnosti kanala</string>
+    <string name="share_button">Gumb za skupno rabo</string>
+    <string name="qr_code">QR-koda</string>
+    <string name="unset">Ni nastavljeno</string>
+    <string name="connection_status">Status povezave</string>
+    <string name="application_icon">Ikona aplikacije</string>
+    <string name="unknown_username">Neznan uporabnik</string>
+    <string name="user_avatar">Uporabnuikov Avatar</string>
+    <string name="sample_message">Zdravo, našel sem denar. Nahaja se zraven velikega tigra. Malo sem prestrašen.</string>
+    <string name="send_text">Pošlji tekst</string>
+    <string name="warning_not_paired">S tem telefonom še niste seznanili združljivega Meshtastic radia. Prosimo povežite napravo in nastavite svoje uporabniško ime. \n\nTa odprtokodna aplikacija je v alfa testiranju, če imate težave, objavite na našem spletnem klepetu.\n\nZa več informacij glejte našo spletno stran - www.meshtastic.org.</string>
+    <string name="username_unset">Uporabnik ni nastavljen</string>
+    <string name="your_name">Tvoje ime</string>
+    <string name="analytics_okay">Anonimna statistika uporabe in poročila o zrušitvah.</string>
+    <string name="looking_for_meshtastic_devices">Iščem Meshtastic naprave...</string>
+    <string name="requires_bluetooth">Ta aplikacija zahteva dostop do bluetooth. Dovolite dostop v nastavitvah za Android.</string>
+    <string name="error_bluetooth">Napaka - aplikacija potrebuje Bluetooth povezavo</string>
+    <string name="starting_pairing">Začetek seznanjanja naprav</string>
+    <string name="pairing_failed">Napaka seznanjanja naprav</string>
+    <string name="url_for_join">URL za pridružitev Meshtastic mreže</string>
+    <string name="accept">Potrdi</string>
+    <string name="cancel">Prekliči/zavrzi</string>
+    <string name="change_channel">Zamenjava kanala</string>
+    <string name="are_you_sure_channel">Ali ste prepričani, da želite spremeniti kanal? Vsa komunikacija z drugimi vozlišči se ustavi, dokler ne delite novih nastavitev kanala.</string>
+    <string name="new_channel_rcvd">Prejet je bil novi URL kanala</string>
+    <string name="do_you_want_switch">Ali želite preklopiti na kanal \'%s\' ?</string>
+    <string name="map_not_allowed">Vaša analitika je onemogočena. Na žalost naš ponudnik zemljevidov (mapbox) zahteva analitiko, ki je dovoljena za njihov "brezplačen" načrt. Torej smo izključili prikaz zemljevida. \n\nČe želite videti zemljevid, boste morali v podoknu z nastavitvami vklopiti analitiko (morda boste morali znova zagnati aplikacijo). \n\nČe vas zanima, kako plačujemo za karto (ali preklopiti na drugega ponudnika zemljevidov), pošljite sporočilo v meshtastic.discourse.group</string>
+    <string name="permission_missing">Manjka zahtevano dovoljenje: Meshtastic ne bo mogel pravilno delovati. Omogočite v nastavitvah aplikacije za Android.</string>
+    <string name="radio_sleeping">Radio je "spal", sprememba kanala ni bila izvedena.</string>
+    <string name="report_bug">Prijavi napako</string>
+    <string name="report_a_bug">Prijavite napako</string>
+    <string name="report_bug_text">Ali ste prepričani, da želite prijaviti napako? Po poročanju objavite v meshtastic.discourse.group, da bomo lahko primerjali poročilo s tistim, kar ste našli.</string>
+    <string name="report">Poročilo</string>
+    <string name="select_radio">Izberite radio</string>
+    <string name="current_pair">Trenutno ste seznanjeni z radiem %s</string>
+    <string name="not_paired_yet">Radia še niste seznanili.</string>
+    <string name="change_radio">Spremenite radio</string>
+    <string name="please_pair">Napravo seznanite v nastavitvah za Android.</string>
+    <string name="pairing_completed">Seznanjanje zaključeno, zagon storitve</string>
+    <string name="pairing_failed_try_again">Seznanjanje ni uspelo. Prosimo, izberite znova</string>
+    <string name="location_disabled">Dostop do lokacije je onemogočen, mreža ne more prikazati položaja.</string>
+    <string name="share">Deliti</string>
+    <string name="disconnected">Prekinjeno</string>
+    <string name="device_sleeping">Naprava je v "spanju"</string>
+    <string name="connected_count">Povezano: %s od %s je na mreži</string>
+    <string name="list_of_nodes">Seznam vozlišč v omrežju</string>
+    <string name="update_firmware">Posodobite vdelano programsko opremo</string>
+    <string name="connected">Povezana z radiem</string>
+    <string name="connected_to">Povezana z radiem (%s)</string>
+    <string name="not_connected">Ni povezano. Izberite radio spodaj</string>
+    <string name="connected_sleeping">Povezan z radiem, vendar radio "spi"</string>
+    <string name="update_to">Posodobi v %s</string>
+    <string name="app_too_old">Aplikacija je prestara</string>
+    <string name="must_update">To aplikacijo morate posodobiti v trgovini Google Play (ali Github). Žal se ne more povezati s tem radiem.</string>
+    <string name="none">Brez (onemogoči)</string>
+    <string name="modem_config_short">Kratek doseg (vendar hiter)</string>
+    <string name="modem_config_medium">Srednji doseg (vendar hiter)</string>
+    <string name="modem_config_long">Dolg doseg (vendar počasnejši)</string>
+    <string name="modem_config_very_long">Zelo dolg doseg (vendar počasen)</string>
+    <string name="modem_config_unrecognized">NEZNANO</string>
+    <string name="meshtastic_service_notifications">Obvestila storitve Meshtastic</string>
+    <string name="location_disabled_warning">V nastavitvah za Android morate vključiti lokacijske storitve</string>
+    <string name="about">O programu</string>
+</resources>