Minor fixes

app/build.gradle

@@ -11,7 +11,7 @@ android {
         compileSdkVersion 36
         buildToolsVersion '36.0.0'
         useLibrary  'org.apache.http.legacy'
-        versionCode 149
+        versionCode 150
         versionName "1.8.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/googlePlayFlavor/java/com/jens/automation2/receivers/ActivityDetectionReceiver.java

@@ -403,7 +403,11 @@ public class ActivityDetectionReceiver extends IntentService implements Automati
 	private PendingIntent getActivityDetectionPendingIntent()
 	{
 		Intent intent = new Intent(AutomationService.getInstance(), ActivityDetectionReceiver.class);
-		PendingIntent returnValue = PendingIntent.getService(AutomationService.getInstance(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+		PendingIntent returnValue;
+		if(Miscellaneous.getTargetSDK(AutomationService.getInstance()) >= 31)
+			returnValue = PendingIntent.getService(AutomationService.getInstance(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT|PendingIntent.FLAG_IMMUTABLE);
+		else
+			returnValue = PendingIntent.getService(AutomationService.getInstance(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 		return returnValue;
 	}
 }

app/src/main/java/com/jens/automation2/ActivityManageRule.java

@@ -670,6 +670,8 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.subsystemstate));
 			else if(types[i].toString().equals(Trigger_Enum.checkVariable.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.variable));
+			else if(types[i].toString().equals(Trigger_Enum.proximity.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.proximity));
 			else if(types[i].toString().equals(Trigger_Enum.calendarEvent.toString()))
 			{
 				if(ActivityPermissions.isPermissionDeclaredInManifest(ActivityManageRule.this, Manifest.permission.READ_CALENDAR))
@@ -753,7 +755,17 @@ public class ActivityManageRule extends Activity
 						booleanChoices = new String[]{getResources().getString(R.string.started), getResources().getString(R.string.stopped)};
 					else if(triggerType == Trigger_Enum.usb_host_connection)
 						booleanChoices = new String[]{getResources().getString(R.string.connected), getResources().getString(R.string.disconnected)};
-					else if(triggerType == Trigger_Enum.speed || triggerType == Trigger_Enum.noiseLevel || triggerType == Trigger_Enum.batteryLevel)
+					else if(triggerType == Trigger_Enum.speed)
+					{
+						if(Miscellaneous.googleToBlameForLocation(false))
+						{
+							ActivityMainScreen.openGoogleBlamingWindow();
+							return;
+						}
+						else
+							booleanChoices = new String[]{getResources().getString(R.string.exceeds), getResources().getString(R.string.dropsBelow)};
+					}
+					else if(triggerType == Trigger_Enum.noiseLevel || triggerType == Trigger_Enum.batteryLevel)
 						booleanChoices = new String[]{getResources().getString(R.string.exceeds), getResources().getString(R.string.dropsBelow)};
 					else if(triggerType == Trigger_Enum.wifiConnection)
 					{

app/src/main/java/com/jens/automation2/Miscellaneous.java

@@ -201,7 +201,7 @@ public class Miscellaneous extends Service
 				else if (method.equals(ActivityManageActionTriggerUrl.methodPost))
 					connection.setRequestMethod("POST");
 
-                if(httpParams.size() > 0)
+				if (httpParams != null && httpParams.size() > 0)
 				{
 					connection.setRequestMethod("POST");
 					connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -409,6 +409,7 @@ public class Miscellaneous extends Service
 	}
 
 	protected static boolean logCleanerRunning = false;
+
 	protected static void rotateLogFile(File logFile)
 	{
 		logCleanerRunning = true;
@@ -522,7 +523,8 @@ public class Miscellaneous extends Service
 							}
 //							}
 						}
-					} catch (Exception e)
+					}
+					catch (Exception e)
 					{
 						Log.w("getWritableFolder", folder + " not writable.");
 					}
@@ -534,6 +536,7 @@ public class Miscellaneous extends Service
 	}
 
 	protected final static String logFileName = "Automation_logfile.txt";
+
 	protected static File getLogFile()
 	{
 		File logFile = null;
@@ -553,6 +556,7 @@ public class Miscellaneous extends Service
 
 		return logFile;
 	}
+
 	private static void writeToLogFile(String type, String header, String description)
 	{
 		try
@@ -1061,7 +1065,8 @@ public class Miscellaneous extends Service
 
 		ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo[] netInfo = cm.getAllNetworkInfo();
-		for (NetworkInfo ni : netInfo) {
+		for (NetworkInfo ni : netInfo)
+		{
 			if (ni.getTypeName().equalsIgnoreCase("WIFI"))
 				if (ni.isConnected())
 					haveConnectedWifi = true;
@@ -1295,7 +1300,8 @@ public class Miscellaneous extends Service
 					Thread.sleep(delay);
 				}
 				catch (Exception e)
-				{}
+				{
+				}
 
 				createDismissibleNotification(title, textToDisplay, notificationId, true, notificationChannelId, pendingIntent);
 
@@ -1359,6 +1365,7 @@ public class Miscellaneous extends Service
 
 		return null;
 	}
+
 	@RequiresApi(api = Build.VERSION_CODES.O)
 	static NotificationChannel getNotificationChannel(String channelId)
 	{
@@ -2270,6 +2277,7 @@ public class Miscellaneous extends Service
 
 	/**
 	 * Get ISO 3166-1 alpha-2 country code for this device (or null if not available)
+	 *
 	 * @param context Context reference to get the TelephonyManager instance from
 	 * @return country code or null
 	 */
@@ -2297,7 +2305,8 @@ public class Miscellaneous extends Service
 			return "unknown";
 		}
 		catch (Exception e)
-		{ }
+		{
+		}
 
 		return null;
 	}
@@ -2356,7 +2365,18 @@ public class Miscellaneous extends Service
 
 	public static void setDisplayLanguage(Context context)
 	{
-		if(!Settings.displayLanguage.equals(Settings.default_displayLanguage))
+		String targetLanguage = null;
+
+		if (Settings.displayLanguage == null)
+		{
+			targetLanguage = Settings.default_displayLanguage;
+		}
+		else if (!Settings.displayLanguage.equals(Settings.default_displayLanguage))
+		{
+			targetLanguage = Settings.default_displayLanguage;
+		}
+
+		if (targetLanguage != null)
 		{
 			Locale myLocale;
 

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;
 				}
+
+				if(Build.VERSION.SDK_INT >= 26)
+					loc.getParentService().registerReceiver(wifiBrInstance, wifiListenerIntentFilter, Context.RECEIVER_EXPORTED);
+				else
 					loc.getParentService().registerReceiver(wifiBrInstance, wifiListenerIntentFilter);
+
 				wifiListenerActive = true;
 			}
 		}

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);
 

