From 64936ce75aca4fb3b58917cccd7bec08eba988cf Mon Sep 17 00:00:00 2001 From: jens Date: Sun, 16 Aug 2026 18:52:18 +0200 Subject: [PATCH] registerReceiver option modified --- .../automation2/location/WifiBroadcastReceiver.java | 8 +++++++- .../jens/automation2/receivers/BatteryReceiver.java | 3 +-- .../jens/automation2/receivers/BroadcastListener.java | 10 +++++++++- .../automation2/receivers/HeadphoneJackListener.java | 2 +- .../automation2/receivers/PhoneStatusListener.java | 2 +- .../automation2/receivers/ScreenStateReceiver.java | 4 +--- .../automation2/receivers/SubSystemStateReceiver.java | 2 +- .../jens/automation2/receivers/TetheringReceiver.java | 2 +- .../jens/automation2/receivers/TimeZoneListener.java | 2 +- app/src/main/res/values-de/strings.xml | 8 ++++---- app/src/main/res/values-es/strings.xml | 8 ++++---- app/src/main/res/values-fr/strings.xml | 4 ++-- app/src/main/res/values-it/strings.xml | 4 ++-- app/src/main/res/values-nl/strings.xml | 4 ++-- app/src/main/res/values-pl/strings.xml | 4 ++-- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values/strings.xml | 8 ++++---- 18 files changed, 46 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java b/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java index 1b7782b..e79266d 100644 --- a/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java +++ b/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java @@ -7,6 +7,7 @@ import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiManager; +import android.os.Build; import android.util.Log; import com.jens.automation2.AutomationService; @@ -213,7 +214,12 @@ public class WifiBroadcastReceiver extends BroadcastReceiver wifiBrInstance = new WifiBroadcastReceiver(); WifiBroadcastReceiver.parentLocationProvider = loc; } - loc.getParentService().registerReceiver(wifiBrInstance, wifiListenerIntentFilter); + + if(Build.VERSION.SDK_INT >= 26) + loc.getParentService().registerReceiver(wifiBrInstance, wifiListenerIntentFilter, Context.RECEIVER_EXPORTED); + else + loc.getParentService().registerReceiver(wifiBrInstance, wifiListenerIntentFilter); + wifiListenerActive = true; } } diff --git a/app/src/main/java/com/jens/automation2/receivers/BatteryReceiver.java b/app/src/main/java/com/jens/automation2/receivers/BatteryReceiver.java index d5947de..f36a529 100644 --- a/app/src/main/java/com/jens/automation2/receivers/BatteryReceiver.java +++ b/app/src/main/java/com/jens/automation2/receivers/BatteryReceiver.java @@ -1,6 +1,5 @@ package com.jens.automation2.receivers; -import static android.content.Context.RECEIVER_NOT_EXPORTED; import static android.os.BatteryManager.*; import android.os.BatteryManager; @@ -55,7 +54,7 @@ public class BatteryReceiver extends BroadcastReceiver implements AutomationList } if(Build.VERSION.SDK_INT >= 26) - batteryStatusReceiverIntent = automationServiceRef.registerReceiver(batteryInfoReceiverInstance, batteryIntentFilter, Context.RECEIVER_NOT_EXPORTED); + batteryStatusReceiverIntent = automationServiceRef.registerReceiver(batteryInfoReceiverInstance, batteryIntentFilter, Context.RECEIVER_EXPORTED); else batteryStatusReceiverIntent = automationServiceRef.registerReceiver(batteryInfoReceiverInstance, batteryIntentFilter); diff --git a/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java b/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java index a5e1a5f..aae6f7a 100644 --- a/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java +++ b/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java @@ -57,7 +57,14 @@ public class BroadcastListener extends android.content.BroadcastReceiver impleme { for (String key : intent.getExtras().keySet()) { - Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4); + try + { + Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4); + } + catch(NullPointerException e) + { + Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + "unknown class", 4); + } } } @@ -133,6 +140,7 @@ public class BroadcastListener extends android.content.BroadcastReceiver impleme broadcastStatus = automationServiceRef.registerReceiver(broadcastReceiverInstance, broadcastIntentFilter, Context.RECEIVER_EXPORTED); else broadcastStatus = automationServiceRef.registerReceiver(broadcastReceiverInstance, broadcastIntentFilter); + broadcastReceiverActive = true; } catch(Exception e) diff --git a/app/src/main/java/com/jens/automation2/receivers/HeadphoneJackListener.java b/app/src/main/java/com/jens/automation2/receivers/HeadphoneJackListener.java index 684d5f2..f4101f4 100644 --- a/app/src/main/java/com/jens/automation2/receivers/HeadphoneJackListener.java +++ b/app/src/main/java/com/jens/automation2/receivers/HeadphoneJackListener.java @@ -108,7 +108,7 @@ public class HeadphoneJackListener extends BroadcastReceiver implements Automati headphoneJackListenerActive = true; if(Build.VERSION.SDK_INT >= 26) - automationService.registerReceiver(this, headphoneJackListenerIntentFilter, Context.RECEIVER_NOT_EXPORTED); + automationService.registerReceiver(this, headphoneJackListenerIntentFilter, Context.RECEIVER_EXPORTED); else automationService.registerReceiver(this, headphoneJackListenerIntentFilter); } diff --git a/app/src/main/java/com/jens/automation2/receivers/PhoneStatusListener.java b/app/src/main/java/com/jens/automation2/receivers/PhoneStatusListener.java index 5a83c0f..066e3ca 100644 --- a/app/src/main/java/com/jens/automation2/receivers/PhoneStatusListener.java +++ b/app/src/main/java/com/jens/automation2/receivers/PhoneStatusListener.java @@ -287,7 +287,7 @@ public class PhoneStatusListener implements AutomationListenerInterface Miscellaneous.logEvent("i", "PhoneStatusListener", "Starting PhoneStatusListener->outgoingCallsReceiver", 4); if(Build.VERSION.SDK_INT >= 26) - automationService.registerReceiver(outgoingCallsReceiverInstance, outgoingCallsIntentFilter, Context.RECEIVER_NOT_EXPORTED); + automationService.registerReceiver(outgoingCallsReceiverInstance, outgoingCallsIntentFilter, Context.RECEIVER_EXPORTED); else automationService.registerReceiver(outgoingCallsReceiverInstance, outgoingCallsIntentFilter); diff --git a/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java b/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java index a2750c5..53b772f 100644 --- a/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java +++ b/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java @@ -1,7 +1,5 @@ package com.jens.automation2.receivers; -import static android.content.Context.RECEIVER_NOT_EXPORTED; - import android.Manifest; import android.app.KeyguardManager; import android.content.BroadcastReceiver; @@ -74,7 +72,7 @@ public class ScreenStateReceiver extends BroadcastReceiver implements Automation } if(Build.VERSION.SDK_INT >= 26) - screenStatusIntent = automationServiceRef.registerReceiver(screenStateReceiverInstance, screenStateIntentFilter, Context.RECEIVER_NOT_EXPORTED); + screenStatusIntent = automationServiceRef.registerReceiver(screenStateReceiverInstance, screenStateIntentFilter, Context.RECEIVER_EXPORTED); else screenStatusIntent = automationServiceRef.registerReceiver(screenStateReceiverInstance, screenStateIntentFilter); diff --git a/app/src/main/java/com/jens/automation2/receivers/SubSystemStateReceiver.java b/app/src/main/java/com/jens/automation2/receivers/SubSystemStateReceiver.java index f1a4ddb..890de96 100644 --- a/app/src/main/java/com/jens/automation2/receivers/SubSystemStateReceiver.java +++ b/app/src/main/java/com/jens/automation2/receivers/SubSystemStateReceiver.java @@ -118,7 +118,7 @@ public class SubSystemStateReceiver extends BroadcastReceiver implements Automat } if(Build.VERSION.SDK_INT >= 26) - subSystemStatusIntent = automationServiceRef.registerReceiver(subSystemStateReceiverInstance, subSystemStateIntentFilter, Context.RECEIVER_NOT_EXPORTED); + subSystemStatusIntent = automationServiceRef.registerReceiver(subSystemStateReceiverInstance, subSystemStateIntentFilter, Context.RECEIVER_EXPORTED); else subSystemStatusIntent = automationServiceRef.registerReceiver(subSystemStateReceiverInstance, subSystemStateIntentFilter); diff --git a/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java b/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java index 20ff238..bfc4543 100644 --- a/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java +++ b/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java @@ -163,7 +163,7 @@ public class TetheringReceiver extends android.content.BroadcastReceiver impleme try { if(Build.VERSION.SDK_INT >= 26) - automationServiceRef.registerReceiver(receiverInstance, intentFilter, Context.RECEIVER_NOT_EXPORTED); + automationServiceRef.registerReceiver(receiverInstance, intentFilter, Context.RECEIVER_EXPORTED); else automationServiceRef.registerReceiver(receiverInstance, intentFilter); diff --git a/app/src/main/java/com/jens/automation2/receivers/TimeZoneListener.java b/app/src/main/java/com/jens/automation2/receivers/TimeZoneListener.java index 9a899e3..afba8a8 100644 --- a/app/src/main/java/com/jens/automation2/receivers/TimeZoneListener.java +++ b/app/src/main/java/com/jens/automation2/receivers/TimeZoneListener.java @@ -46,7 +46,7 @@ public class TimeZoneListener extends BroadcastReceiver implements AutomationLis } if(Build.VERSION.SDK_INT >= 26) - automationService.registerReceiver(timeZoneListenerInstance, timezoneListenerIntentFilter, Context.RECEIVER_NOT_EXPORTED); + automationService.registerReceiver(timeZoneListenerInstance, timezoneListenerIntentFilter, Context.RECEIVER_EXPORTED); else automationService.registerReceiver(timeZoneListenerInstance, timezoneListenerIntentFilter); } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9688757..76751f1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -349,10 +349,10 @@ Fehler beim Lesen von Orten und Regeln aus Datei. Es scheint als wären keine Datenänderungen gespeichert worden. Allerdings könnten Änderungen im Speicher sein, die zurückgenommen werden müssen. Daher wird die Einstellungsdatei neu geladen. Bluetooth Verbindung - Bluetooth Verbindung zu %1$s - Bluetooth Verbindung getrennt von %1$s - Bluetooth Gerät %1$s in Reichweite. - Bluetooth Gerät %1$s außer Reichweite. + Bluetooth Verbindung zu \"%1$s\" + Bluetooth Verbindung getrennt von \"%1$s\" + Bluetooth Gerät \"%1$s\" in Reichweite. + Bluetooth Gerät \"%1$s\" außer Reichweite. irgendeinem Gerät kein Gerät Gerät aus Liste diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 13c70be..6c4e633 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -228,7 +228,7 @@ Iniciar otra app Ajustes Conexión Bluetooth - Conexión Bluetooth con %1$s + Conexión Bluetooth con \"%1$s\" cualquier dispositivo ningun dispositivo Abrir reproductor de música @@ -509,9 +509,9 @@ Reversibilidad solo esta permitida para reglas que tienen tags NFC por condición. Consulte la ayuda para mas información. Error en la lectura sitios y reglas del archivo. Aparece no hay cambios. Pero puede haber cambios en la memoria que pueden ser recogidos. Leyendo archivo de nuevo. - Conexión Bluetooth de %1$s desconectada - Dispositivo Bluetooth %1$s en alcance. - Dispositivo Bluetooth %1$s fuera de alcance. + Conexión Bluetooth de \"%1$s\" desconectada + Dispositivo Bluetooth \"%1$s\" en alcance. + Dispositivo Bluetooth \"%1$s\" fuera de alcance. dispositivo en alcance dispositivo fuera de alcance Elija una opción de dispositivo. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 05ddfcc..a849836 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -352,8 +352,8 @@ Erreur de lecture des positions et règles depuis le fichier. Les modifications n’ont pas éte enregistrées. Cependant, il peut y avoir eu des changements dans la mémoire qui doit être rechargée. Relecture du fichier. connexion Bluetooth - connexion Bluetooth à %1$s - connexion Bluetooth à %1$s perdue + connexion Bluetooth à \"%1$s\" + connexion Bluetooth à \"%1$s\" perdue Dispositif Bluetooth %1$s à portée. Dispositif Bluetooth %1$s hors de portée. n’importe quel appareil diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6017a33..52ce1a4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -105,8 +105,8 @@ Se usi la luminosità automatica, il valore di luminosità scelto in seguito probabilmente non sarà in uso per molto. Livello della batteria Connessione Bluetooth - Connessione Bluetooth con %1$s - Dispositivo Bluetooth %1$s rilevato. + Connessione Bluetooth con \"%1$s\" + Dispositivo Bluetooth \"%1$s\" rilevato. Dispositivo Bluetooth %1$s non raggiungibile. Connessione Bluetooth con %1$s interrotta Impossibile attivare il Bluetooth. Questo dispositivo ne è dotato? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 867a7a7..812c701 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -347,8 +347,8 @@ Fout bij het lezen van locaties en regels uit bestand. Het lijkt erop dat er geen gegevenswijziging is opgeslagen. Er kunnen echter wijzigingen in het geheugen zijn geweest die moeten worden teruggedraaid. Herlezen van bestand. Bluetooth connection - Bluetooth-verbinding met %1$s - Bluetooth-verbinding met %1$s verbroken + Bluetooth-verbinding met \"%1$s\" + Bluetooth-verbinding met \"%1$s\" verbroken Bluetooth-apparaat %1$s binnen bereik. Bluetooth-apparaat %1$s buiten bereik. elk apparaat diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 21b58c7..814b518 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -420,8 +420,8 @@ Błąd odczytu lokalizacji i reguł z pliku. Wygląda na to, że nie zapisano żadnych zmian danych. Mogły jednak wystąpić zmiany w pamięci, które należy cofnąć. Ponowne czytanie pliku. Połączenie Bluetooth - Połączenie Bluetooth do %1$s - Połączenie Bluetooth z %1$s utracone + Połączenie Bluetooth do \"%1$s\" + Połączenie Bluetooth z \"%1$s\" utracone Bluetooth device %1$s in range. Urządzenie Bluetooth %1$s w zasięgu. dowolne urządzenie diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a231c61..ebe06ae 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -389,8 +389,8 @@ Ошибка чтения местоположений и правил из файла. Похоже, что изменения данных не были сохранены. Однако в памяти могут быть изменения, которые необходимо откатить. Перечитываю файл. Подключение по Bluetooth - Подключение Bluetooth к %1$s - Подключение Bluetooth к %1$s разорвано + Подключение Bluetooth к \"%1$s\" + Подключение Bluetooth к \%1$s\" разорвано Устройство Bluetooth %1$s в диапазоне. Устройство Bluetooth %1$s вне диапазона. любое устройство diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0c7d4c5..1393c62 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -343,7 +343,7 @@ 从文件中读取位置和规则时出错。 似乎没有保存过数据更改。但内存中可能有更改需要回滚。正在重新读取文件。 蓝牙连接 - 蓝牙连接到 %1$s + 蓝牙连接到 \"%1$s\" 与 %1$s 断开蓝牙连接 蓝牙设备 %1$s 在范围内。 蓝牙设备 %1$s 不在范围内。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 945dcca..2c59a8d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -422,10 +422,10 @@ Error reading locations and rules from file. It appears no data change has been saved. However there may have been changes in memory that need to be rolled back. Rereading file. Bluetooth connection - Bluetooth connection to %1$s - Bluetooth connection from %1$s torn - Bluetooth device %1$s in range. - Bluetooth device %1$s out of range. + Bluetooth connection to \"%1$s\" + Bluetooth connection from \"%1$s\" torn + Bluetooth device \"%1$s\" in range. + Bluetooth device \"%1$s\" out of range. any device Rule \"%1$s\" doesn\'t apply. Not the correct bluetooth device name. Rule \"%1$s\" doesn\'t apply. Not the correct bluetooth device address.