From 74f50d3e13ee78051630a0d636376389740e3e83 Mon Sep 17 00:00:00 2001
From: Jens <android-development@gmx.de>
Date: Sun, 9 May 2021 23:10:58 +0200
Subject: [PATCH] Wireguard integration

---
 .../jens/automation2/XmlFileInterface.java    | 91 +------------------
 app/src/main/res/values-es/strings.xml        | 55 +++++++++++
 2 files changed, 59 insertions(+), 87 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/XmlFileInterface.java b/app/src/main/java/com/jens/automation2/XmlFileInterface.java
index 9e52fef6..ceb2c439 100644
--- a/app/src/main/java/com/jens/automation2/XmlFileInterface.java
+++ b/app/src/main/java/com/jens/automation2/XmlFileInterface.java
@@ -861,45 +861,11 @@ public class XmlFileInterface
             if (name.equals("TriggerEvent"))
             {
             	String triggerEventString = readTag(parser, "TriggerEvent");
-//            	if(triggerEventString.equals("pointOfInterest"))
-//            		newTrigger.setTriggerType(Trigger_Enum.pointOfInterest);
-//            	else if(triggerEventString.equals("timeFrame"))
-//            		newTrigger.setTriggerType(Trigger_Enum.timeFrame);
-//            	else if(triggerEventString.equals("charging"))
-//            		newTrigger.setTriggerType(Trigger_Enum.charging);
-//            	else if(triggerEventString.equals("usb_host_connection"))
-//            		newTrigger.setTriggerType(Trigger_Enum.usb_host_connection);
-//            	else if(triggerEventString.equals("batteryLevel"))
-//            		newTrigger.setTriggerType(Trigger_Enum.batteryLevel);
-//            	else if(triggerEventString.equals("speed"))
-//            		newTrigger.setTriggerType(Trigger_Enum.speed);
-//            	else if(triggerEventString.equals("noiseLevel"))
-//            		newTrigger.setTriggerType(Trigger_Enum.noiseLevel);
-//            	else if(triggerEventString.equals("wifiConnection"))
-//            		newTrigger.setTriggerType(Trigger_Enum.wifiConnection);
-//            	else
-            		if(triggerEventString.equals("process_started_stopped") | triggerEventString.equals("process_running"))
+
+				if(triggerEventString.equals("process_started_stopped") | triggerEventString.equals("process_running"))
             		newTrigger.setTriggerType(Trigger_Enum.process_started_stopped);
-//            	else if(triggerEventString.equals("airplaneMode"))
-//            		newTrigger.setTriggerType(Trigger_Enum.airplaneMode);
-//            	else if(triggerEventString.equals("roaming"))
-//            		newTrigger.setTriggerType(Trigger_Enum.roaming);
-//            	else if(triggerEventString.equals("phoneCall"))
-//            		newTrigger.setTriggerType(Trigger_Enum.phoneCall);
-//            	else if(triggerEventString.equals("nfcTag"))
-//            		newTrigger.setTriggerType(Trigger_Enum.nfcTag);
-//				else if(triggerEventString.equals("notification"))
-//					newTrigger.setTriggerType(Trigger_Enum.notification);
-//            	else if(triggerEventString.equals("activityDetection"))
-//            		newTrigger.setTriggerType(Trigger_Enum.activityDetection);
-//            	else if(triggerEventString.equals("bluetoothConnection"))
-//            		newTrigger.setTriggerType(Trigger_Enum.bluetoothConnection);
-//            	else if(triggerEventString.equals("headsetPlugged"))
-//            		newTrigger.setTriggerType(Trigger_Enum.headsetPlugged);
-//				else if(triggerEventString.equals("notification"))
-//					newTrigger.setTriggerType(Trigger_Enum.notification);
 				else
-				newTrigger.setTriggerType(Trigger_Enum.valueOf(triggerEventString));
+					newTrigger.setTriggerType(Trigger_Enum.valueOf(triggerEventString));
             }
             else if (name.equals("TriggerParameter1"))
             {
@@ -1079,17 +1045,6 @@ public class XmlFileInterface
             {				
             	String actionNameString = readTag(parser, "ActionName");
             	
-//            	if(actionNameString.equals("setWifi"))
-//            		newAction.setAction(Action_Enum.setWifi);
-//            	else if(actionNameString.equals("setBluetooth"))
-//            		newAction.setAction(Action_Enum.setBluetooth);
-//            	else if(actionNameString.equals("setUsbTethering"))
-//            		newAction.setAction(Action_Enum.setUsbTethering);
-//            	else if(actionNameString.equals("setWifiTethering"))
-//            		newAction.setAction(Action_Enum.setWifiTethering);
-//            	else if(actionNameString.equals("setDisplayRotation"))
-//            		newAction.setAction(Action_Enum.setDisplayRotation);
-            	
             // *** deprecated
             	//else
             		if(actionNameString.equals("turnWifiOn"))
@@ -1113,29 +1068,7 @@ public class XmlFileInterface
 	        	else if(actionNameString.equals("disableScreenRotation"))
 	        		newAction.setAction(Action_Enum.disableScreenRotation);
             // *** deprecated
-            	
-//            	else if(actionNameString.equals("triggerUrl"))
-//            		newAction.setAction(Action_Enum.triggerUrl);
-//            	else if(actionNameString.equals("changeSoundProfile"))
-//            		newAction.setAction(Action_Enum.changeSoundProfile);
-//	        	else if(actionNameString.equals("startOtherActivity"))
-//	        		newAction.setAction(Action_Enum.startOtherActivity);
-//	        	else if(actionNameString.equals("waitBeforeNextAction"))
-//	        		newAction.setAction(Action_Enum.waitBeforeNextAction);
-//	        	else if(actionNameString.equals("wakeupDevice"))
-//	        		newAction.setAction(Action_Enum.wakeupDevice);
-//	        	else if(actionNameString.equals("setAirplaneMode"))
-//	        		newAction.setAction(Action_Enum.setAirplaneMode);
-//	        	else if(actionNameString.equals("setDataConnection"))
-//	        		newAction.setAction(Action_Enum.setDataConnection);
-//	        	else if(actionNameString.equals("speakText"))
-//	        		newAction.setAction(Action_Enum.speakText);
-//	        	else if(actionNameString.equals("sendTextMessage"))
-//	        		newAction.setAction(Action_Enum.sendTextMessage);
-//	        	else if(actionNameString.equals("playMusic"))
-//	        		newAction.setAction(Action_Enum.playMusic);
-//				else if(actionNameString.equals("setScreenBrightness"))
-//					newAction.setAction(Action_Enum.setScreenBrightness);
+
 				else
 					newAction.setAction(Action_Enum.valueOf(actionNameString));
             }
@@ -1225,22 +1158,6 @@ public class XmlFileInterface
 	            		}
             		}
             	}