app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java

@@ -56,9 +56,16 @@ public class BroadcastListener extends android.content.BroadcastReceiver impleme
         if(intent.getExtras() != null && intent.getExtras().size() > 0)
         {
             for (String key : intent.getExtras().keySet())
+            {
+                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);
+                }
+            }
         }
 
         ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.broadcastReceived);
@@ -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)

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);
 			}

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);
 

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);
 

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);
 

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);
 

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);
 			}

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

@@ -349,10 +349,10 @@
 	<string name="errorReadingPoisAndRulesFromFile">Fehler beim Lesen von Orten und Regeln aus Datei.</string>
 	<string name="noDataChangedReadingAnyway">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.</string>
 	<string name="bluetoothConnection">Bluetooth Verbindung</string>
-	<string name="bluetoothConnectionTo">Bluetooth Verbindung zu %1$s</string>
+	<string name="bluetoothConnectionTo">Bluetooth Verbindung zu \"%1$s\"</string>
-	<string name="bluetoothDisconnectFrom">Bluetooth Verbindung getrennt von %1$s</string>
+	<string name="bluetoothDisconnectFrom">Bluetooth Verbindung getrennt von \"%1$s\"</string>
-	<string name="bluetoothDeviceInRange">Bluetooth Gerät %1$s in Reichweite.</string>
+	<string name="bluetoothDeviceInRange">Bluetooth Gerät \"%1$s\" in Reichweite.</string>
-    <string name="bluetoothDeviceOutOfRange">Bluetooth Gerät %1$s außer Reichweite.</string>
+    <string name="bluetoothDeviceOutOfRange">Bluetooth Gerät \"%1$s\" außer Reichweite.</string>
 	<string name="anyDevice">irgendeinem Gerät</string>
     <string name="noDevice">kein Gerät</string>
 	<string name="selectDeviceFromList">Gerät aus Liste</string>

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

@@ -228,7 +228,7 @@
     <string name="startOtherActivity">Iniciar otra app</string>
     <string name="settings">Ajustes</string>
     <string name="bluetoothConnection">Conexión Bluetooth</string>
-    <string name="bluetoothConnectionTo">Conexión Bluetooth con %1$s</string>
+    <string name="bluetoothConnectionTo">Conexión Bluetooth con \"%1$s\"</string>
     <string name="anyDevice">cualquier dispositivo</string>
     <string name="noDevice">ningun dispositivo</string>
     <string name="actionPlayMusic">Abrir reproductor de música</string>
