diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 362b38ac..a5461b48 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -1,6 +1,5 @@
package com.geeksville.mesh.ui
-import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothDevice
import android.companion.CompanionDeviceManager
import android.content.*
@@ -495,6 +494,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
// If the user has not turned on location access throw up a warning
private fun checkLocationEnabled(
+ // Default warning valid only for classic bluetooth scan
warningReason: String = getString(R.string.location_disabled_warning)
) {
val locationManager =
@@ -514,11 +514,11 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
}
private fun checkBTEnabled(
- warningReason: String = getString(R.string.requires_bluetooth)
+ warningReason: String = getString(R.string.bluetooth_disabled)
) {
if (bluetoothViewModel.enabled.value == false) {
- warn("We need bluetooth")
- showSnackbar(warningReason)
+ warn("Telling user bluetooth is disabled")
+ Toast.makeText(requireContext(), warningReason, Toast.LENGTH_LONG).show()
}
}
@@ -563,14 +563,11 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
myActivity.registerReceiver(updateProgressReceiver, updateProgressFilter)
- // Warn user if BLE is disabled
- if (scanModel.selectedBluetooth && bluetoothViewModel.enabled.value == false) {
- Toast.makeText(
- requireContext(),
- getString(R.string.error_bluetooth),
- Toast.LENGTH_LONG
- ).show()
- } else if (binding.provideLocationCheckbox.isChecked)
+ // Warn user if BLE device is selected but BLE disabled
+ if (scanModel.selectedBluetooth) checkBTEnabled()
+
+ // Warn user if provide location is selected but location disabled
+ if (binding.provideLocationCheckbox.isChecked)
checkLocationEnabled(getString(R.string.location_disabled))
}
}
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 4199217b..5e97eb85 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -17,8 +17,6 @@
Vaše jméno
Anonymní hlášení o používání aplikace a jejích chybách.
Hledám zařízení Meshtastic…
- Tato aplikace vyžaduje přístup k Bluetooth. Prosím povolte ji přístup v nastavení telefonu.
- Chyba - tato aplikace potřebuje bluetooth.
Spouštím párování
Párování selhalo
URL pro připojení do Meshtastic MESH sítě.
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 557521e2..8a8b549c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,8 +17,6 @@
Dein Name
Anonyme Nutzungsstatistiken und Absturzberichte.
Suche nach Meshtastic Geräten…
- Diese Anwendung erfordert Bluetooth-Zugang. Bitte gewähren Sie Zugriff in den Android-Einstellungen.
- Fehler - dieses Programm erfordert Bluetooth!
Pairing beginnen
Pairing fehlgeschlagen
Ein Link zum Beitritt zu einem meshtastischen Netzwerk
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0d2ac198..e5ce4ecf 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -17,8 +17,6 @@
Όνομα
Ανώνυμα στατιστικά χρήσης και αναφορές crash.
Αναζήτηση συσκευών Meshtastic …
- Η εφαρμογή απαιτεί bluetooth πρόσβαση. Παρακαλώ παρέχεται σχετική άδεια χρήσης στις ρυθμίσεις του android.
- Σφάλμα - η εφαρμογή απαιτεί bluetooth
Αρχή pairing
Pairing απέτυχε
Διεύθυνση URL για συμμετοχή σε Meshtastic mesh
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0fccde7d..321a1821 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,8 +17,6 @@
Tu nombre
Estadísticas de uso anónimo e informes de fallos.
Buscando dispositivos Meshtastic…
- Esta aplicación requiere acceso a bluetooth. Por favor conceda acceso en la configuración de Android.
- Error - esta aplicación requiere bluetooth
Iniciando emparejamiento
Emparejamiento fallido
Una URL para unirse a una malla Meshtastic
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 6dc2b5f5..c80c822b 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -17,8 +17,6 @@
Nimesi
Nimettömät käyttötilastot ja kaatumisraportit.
Etsii Meshtastic laiteita…
- Tämä sovellus edellyttää Bluetoothin sallimista. Salli lupa Androidin asetuksista.
- Virhe - tämä sovellus edellyttää Bluetoothia
Yhdistää laitteeseen
Yhdistäminen epäonnistui
Hyperlinkki liittymiseksi Meshtastic verkkoon
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c3c32f31..3835ef45 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -17,8 +17,6 @@
Votre Nom
Statistiques et rapports d\'erreur anonymes.
Recherche d\'appareils Meshtastic…
- L\'application a besoin d\'accès bluetooth. Donnez l\'accès dans les Paramètres Android.
- Erreur de bluetooth
Démarre jumelage
Jumelage échoué
Un URL pour rejoindre une toile Meshtastic
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index f61bc3c8..f7c8596e 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -17,8 +17,6 @@
D\'ainm
Staitisticí úsáide gan ainm agus tuairiscí tuairteála.
Ag lorg gléasanna Meshtastic …
- Éilíonn an feidhmchlár seo rochtain bluetooth. Tabhair rochtain i suíomhanna android le do thoil.
- Earráid - éilíonn an aip seo bluetooth
Ag tosú ag péireáil
Theip ar phéireáil
URL chun dul isteach i mogalra Meshtastic
diff --git a/app/src/main/res/values-ht/strings.xml b/app/src/main/res/values-ht/strings.xml
index beb4ef76..d0192e61 100644
--- a/app/src/main/res/values-ht/strings.xml
+++ b/app/src/main/res/values-ht/strings.xml
@@ -17,8 +17,6 @@
Non Ou
Statistik itilizasyon anonim ak rapò aksidantèl.
Ap chache pou aparèy Meshtastic…
- Aplikasyon sa a mande pou aksè Bloutouf. Tanpri bay aksè nan paramèt android.
- Erè - aplikasyon sa a mande pou Bloutouf
Kòmanse koneksyon
Koneksyon echwe
Yon URL pou rantre nan yon mesh Meshtastic
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index efe79a50..24ac8371 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -16,8 +16,6 @@
A neve
Névtelen felhasználási statisztikák és hibajelentések.
Meshtastic eszközök keresése…
- Az alkalmazásnak szüksége van Bluetooth hozzáférésre. Kérem adjon engedélyt az android beállításoknál.
- Hiba - az alkalmazásnak bluetooth hozzáférésre van szüksége
Pároztatás megkezdése
A pároztatás sikertelen
Meshtastic mesh hálózat URL
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8c328c9e..bc5909b6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -17,8 +17,6 @@
Il tuo nome
Le statistiche di utilizzo e i rapporti sugli arresti anomali sono anonimi
Ricerca di dispositivi Meshtastic…
- Questa applicazione richiede l\'accesso Bluetooth, si prega di dare l\'accesso nelle impostazioni android.
- Errore - questa applicazione richiede il bluetooth
Inizio abbinamento
Abbinamento non riusciuto
Una URL per unirti a una rete Meshtastic
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ac3d65f7..e9dfe0de 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -17,8 +17,6 @@
ユーザー名
匿名の診断情報と不具合報告
Meshtasticデバイスを検索中…
- このアプリはBluetooth通信が必要です。無線とネットワーク設定によりBluetoothをオンにしてください。
- エラー - このアプリはBluetooth通信が必要です。
ペアとして設定中
ペアに設定できませんでした
メッシュネットワーク参加URL
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 72c833ae..e0d26d82 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -17,8 +17,6 @@
사용자 이름
익명의 진단보고와 오류 보고서
메쉬태스틱 기기 찾는 중…
- 본 앱은 블루투스에 대한 접근 권한이 필요합니다. 스마트폰 설정에서 권한을 부여해주세요.
- 에러 - 본 앱은 블루투스를 필요로 합니다.
페어링 시작
페어링 실패
메쉬태스틱 연결 URL
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0938a939..fc62d3ae 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -17,8 +17,6 @@
Je Naam
Anonieme gebruikersnaam en foutrapporten.
Zoekt Meshtastic apparaten…
- Deze applicatie vereist bluetooth toegang. Geef toegang in android settings.
- Fout - deze app vereist bluetooth
Start koppeling
Koppeling mislukt
Een URL om te verbinden met een Meshtastic net
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index f206a8c6..c0d0c0a5 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -17,8 +17,6 @@
Ditt Navn
Anonym brukerstatistikk og kræsjrapporter.
Ser etter Meshtastic enheter…
- Denne applikasjonen krever blåtann tilgang.Vennligst gi tilgang i android instillinger.
- Feil - denne app krever blåtann
Starter paring
Paring feilet
En URL for å bli med i et Meshtastic nett
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c499cbf5..f1d54757 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -17,8 +17,6 @@
Twoja Nazwa
Anonimowe statystyki użycia i raporty o błędach.
Szukanie urządzeń Meshtastic…
- Ta aplikacja wymaga dostępu do Bluetooth. Proszę przyznać stosowne uprawnienia w ustawieniach systemu Android.
- Błąd - ta aplikacja wymaga dostępu do bluetooth
Rozpoczynanie parowania
Parowanie nieudane
A URL for joining a Meshtastic mesh
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6261501a..71d019c6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -17,8 +17,6 @@
Seu Nome
Estatísticas anônimas de uso e relatórios de erros.
Procurando por dispositivos Meshtastic…
- Este aplicativo requer acesso ao bluetooth. Por favor permita o acesso nas configurações do Android.
- Erro - este app requer bluetooth
Iniciando pareamento
Pareamento falhou
Link para fazer parte de um canal Meshtastic
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0f46fff8..78f552fe 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -16,8 +16,6 @@
O seu Nome
Estatísticas de uso anônimas e relatórios de falhas.
A procurar dispositivos Meshtastic…
- Esta aplicação requer acesso ao Bluetooth. Por favor conceda acesso nas opções do android.
- Erro - esta app requer de bluetooth
A iniciar o emparelhamento.
Emparelhamento falhou
Um link para se juntar a mesh Meshtastic
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8c8424a0..4e7ca6ed 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -17,8 +17,6 @@
Numele tău
Trimite în mod anonim statistici de utilizare și reporturi de crash.
Caut dispozitive Meshtastic…
- Această aplicație necesită access la bluetooth. Te rog acordă accesul în setările telefonului.
- Eroare - această aplicație necesită bluetooth
Încep să mă conectez
Conectare eșuată
Un URL pentru a intră în rețeaua Meshtastic
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2cbcdb3a..7181c04d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -17,8 +17,6 @@
Ваше имя
Анонимная статистика использования и отчеты о сбоях.
Поиск устройств Meshtastic…
- Это приложение требует доступа к Bluetooth. Пожалуйста, предоставьте доступ в настройках Android.
- Ошибка - для работы приложения требуется bluetooth
Сопряжение
Ошибка сопряжения
URL для присоединения к сети Meshtastic
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6da0d954..54d55657 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -17,8 +17,6 @@
Vaše meno
Anonymné hlásenia o používaní aplikácie a jej chybách.
Vyhľadávam Meshtastic zariadenia…
- Táto aplikácia vyžaduje prístup k Bluetooth. Prosím povoľte jej prístup v nastaveniach telefónu.
- Chyba - táto aplikácia potrebuje bluetooth.
Spúšťam párovanie
Párovanie zlyhalo
URL pre pripojenie sa do Meshtastic MESH siete
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 4fa0e9f4..83066a9d 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -17,8 +17,6 @@
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
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 3074df40..3af573a2 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -17,8 +17,6 @@
Emri juaj
Statistikat e përdorimit dhe raportet e keq funksionimit mblidhen në mënyre krejtësisht anonime
Në kërkim për paisje Meshtastic…
- Ky aplikacion kërkon leje për ndezjen e Bluetooth, ju lutem jepni të drejten e aksesit tek menuja e konfigurimit të android.
- Errore - Ky aplikacion kërkon paisjen Bluetooth
Duke filluar lidhjen
Lidhja nuk përfundoi me sukses
Një adresë URL për tu lidhur me rrjetin Meshtastic
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index dc558f61..dd12b6a1 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -17,8 +17,6 @@
Ditt Namn
Anonym användningsstatistik och kraschrapporter.
Letar efter Meshtastic-enheter…
- Denna applikation kräver Bluetooth-åtkomst. Vänligen ge åtkomst i Android-inställningar.
- Fel - den här appen kräver Bluetooth
Börjar para ihop
Parning misslyckades
En länk för att gå med i ett Meshtastic-nät
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 9d7d3178..6c2fe8ad 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -17,8 +17,6 @@
Adınız
Anonim kullanim istatistikleri ve hata raporları.
Meshtastic cihazları aranıyor…
- Bu cihaz bluetooth erişimi gerektiriyor. Lütfen Android ayarlarından izin veriniz.
- Hata - bu uygulama bluetooth gerektiriyor
Eşleşme başlatılıyor
Eşleşme başarız
Meshtastic mesh ağına bağlanmak için adres
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 1816ec78..91f9b1c0 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -17,8 +17,6 @@
用户名
匿名使用情况统计信息和崩溃报告.
Mesh设备扫描中...
- 此应用程序需要蓝牙权限.请在Android设置中授予权限.
- 错误:此应用需要蓝牙
开始配对
配对失败
用于连接Mesh网络的URL
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7ca872e2..9e7e6aaa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,8 +21,6 @@
Looking for Meshtastic devices…
Meshtastic_ac23
Meshtastic_1267
- This application requires bluetooth access. Please grant access in android settings.
- Error - this app requires bluetooth
Starting pairing
Pairing failed
A URL for joining a Meshtastic mesh
@@ -156,4 +154,5 @@
Factory reset
Are you sure you want to factory reset?
This will clear all device configuration you have done.
+ Bluetooth disabled.