language updates and screen locked trigger

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

@@ -357,7 +357,9 @@ public class ActivityControlCenter extends Activity
         systemInfoText.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
         systemInfoText.append("Product: " + android.os.Build.PRODUCT + Miscellaneous.lineSeparator);
         systemInfoText.append("Country: " + Miscellaneous.getUserCountry(Miscellaneous.getAnyContext()) + Miscellaneous.lineSeparator);
-        systemInfoText.append("OS language: " + Locale.getDefault().getDisplayName());
+        systemInfoText.append("OS language: " + Locale.getDefault().getDisplayName() + Miscellaneous.lineSeparator);
+        systemInfoText.append("Logfile written: " + String.valueOf(Settings.writeLogFile) + Miscellaneous.lineSeparator);
+        systemInfoText.append("Log level: " + String.valueOf(Settings.logLevel));
 
         /*
             I've checked the Locale methods on my Android 4.1.2 device, and the results:

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

@@ -562,11 +562,11 @@ public class AutomationService extends Service implements OnInitListener
 					if(activePoi == null)
 					{
 						PointOfInterest closestPoi = PointOfInterest.getClosestPOI(instance.getLocationProvider().getCurrentLocation());
-						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + AutomationService.getInstance().getResources().getString(R.string.none) + "\n" + AutomationService.getInstance().getResources().getString(R.string.closestPoi) + ": " + closestPoi.getName() + lastRuleString;
+						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + " " + AutomationService.getInstance().getResources().getString(R.string.none) + "\n" + AutomationService.getInstance().getResources().getString(R.string.closestPoi) + ": " + closestPoi.getName() + lastRuleString;
 					}
 					else
 					{
-						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + ": " + activePoi.getName() + lastRuleString;
+						bodyText = AutomationService.getInstance().getResources().getString(R.string.activePoi) + " " + activePoi.getName() + lastRuleString;
 					}
 				}
 				catch(NullPointerException e)

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

@@ -12,6 +12,8 @@ import android.os.PowerManager;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.RequiresApi;
+
 import com.jens.automation2.ActivityPermissions;
 import com.jens.automation2.AutomationService;
 import com.jens.automation2.Miscellaneous;
@@ -95,6 +97,7 @@ public class ScreenStateReceiver extends BroadcastReceiver implements Automation
 		return currentChargingState;
 	}
 
+	@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
 	@Override
 	public void onReceive(Context context, Intent intent)
 	{
@@ -111,18 +114,28 @@ public class ScreenStateReceiver extends BroadcastReceiver implements Automation
 			{
 				ScreenStateReceiver.screenState = 0;
 
-//				if(LockScreenHelper.isScreenUnlocked(context))
-//					;
+//				Method 1
+				Miscellaneous.logEvent("i", "ScreenStateReceiver", "Method 1: " + String.valueOf(LockScreenHelper.isScreenUnlocked(context)), 4);
+				if(!LockScreenHelper.isScreenUnlocked(context))
+				{
+					Intent lockedBroadcastIntent = new Intent();
+					lockedBroadcastIntent.setAction(broadcastScreenLocked);
+					context.sendBroadcast(lockedBroadcastIntent);
+				}
+
+//				Method 2
+				PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+				KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
+				Miscellaneous.logEvent("i", "ScreenStateReceiver", "Method 2: " + String.valueOf(pm.isInteractive() && pm.isScreenOn() && keyguardManager.isKeyguardLocked() && keyguardManager.isDeviceLocked()), 4);
+				if (pm.isInteractive() && pm.isScreenOn() && keyguardManager.isKeyguardLocked() && keyguardManager.isDeviceLocked())
+				{
 
-//				PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-//				KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-//				if (pm.isInteractive() && pm.isScreenOn() && keyguardManager.isKeyguardLocked() && keyguardManager.isDeviceLocked())
-//				{
-//					//do your stuff
-//				}
+				}
 
+//				Method 3
 				KeyguardManager kgMgr = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
 				boolean unlocked = kgMgr.inKeyguardRestrictedInputMode();
+				Miscellaneous.logEvent("i", "ScreenStateReceiver", "Method 3: " + String.valueOf(kgMgr.inKeyguardRestrictedInputMode()), 4);
 				if(!unlocked)
 				{
 					Intent lockedBroadcastIntent = new Intent();

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

@@ -127,10 +127,10 @@
     <string name="actionTurnWifiTetheringOff">desactivar enrutador wifi</string>
     <string name="actionTurnAirplaneModeOn">encender modo de vuelo</string>
     <string name="actionTurnAirplaneModeOff">desactivar modo de vuelo</string>
-    <string name="activePoi">sitio activo</string>
+    <string name="activePoi">Sitio activo:</string>
     <string name="closestPoi">sitio mas cerca</string>
     <string name="poi">Posición</string>
-    <string name="pois">posiciónes</string>
+    <string name="pois">Posiciones</string>
     <string name="serviceNotRunning">Servicio no está activo</string>
     <string name="general">General</string>
     <string name="startServiceAfterAppUpdate">Encender servicio después de un update si estuvo activado.</string>