diff --git a/.project b/.project new file mode 100644 index 000000000..6079e350e --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + Mesh Util + Project MeshUtil created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000..f8483ac09 --- /dev/null +++ b/.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 diff --git a/README.md b/README.md index e28b8d983..cfc63b0b7 100644 --- a/README.md +++ b/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. diff --git a/TODO.md b/TODO.md index b952f2245..d9d521a55 100644 --- a/TODO.md +++ b/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. diff --git a/app/.classpath b/app/.classpath new file mode 100644 index 000000000..eb19361b5 --- /dev/null +++ b/app/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/.project b/app/.project new file mode 100644 index 000000000..ac485d7c3 --- /dev/null +++ b/app/.project @@ -0,0 +1,23 @@ + + + app + Project app created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000..b1886adb4 --- /dev/null +++ b/app/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir=.. +eclipse.preferences.version=1 diff --git a/app/build.gradle b/app/build.gradle index 73914bcb9..01fc34618 100644 --- a/app/build.gradle +++ b/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 { diff --git a/app/src/main/assets/firmware b/app/src/debug/assets/firmware similarity index 100% rename from app/src/main/assets/firmware rename to app/src/debug/assets/firmware 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 5d9683ed5..21daedcbb 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/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( diff --git a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt index cf0c12613..38b31b0a6 100644 --- a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt +++ b/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) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2a7364a21..b1a389c77 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -28,9 +28,9 @@ チャンネルを変更しますか？新しいチャンネル設定をシェアするまで他のノードとの通信はすべて停止します。 新しいチャンネルURLを受信しました \'%s\チャンネルに変更しますか？ - 解析がオフになっています。残念ながら地図プロバイダ（mapbox）は無料プランの場合、解析をオンにする必要があります。マップビューをオフにしました。\n\n - マップを表示したい場合は設定パネルで解析をオンにする必要があります（また当分の間アプリを強制的に再起動する必要があります）。\n\n - mapboxの有償プラン（または代替地図プロバイダ）を検討される方は meshtastic.discourse.group に書き込んでください。 + 解析が無効になっています。残念ながら地図プロバイダ（mapbox）は無料プランの場合、解析を有効にする必要があります。マップビューをオフにしました。\n\n +マップを表示したい場合は設定パネルで匿名の診断情報と不具合報告にチェックする必要があります（また当分の間アプリを強制停止して再起動する必要があります）。\n\n +mapboxの有償プラン（または代替地図プロバイダ）を検討される方は meshtastic.discourse.group に書き込んでください。 必要なアクセス権限が拒否されているため、アプリが正常に動作しません。設定により権限を許可してください。 Meshtasticデバイスはスリープ状態です。チャンネルを変更できませんでした。 バグ報告 diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml new file mode 100644 index 000000000..ea22e11c7 --- /dev/null +++ b/app/src/main/res/values-sl/strings.xml @@ -0,0 +1,68 @@ + + + Nastavitve + Ime kanala + Možnosti kanala + Gumb za skupno rabo + QR-koda + Ni nastavljeno + Status povezave + Ikona aplikacije + Neznan uporabnik + Uporabnuikov Avatar + Zdravo, našel sem denar. Nahaja se zraven velikega tigra. Malo sem prestrašen. + Pošlji tekst + 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. + Uporabnik ni nastavljen + Tvoje ime + Anonimna statistika uporabe in poročila o zrušitvah. + Iščem Meshtastic naprave... + Ta aplikacija zahteva dostop do bluetooth. Dovolite dostop v nastavitvah za Android. + Napaka - aplikacija potrebuje Bluetooth povezavo + Začetek seznanjanja naprav + Napaka seznanjanja naprav + URL za pridružitev Meshtastic mreže + Potrdi + Prekliči/zavrzi + Zamenjava kanala + Ali ste prepričani, da želite spremeniti kanal? Vsa komunikacija z drugimi vozlišči se ustavi, dokler ne delite novih nastavitev kanala. + Prejet je bil novi URL kanala + Ali želite preklopiti na kanal \'%s\' ? + 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 + Manjka zahtevano dovoljenje: Meshtastic ne bo mogel pravilno delovati. Omogočite v nastavitvah aplikacije za Android. + Radio je "spal", sprememba kanala ni bila izvedena. + Prijavi napako + Prijavite napako + 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. + Poročilo + Izberite radio + Trenutno ste seznanjeni z radiem %s + Radia še niste seznanili. + Spremenite radio + Napravo seznanite v nastavitvah za Android. + Seznanjanje zaključeno, zagon storitve + Seznanjanje ni uspelo. Prosimo, izberite znova + Dostop do lokacije je onemogočen, mreža ne more prikazati položaja. + Deliti + Prekinjeno + Naprava je v "spanju" + Povezano: %s od %s je na mreži + Seznam vozlišč v omrežju + Posodobite vdelano programsko opremo + Povezana z radiem + Povezana z radiem (%s) + Ni povezano. Izberite radio spodaj + Povezan z radiem, vendar radio "spi" + Posodobi v %s + Aplikacija je prestara + To aplikacijo morate posodobiti v trgovini Google Play (ali Github). Žal se ne more povezati s tem radiem. + Brez (onemogoči) + Kratek doseg (vendar hiter) + Srednji doseg (vendar hiter) + Dolg doseg (vendar počasnejši) + Zelo dolg doseg (vendar počasen) + NEZNANO + Obvestila storitve Meshtastic + V nastavitvah za Android morate vključiti lokacijske storitve + O programu + \ No newline at end of file diff --git a/images/location-mode.png b/images/location-mode.png new file mode 100644 index 000000000..b222803dc Binary files /dev/null and b/images/location-mode.png differ diff --git a/images/location-on.png b/images/location-on.png new file mode 100644 index 000000000..5679bf269 Binary files /dev/null and b/images/location-on.png differ