-            	else if(newAction.getAction().equals(Action_Enum.startOtherActivity))	// read old entries where parameter1 was not in use, yet to distinguish between call by activity and call by action
-				{
-					String[] contents = tag.split(";");
-
-					if(contents.length == 1)
-						newAction.setParameter1(false);
-					else if(contents.length == 2)
-					{
-						if(contents[1].contains("/"))
-							newAction.setParameter1(false);
-						else
-							newAction.setParameter1(true);
-					}
-
-					newAction.setParameter2(tag);
-				}
             	else
             		newAction.setParameter2(tag);
             }
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3ac1f289..68bc0c07 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -63,4 +63,59 @@
     <string name="showOnMap">Monstrar en una mapa</string>
     <string name="headphoneAny">Igual</string>
     <string name="sunday">Domingo</string>
+    <string name="pleaseEnterValidLatitude">Por favor inserte un grado de latitud válido.</string>
+    <string name="pleaseEnterValidLongitude">Por favor inserte un grade de longitud válido.</string>
+    <string name="pleaseEnterValidRadius">Por favor inserte un radio válido.</string>
+    <string name="selectOneDay">Por favor selectar al menos un dia.</string>
+    <string name="logAttemptingToBindToService">Intentando de connectar al servicio...</string>
+    <string name="logAttemptingToUnbindFromService">Intentando de disconnectar del servicio...</string>
+    <string name="logBoundToService">Connectado al servicio.</string>
+    <string name="logUnboundFromService">Separado del servicio.</string>
+    <string name="whatToDoWithRule">Hacer que con la regla?</string>
+    <string name="whatToDoWithPoi">Hacer que con el lugar?</string>
+    <string name="whatToDoWithProfile">Hacer que con el perfil?</string>
+    <string name="delete">borrar</string>
+    <string name="deleteCapital">Borrar</string>
+    <string name="serviceStopped">Servicio automation terminado.</string>
+    <string name="logServiceStopping">Terminando servicio.</string>
+    <string name="stillGettingPosition">Todavia buscando posición</string>
+    <string name="lastRule">Ultima regla:</string>
+    <string name="at">al</string>
+    <string name="service">Servicio:</string>
+    <string name="getCurrentPosition">Buscar positión actual</string>
+    <string name="savePoi">Guardar lugar</string>
+    <string name="deletePoi">Borrar posición</string>
+    <string name="latitude">Latitud</string>
+    <string name="longitude">Longitud</string>
+    <string name="ruleName">Nombre de regla</string>
+    <string name="triggers">Disparador(es)</string>
+    <string name="triggersComment">y-connectado (todo tienen que applicar al mismo tiempo)</string>
+    <string name="addTrigger">Añadir disparador</string>
+    <string name="actions">Acción(es)</string>
+    <string name="actionsComment">(ejecutado in esta orden)</string>
+    <string name="addAction">Añadir acción</string>
+    <string name="saveRule">Guardar regla</string>
+    <string name="start">Inicio</string>
+    <string name="end">Final</string>
+    <string name="save">Guardar</string>
+    <string name="urlToTrigger">URL para ejecutar</string>
+    <string name="wifi">wifi</string>
+    <string name="activating">Estoy activando</string>
+    <string name="deactivating">Estoy desctivando</string>
+    <string name="entering">Entrando</string>
+    <string name="leaving">saliendo</string>
+    <string name="noPoisSpecified">Al primer tienes que crear lugares.</string>
+    <string name="selectPoi">Seleccionar lugar</string>
+    <string name="selectTypeOfAction">Selecte tipo the acción</string>
+    <string name="connected">connectado</string>
+    <string name="stopped">terminado</string>
+    <string name="started">Commencado</string>
+    <string name="disconnected">separado</string>
+    <string name="selectSoundProfile">Selecte perfil de sonido</string>
+    <string name="whatToDoWithTrigger">Hacer que con el disparador?</string>
+    <string name="whatToDoWithAction">Hacer que con la acción?</string>
+    <string name="radiusHasToBePositive">Radio tiene que ser un numero positivo.</string>
+    <string name="poiStillReferenced">Todavia hay reglas cuales usan este lugar (%1$s). No puedo borrar el.</string>
+    <string name="generalSettings">Reglajes generales.</string>
+    <string name="startAtSystemBoot">Inicializar al boot.</string>
 </resources>
\ No newline at end of file