@@ -509,9 +509,9 @@
     <string name="toggleNotAllowed">Reversibilidad solo esta permitida para reglas que tienen tags NFC por condición. Consulte la ayuda para mas información.</string>
     <string name="errorReadingPoisAndRulesFromFile">Error en la lectura sitios y reglas del archivo.</string>
     <string name="noDataChangedReadingAnyway">Aparece no hay cambios. Pero puede haber cambios en la memoria que pueden ser recogidos. Leyendo archivo de nuevo.</string>
-    <string name="bluetoothDisconnectFrom">Conexión Bluetooth de %1$s desconectada</string>
+    <string name="bluetoothDisconnectFrom">Conexión Bluetooth de \"%1$s\" desconectada</string>
-    <string name="bluetoothDeviceInRange">Dispositivo Bluetooth %1$s en alcance.</string>
+    <string name="bluetoothDeviceInRange">Dispositivo Bluetooth \"%1$s\" en alcance.</string>
-    <string name="bluetoothDeviceOutOfRange">Dispositivo Bluetooth %1$s fuera de alcance.</string>
+    <string name="bluetoothDeviceOutOfRange">Dispositivo Bluetooth \"%1$s\" fuera de alcance.</string>
     <string name="deviceInRange">dispositivo en alcance</string>
     <string name="deviceOutOfRange">dispositivo fuera de alcance</string>
     <string name="selectDeviceOption">Elija una opción de dispositivo.</string>

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

@@ -352,8 +352,8 @@
     <string name="errorReadingPoisAndRulesFromFile">Erreur de lecture des positions et règles depuis le fichier.</string>
     <string name="noDataChangedReadingAnyway">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.</string>
     <string name="bluetoothConnection">connexion Bluetooth</string>
-    <string name="bluetoothConnectionTo">connexion Bluetooth à %1$s</string>
+    <string name="bluetoothConnectionTo">connexion Bluetooth à \"%1$s\"</string>
-    <string name="bluetoothDisconnectFrom">connexion Bluetooth à %1$s perdue</string>
+    <string name="bluetoothDisconnectFrom">connexion Bluetooth à \"%1$s\" perdue</string>
     <string name="bluetoothDeviceInRange">Dispositif Bluetooth %1$s à portée.</string>
     <string name="bluetoothDeviceOutOfRange">Dispositif Bluetooth %1$s hors de portée.</string>
     <string name="anyDevice">n’importe quel appareil</string>

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

@@ -105,8 +105,8 @@
     <string name="autoBrightnessNotice">Se usi la luminosità automatica, il valore di luminosità scelto in seguito probabilmente non sarà in uso per molto.</string>
     <string name="batteryLevel">Livello della batteria</string>
     <string name="bluetoothConnection">Connessione Bluetooth</string>
-    <string name="bluetoothConnectionTo">Connessione Bluetooth con %1$s</string>
+    <string name="bluetoothConnectionTo">Connessione Bluetooth con \"%1$s\"</string>
-    <string name="bluetoothDeviceInRange">Dispositivo Bluetooth %1$s rilevato.</string>
+    <string name="bluetoothDeviceInRange">Dispositivo Bluetooth \"%1$s\" rilevato.</string>
     <string name="bluetoothDeviceOutOfRange">Dispositivo Bluetooth %1$s non raggiungibile.</string>
     <string name="bluetoothDisconnectFrom">Connessione Bluetooth con %1$s interrotta</string>
     <string name="bluetoothFailed">Impossibile attivare il Bluetooth. Questo dispositivo ne è dotato?</string>

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

@@ -347,8 +347,8 @@
     <string name="errorReadingPoisAndRulesFromFile">Fout bij het lezen van locaties en regels uit bestand.</string>
     <string name="noDataChangedReadingAnyway">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.</string>
     <string name="bluetoothConnection">Bluetooth connection</string>
-    <string name="bluetoothConnectionTo">Bluetooth-verbinding met %1$s</string>
+    <string name="bluetoothConnectionTo">Bluetooth-verbinding met \"%1$s\"</string>
-    <string name="bluetoothDisconnectFrom">Bluetooth-verbinding met %1$s verbroken</string>
+    <string name="bluetoothDisconnectFrom">Bluetooth-verbinding met \"%1$s\" verbroken</string>
     <string name="bluetoothDeviceInRange">Bluetooth-apparaat %1$s binnen bereik.</string>
     <string name="bluetoothDeviceOutOfRange">Bluetooth-apparaat %1$s buiten bereik.</string>
     <string name="anyDevice">elk apparaat</string>

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

