Merge pull request #1009 from mstevetodd/master

tolerate lack of PHONE permissions, minor text changes
JMRI · Feb 27, 2023 · ad529db · ad529db
2 parents 907b1dd + 2e293b9
commit ad529db
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 42 deletions.
diff --git a/EngineDriver/src/main/java/jmri/enginedriver/threaded_application.java b/EngineDriver/src/main/java/jmri/enginedriver/threaded_application.java
@@ -1131,6 +1131,8 @@ public void setWebMenuOption(Menu menu) {
                     if ("MRC".equals(getServerType())) {
                         //for MRC, the web view is only for settings, so also change the text
                         item.setTitle(R.string.mrc_settings);
+                    } else if ("DCCESP".equals(getServerType())) {
+                        item.setTitle(R.string.dccesp_settings);
                     }
                 } else {
                     item.setVisible(false);

diff --git a/EngineDriver/src/main/java/jmri/enginedriver/util/comm_thread.java b/EngineDriver/src/main/java/jmri/enginedriver/util/comm_thread.java
@@ -2419,7 +2419,11 @@ public void disable() {
         }
 
         public void enable() {
-            telMgr.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+            try {
+                telMgr.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+            } catch (SecurityException e) {
+                Log.e("Engine_Driver", "SecurityException encountered (and ignored) for telMgr");
+            }
         }
 
         @Override

diff --git a/EngineDriver/src/main/res/values-ca/strings.xml b/EngineDriver/src/main/res/values-ca/strings.xml
@@ -82,7 +82,7 @@
     <string name="loco_direction_right_extra">"\u00B7R\u00B7"</string>
     <string name="locoPressToSelect">Seleccionar</string>
     <string name="powerWillNotWorkTitle">No funcionarà!</string>
-    <string name="powerWillNotWork">JMRI té el control d\'alimentació wiThrottle apagat.\nEliminarà la tecla de corrent de via.\nEs mostrarà de nou quan s\'activi en el JMRI</string>
+    <string name="powerWillNotWork">JMRI té el control d\'alimentació WiThrottle apagat.\nEliminarà la tecla de corrent de via.\nEs mostrarà de nou quan s\'activi en el JMRI</string>
     <string name="current_locos">Lomotores seleccionades actualment</string>
     <string name="release">Allibera</string>
     <string name="releaseThrottleNumber">Allibera Controlador %1$s</string>
@@ -883,7 +883,7 @@
     <string name="idngo_label">Sol·licitar ID de Locomotora</string>
     <string name="idngo_button">Sol·licitar ID de Locomotora</string>
     <string name="idngo_help_text">Premi el botó per enviar una petició al servidor per identificar i adquirir la Locomotora que ja està a la via de programació i tornar el valor a aquest Controlador</string>
-    <string name="prefKidsTimerButtonDefaultSummary">L\\\'hora predeterminada si utilitzeu el botó TOOLLBAR per activar el temporitzador.</string>
+    <string name="prefKidsTimerButtonDefaultSummary">L\'hora predeterminada si utilitzeu el botó TOOLLBAR per activar el temporitzador.</string>
     <string name="prefKidsTimerButtonDefaultTitle">Predeterminat per al botó</string>
     <string name="prefKidsTimerButtonSummary">Mostra el botó temporitzador per activar el temporitzador.</string>
     <string name="prefKidsTimerButtonTitle">Mostra el botó de temporitzador?</string>

diff --git a/EngineDriver/src/main/res/values-cs/strings.xml b/EngineDriver/src/main/res/values-cs/strings.xml
@@ -1023,11 +1023,11 @@
 
 
     <string name="prefCategoryDevicePageTitle">Předvolby zařízení</string>
-    <string name="prefPauseSpeedButtonTitle">Show \\\'Pause\\\' Tlačítko</string>
+    <string name="prefPauseSpeedButtonTitle">Show \'Pause\' Tlačítko</string>
     <string name="prefPauseSpeedButtonSummary">Zobrazovat tlačítko pro zpomalení a zastavení lokomotivy, pak se vrátí do rychlosti na propuštění.</string>
-    <string name="prefPauseSpeedRateTitle">\\\'Pauza\\\' Tlačítko rychlost</string>
+    <string name="prefPauseSpeedRateTitle">\'Pauza\' Tlačítko rychlost</string>
     <string name="prefPauseSpeedRateSummary">Počet milisekund mezi otáčkami skokové změny na akci Pauza.</string>
-    <string name="prefPauseSpeedStepTitle">\\\'Pauza\\\' Tlačítko krok</string>
+    <string name="prefPauseSpeedStepTitle">\'Pauza\' Tlačítko krok</string>
     <string name="prefPauseSpeedStepSummary">velikost kroku se změní na akci Pauza.</string>
 
 
@@ -1049,7 +1049,7 @@
     <string name="prefFunctionConsistLatchingDefaultValue">žádný</string>
     <string name="prefFunctionConsistLatchingLightBellDefaultValue">aretací</string>
     <string name="prefFunctionConsistLocosDefaultValue">Vést</string>
-    <string name="functionConsistHelpText">Používá se pouze pro \\\'Speciální\\‘ skládat volby funkce následující. Zvolit, jak bude text každé funkce hledali v popisky funkčních pro každou lokomotivu v sestavě.</string>
+    <string name="functionConsistHelpText">Používá se pouze pro \'Speciální\\‘ skládat volby funkce následující. Zvolit, jak bude text každé funkce hledali v popisky funkčních pro každou lokomotivu v sestavě.</string>
     <string name="functionConsistHeader">Skládat Funkce Akce</string>
     <string name="app_name_consist_functions">Skládat nastavení funkcí - strojvedoucí</string>
     <string name="prefShowTimeOnLogEntryTitle">Zobrazovat časová razítka na Log</string>

diff --git a/EngineDriver/src/main/res/values-de/strings.xml b/EngineDriver/src/main/res/values-de/strings.xml
@@ -824,20 +824,20 @@
     <string name="prefThrottleSwitchOption2Summary">Drosselklappenschalter-Knopf schaltet zwischen dem Bildschirmtyp in der vorherige Präferenz und dieser.</string>
     <string name="prefThrottleSwitchOption2Title">Drosselklappenschalter Zweiten Bildschirmtyp</string>
     <string name="recent_consists">Wählen Sie aus Neuen Lokomotiven</string>
-    <string name="prefLimitSpeedButtonPreferencesTitle">\\\'Limit Geschwindigkeit\\‘ Schaltfläche Einstellungen</string>
+    <string name="prefLimitSpeedButtonPreferencesTitle">\'Limit Geschwindigkeit\\‘ Schaltfläche Einstellungen</string>
     <string name="toastPreferencesBackgroundChangeSucceeded">Hintergrund ändern Succeeded.</string>
     <string name="throttleSwitchAction">Schalten Gas Screens</string>
     <string name="prefBackgroundImagePreferencesTitle">Hintergrundbild Einstellungen</string>
     <string name="edit_consist_menu">\≡ Bearbeiten Consist</string>
     <string name="gamepad_test_menu">\≡ Gamepad Test</string>
     <string name="prefSwipeDownOptionSummary">Was soll passieren, wenn Sie auf dem Drosselklappen Blick nach unten wischen.</string>
     <string name="prefSwipeDownOptionTitle">Swipe nach unten Aktion in der Drossel Ansicht?</string>
-    <string name="prefPauseSpeedButtonTitle">Show \\\'Pause\\\' Taste</string>
+    <string name="prefPauseSpeedButtonTitle">Show \'Pause\' Taste</string>
     <string name="prefPauseSpeedButtonSummary">Zeigen Sie auf eine Schaltfläche zu verlangsamen und die Lok zu stoppen, dann wieder auf Geschwindigkeit auf Release.</string>
-    <string name="prefPauseSpeedRateTitle">\\\'Pause\\\' Taste Rate</string>
+    <string name="prefPauseSpeedRateTitle">\'Pause\' Taste Rate</string>
     <string name="prefPauseSpeedRateSummary">Anzahl der Millisekunden zwischen Gangstufe Änderungen für die Pause Aktion.</string>
-    <string name="prefPauseSpeedStepTitle">\\\'Pause\\\' Taste Schritt</string>
-    <string name="prefPauseSpeedStepSummary">\\ \'Pause \\\' Taste Schritt Schrittgröße ändert sich für die Pause Aktion.</string>
+    <string name="prefPauseSpeedStepTitle">\'Pause\' Taste Schritt</string>
+    <string name="prefPauseSpeedStepSummary">\'Pause\' Taste Schritt Schrittgröße ändert sich für die Pause Aktion.</string>
 
     <string name="prefAllowMobileDataTitle">Lassen Sie mobile Datenverbindung</string>
     <string name="prefAllowMobileDataSummary">Lassen Sie das Gerät JMRI über Mobile Daten verbinden.</string>
@@ -892,8 +892,8 @@
     <string name="idngo_label">Anfordern Loco ID</string>
     <string name="idngo_button">Anfordern Loco ID</string>
     <string name="idngo_help_text">Drücken Sie die Taste eine Anfrage an den Server zu identifizieren und zu erwerben, die Lok bereits auf dem Programmiergleis und gibt den Wert an diese Drossel zu senden.</string>
-    <string name="permissionsWriteSettingsAdditional" tools:ignore="TypographyEllipsis">- Klicken Sie den Button. - die Erlaubnis erteilen. - Klicken Sie auf \\\'Zurück \\‘ hier zurückzukehren...</string>
-    <string name="permissionsWriteSettingsAdditional2">Ignorieren Sie diese, wenn Sie don\\\'t Notwendigkeit Lokomotivführer, um die Helligkeit zu verändern.</string>
+    <string name="permissionsWriteSettingsAdditional" tools:ignore="TypographyEllipsis">- Klicken Sie den Button. - die Erlaubnis erteilen. - Klicken Sie auf \'Zurück \\‘ hier zurückzukehren...</string>
+    <string name="permissionsWriteSettingsAdditional2">Ignorieren Sie diese, wenn Sie don\'t Notwendigkeit Lokomotivführer, um die Helligkeit zu verändern.</string>
     <string name="permissionsACCESS_FINE_LOCATION">Engine Driver muss ACCESS_FINE_LOCATION Berechtigungen aktuelle WLAN SSID abzurufen.</string>
     <string name="prefKidsTimerButtonDefaultSummary">Standardzeit, wenn Sie die TOOLLBAR-Taste verwenden, um den Timer zu aktivieren.</string>
     <string name="prefKidsTimerButtonDefaultTitle">Standard für Button.</string>

diff --git a/EngineDriver/src/main/res/values-es/strings.xml b/EngineDriver/src/main/res/values-es/strings.xml
@@ -81,7 +81,7 @@
     <string name="loco_direction_right_extra">"\u00B7R\u00B7"</string>
     <string name="locoPressToSelect">Seleccionar</string>
     <string name="powerWillNotWorkTitle">¡No funcionará!</string>
-    <string name="powerWillNotWork">JMRI tiene el control de alimentación wiThrottle apagado.\nEliminará el icono de tensión de vía.\nSe mostrará de nuevo cuando se active en el JMRI</string>
+    <string name="powerWillNotWork">JMRI tiene el control de alimentación WiThrottle apagado.\nEliminará el icono de tensión de vía.\nSe mostrará de nuevo cuando se active en el JMRI</string>
     <string name="current_locos">Lomotoras seleccionadas actualmente</string>
     <string name="release">Libera</string>
     <string name="releaseThrottleNumber">Libera Controlador %1$s</string>

diff --git a/EngineDriver/src/main/res/values-fr/strings.xml b/EngineDriver/src/main/res/values-fr/strings.xml
@@ -82,7 +82,7 @@
     <string name="loco_direction_right_extra">"\u00B7R\u00B7"</string>
     <string name="locoPressToSelect">Sélection</string>
     <string name="powerWillNotWorkTitle">Ne fonctionnera pas!</string>
-    <string name="powerWillNotWork">JMRI a coupé l alimentation wiThrottle.\nEffacement icone alimentation.\nAffichage Icone alimentation quand JMRI sera actif.</string>
+    <string name="powerWillNotWork">JMRI a coupé l alimentation WiThrottle.\nEffacement icone alimentation.\nAffichage Icone alimentation quand JMRI sera actif.</string>
     <string name="current_locos">Locomotive sélectionnée</string>
     <string name="release">Déselection</string>
     <string name="releaseThrottleNumber">Déselection Commande %1$s</string>

diff --git a/EngineDriver/src/main/res/values-it/strings.xml b/EngineDriver/src/main/res/values-it/strings.xml
@@ -69,7 +69,7 @@
     <string name="reverse">Indietro</string>
     <string name="none">Niente</string>
     <string name="fb_helptext">Inserire etichette e n. funzioni nella lista a destra. Lasciare in bianco per nascondere il pulsante. Questi sono usati quando le funzioni di elenco non sono disponibili.</string>
-    <string name="copy_function_labels">Copiare Etichette dall\\\'Elenco</string>
+    <string name="copy_function_labels">Copiare Etichette dall\'Elenco</string>
     <string name="fb_header">Modifica Funzioni</string>
 
     <string name="fbResetFunctionLabels">Resettare Tutto</string>
@@ -87,7 +87,7 @@
     <string name="loco_direction_right_extra">"\u00B7I\u00B7"</string>
     <string name="locoPressToSelect">Selezionare</string>
     <string name="powerWillNotWorkTitle">Non funzionerà!</string>
-    <string name="powerWillNotWork">JMRI ha regolato il  controllo di energia wiThrottle su spento.\nRimuoverà adesso l\'icona di energia.\nMostrerà di nuovo quando la regolazione di JMRI sarà su acceso.</string>
+    <string name="powerWillNotWork">JMRI ha regolato il  controllo di energia WiThrottle su spento.\nRimuoverà adesso l\'icona di energia.\nMostrerà di nuovo quando la regolazione di JMRI sarà su acceso.</string>
     <string name="current_locos">Locomotive Attualmente Selezionate</string>
     <string name="release">Rilasciare</string>
     <string name="releaseThrottleNumber">Rilasciare Acceleratore %1$s</string>
@@ -755,7 +755,7 @@
     <string name="prefThrottleSwitchOption2Summary">Button Switch Throttle passerà tra il tipo di schermo nella preferenza precedente e questo.</string>
     <string name="prefThrottleSwitchOption2Title">Acceleratore Tipo di interruttore seconda schermata</string>
     <string name="recent_consists">Seleziona da Locomotive recenti</string>
-    <string name="prefLimitSpeedButtonPreferencesTitle">Pulsante Preferenze \\\'limite di velocità\\\'</string>
+    <string name="prefLimitSpeedButtonPreferencesTitle">Pulsante Preferenze \'limite di velocità\'</string>
     <string name="toastPreferencesBackgroundChangeSucceeded">Sfondo Change Succeeded.</string>
     <string name="throttleSwitchAction">Passare da una schermata a farfalla</string>
     <string name="prefBackgroundImagePreferencesTitle">Preferenze immagine di sfondo</string>
@@ -764,11 +764,11 @@
     <string name="gamepad_test_menu">\≡ Test Gamepad</string>
     <string name="prefSwipeDownOptionSummary">Che cosa dovrebbe accadere quando si scorrere verso il basso la vista acceleratore.</string>
     <string name="prefSwipeDownOptionTitle">Swipe l\'azione verso il basso nella vista Throttle?</string>
-    <string name="prefPauseSpeedButtonTitle">Visualizza \\\'Pausa\\\' pulsante</string>
+    <string name="prefPauseSpeedButtonTitle">Visualizza \'Pausa\' pulsante</string>
     <string name="prefPauseSpeedButtonSummary">Mostra un pulsante per rallentare e fermare la locomotiva, per poi tornare alla velocità sul rilascio.</string>
-    <string name="prefPauseSpeedRateTitle">\\\'Pausa\\\' tasso pulsante</string>
+    <string name="prefPauseSpeedRateTitle">\'Pausa\' tasso pulsante</string>
     <string name="prefPauseSpeedRateSummary">Numero di millisecondi tra variazioni di passo di velocità per l\'azione di pausa.</string>
-    <string name="prefPauseSpeedStepTitle">\\\'Pausa\\\' step pulsante</string>
+    <string name="prefPauseSpeedStepTitle">\'Pausa\' step pulsante</string>
     <string name="prefPauseSpeedStepSummary">dimensione del passo cambia per l\'azione Pausa.</string>
 
     <string name="prefAllowMobileDataTitle">Consenti connessione dati mobile</string>
@@ -783,7 +783,7 @@
     <string name="prefFunctionConsistLatchingDefaultValue">nessuna</string>
     <string name="prefFunctionConsistLatchingLightBellDefaultValue">aggancio</string>
     <string name="prefFunctionConsistLocosDefaultValue">condurre</string>
-    <string name="functionConsistHelpText">Utilizzato solo per il \\ \'Special \\\' costituito opzioni seguente funzione. Selezionare come il testo di ciascuna funzione verrà cercato nelle etichette funzione per ogni loco nel consistere.</string>
+    <string name="functionConsistHelpText">Utilizzato solo per il \'Special\' costituito opzioni seguente funzione. Selezionare come il testo di ciascuna funzione verrà cercato nelle etichette funzione per ogni loco nel consistere.</string>
     <string name="functionConsistHeader">Consistono azioni di funzione</string>
     <string name="app_name_consist_functions">Consistono Impostazioni delle funzioni - macchinista</string>
     <string name="prefShowTimeOnLogEntryTitle">Mostra timestamp su Log</string>

diff --git a/EngineDriver/src/main/res/values-pt/strings.xml b/EngineDriver/src/main/res/values-pt/strings.xml
@@ -86,7 +86,7 @@
     <string name="loco_direction_right_extra">"\u00B7T\u00B7"</string>
     <string name="locoPressToSelect">Selecionar</string>
     <string name="powerWillNotWorkTitle">Não funcionará!</string>
-    <string name="powerWillNotWork">JMRI tem regulado o controle de energia wiThrottle para desligado.\nremoverá agora o Ícone de Energia.\nMostrará de novo quando a regulagem JMRI estará ligada.</string>
+    <string name="powerWillNotWork">JMRI tem regulado o controle de energia WiThrottle para desligado.\nremoverá agora o Ícone de Energia.\nMostrará de novo quando a regulagem JMRI estará ligada.</string>
     <string name="current_locos">Locomotivas Atualmente Selecionadas</string>
     <string name="release">Soltar</string>
     <string name="releaseThrottleNumber">Soltar Acelerador %1$s</string>
@@ -758,7 +758,7 @@
     <string name="prefThrottleSwitchOption2Summary">Mudar acelerador botão irá alternar entre o tipo de ecrã na preferência anterior e este.</string>
     <string name="prefThrottleSwitchOption2Title">Acelerador Tipo de interruptor segunda tela</string>
     <string name="recent_consists">Seleccione a partir das locomotivas recentes</string>
-    <string name="prefLimitSpeedButtonPreferencesTitle">Preferências \\\'Limite de velocidade\\\' botão</string>
+    <string name="prefLimitSpeedButtonPreferencesTitle">Preferências \'Limite de velocidade\' botão</string>
     <string name="toastPreferencesBackgroundChangeSucceeded">Mudar fundo Sucedido.</string>
     <string name="throttleSwitchAction">Mudar telas do acelerador</string>
     <string name="prefBackgroundImagePreferencesTitle">Preferências imagem de fundo</string>
@@ -767,11 +767,11 @@
     <string name="gamepad_test_menu">\≡ Teste Gamepad</string>
     <string name="prefSwipeDownOptionSummary">O que deve acontecer quando você deslizar para baixo na visão do acelerador.</string>
     <string name="prefSwipeDownOptionTitle">ação baixo furto na visão do acelerador?</string>
-    <string name="prefPauseSpeedButtonTitle">Mostrar \\\'Pausa\\\' botão</string>
+    <string name="prefPauseSpeedButtonTitle">Mostrar \'Pausa\' botão</string>
     <string name="prefPauseSpeedButtonSummary">Mostrar um botão para abrandar e parar a locomotiva, em seguida, retornar à velocidade na liberação.</string>
-    <string name="prefPauseSpeedRateTitle">\\\'Pausa\\\' taxa de botão</string>
+    <string name="prefPauseSpeedRateTitle">\'Pausa\' taxa de botão</string>
     <string name="prefPauseSpeedRateSummary">Número de milissegundos entre o passo mudanças de velocidade para a ação Pausa.</string>
-    <string name="prefPauseSpeedStepTitle">\\\'Pausa\\\' passo botão</string>
+    <string name="prefPauseSpeedStepTitle">\'Pausa\' passo botão</string>
     <string name="prefPauseSpeedStepSummary">tamanho do passo muda para a ação Pausa.</string>
 
     <string name="prefAllowMobileDataTitle">Permitir conexão de dados móveis</string>
@@ -786,7 +786,7 @@
     <string name="prefFunctionConsistLatchingDefaultValue">Nenhum</string>
     <string name="prefFunctionConsistLatchingLightBellDefaultValue">trancando</string>
     <string name="prefFunctionConsistLocosDefaultValue">conduzir</string>
-    <string name="functionConsistHelpText">Apenas usada para o \\ \'especial \\\' consistem de função seguintes opções. Escolha como o texto de cada função será procurado nos rótulos de função para cada loco no composto.</string>
+    <string name="functionConsistHelpText">Apenas usada para o \'especial \' consistem de função seguintes opções. Escolha como o texto de cada função será procurado nos rótulos de função para cada loco no composto.</string>
     <string name="functionConsistHeader">Consistem Ações de função</string>
     <string name="app_name_consist_functions">Consistem configurações de funções - Driver Motor</string>
     <string name="prefShowTimeOnLogEntryTitle">Mostrar Timestamps em Log</string>
@@ -828,7 +828,7 @@
     <string name="idngo_button">Solicitar Loco ID</string>
     <string name="idngo_help_text">Pressione o botão para enviar um pedido ao servidor para identificar e adquirir o loco já no caminho de programação e retornar o valor para este acelerador.</string>
     <string name="permissionsWriteSettingsAdditional" tools:ignore="TypographyEllipsis">- Clique no botão abaixo - Conceder a permissão - Clique em \'Voltar\' para voltar aqui...</string>
-    <string name="permissionsWriteSettingsAdditional2">Ignorar esta se você don\\\'t \'Engine Driver necessidade do motor para alterar o brilho.</string>
+    <string name="permissionsWriteSettingsAdditional2">Ignorar esta se você don\'t \'Engine Driver necessidade do motor para alterar o brilho.</string>
     <string name="permissionsACCESS_FINE_LOCATION">Engine Driver do motor precisa de permissões ACCESS_FINE_LOCATION para recuperar SSID wi-fi atual.</string>
     <string name="prefKidsTimerEnableReverseTitle">Permitir inverso</string>
     <string name="prefKidsTimerEnableReverseSummary">Ative o botão inverso.</string>