@@ -420,8 +420,8 @@
     <string name="errorReadingPoisAndRulesFromFile">Błąd odczytu lokalizacji i reguł z pliku.</string>
     <string name="noDataChangedReadingAnyway">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.</string>
     <string name="bluetoothConnection">Połączenie Bluetooth</string>
-    <string name="bluetoothConnectionTo">Połączenie Bluetooth do %1$s</string>
+    <string name="bluetoothConnectionTo">Połączenie Bluetooth do \"%1$s\"</string>
-    <string name="bluetoothDisconnectFrom">Połączenie Bluetooth z %1$s utracone</string>
+    <string name="bluetoothDisconnectFrom">Połączenie Bluetooth z \"%1$s\" utracone</string>
     <string name="bluetoothDeviceInRange">Bluetooth device %1$s in range.</string>
     <string name="bluetoothDeviceOutOfRange">Urządzenie Bluetooth %1$s w zasięgu.</string>
     <string name="anyDevice">dowolne urządzenie</string>

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

@@ -389,8 +389,8 @@
   <string name="errorReadingPoisAndRulesFromFile">Ошибка чтения местоположений и правил из файла.</string>
   <string name="noDataChangedReadingAnyway">Похоже, что изменения данных не были сохранены. Однако в памяти могут быть изменения, которые необходимо откатить. Перечитываю файл.</string>
   <string name="bluetoothConnection">Подключение по Bluetooth</string>
-  <string name="bluetoothConnectionTo">Подключение Bluetooth к %1$s</string>
+  <string name="bluetoothConnectionTo">Подключение Bluetooth к \"%1$s\"</string>
-  <string name="bluetoothDisconnectFrom">Подключение Bluetooth к %1$s разорвано</string>
+  <string name="bluetoothDisconnectFrom">Подключение Bluetooth к \%1$s\" разорвано</string>
   <string name="bluetoothDeviceInRange">Устройство Bluetooth %1$s в диапазоне.</string>
   <string name="bluetoothDeviceOutOfRange">Устройство Bluetooth %1$s вне диапазона.</string>
   <string name="anyDevice">любое устройство</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -343,7 +343,7 @@
     <string name="errorReadingPoisAndRulesFromFile">从文件中读取位置和规则时出错。</string>
     <string name="noDataChangedReadingAnyway">似乎没有保存过数据更改。但内存中可能有更改需要回滚。正在重新读取文件。</string>
     <string name="bluetoothConnection">蓝牙连接</string>
-    <string name="bluetoothConnectionTo">蓝牙连接到 %1$s</string>
+    <string name="bluetoothConnectionTo">蓝牙连接到 \"%1$s\"</string>
     <string name="bluetoothDisconnectFrom">与 %1$s 断开蓝牙连接</string>
     <string name="bluetoothDeviceInRange">蓝牙设备 %1$s 在范围内。</string>
     <string name="bluetoothDeviceOutOfRange">蓝牙设备 %1$s 不在范围内。</string>

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

@@ -422,10 +422,10 @@
     <string name="errorReadingPoisAndRulesFromFile">Error reading locations and rules from file.</string>
     <string name="noDataChangedReadingAnyway">It appears no data change has been saved. However there may have been changes in memory that need to be rolled back. Rereading file.</string>
     <string name="bluetoothConnection">Bluetooth connection</string>
-    <string name="bluetoothConnectionTo">Bluetooth connection to %1$s</string>
+    <string name="bluetoothConnectionTo">Bluetooth connection to \"%1$s\"</string>
-    <string name="bluetoothDisconnectFrom">Bluetooth connection from %1$s torn</string>
+    <string name="bluetoothDisconnectFrom">Bluetooth connection from \"%1$s\" torn</string>
-    <string name="bluetoothDeviceInRange">Bluetooth device %1$s in range.</string>
+    <string name="bluetoothDeviceInRange">Bluetooth device \"%1$s\" in range.</string>
-    <string name="bluetoothDeviceOutOfRange">Bluetooth device %1$s out of range.</string>
+    <string name="bluetoothDeviceOutOfRange">Bluetooth device \"%1$s\" out of range.</string>
     <string name="anyDevice">any device</string>
     <string name="ruleDoesntApplyNotTheCorrectDeviceName" translatable="false">Rule \"%1$s\" doesn\'t apply. Not the correct bluetooth device name.</string>
     <string name="ruleDoesntApplyNotTheCorrectDeviceAddress" translatable="false">Rule \"%1$s\" doesn\'t apply. Not the correct bluetooth device address.</string>