diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
index ade18b66..3020049e 100644
--- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
+++ b/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:
diff --git a/app/src/main/java/com/jens/automation2/AutomationService.java b/app/src/main/java/com/jens/automation2/AutomationService.java
index ed8fd32f..98f31063 100644
--- a/app/src/main/java/com/jens/automation2/AutomationService.java
+++ b/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)
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 bf28b07f..7f41dcf6 100644
--- a/app/src/main/java/com/jens/automation2/receivers/ScreenStateReceiver.java
+++ b/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);
+ }
-// 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 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())
+ {
+ }
+
+// 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();
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e9a4ce7b..d4f913a0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -127,10 +127,10 @@
desactivar enrutador wifi
encender modo de vuelo
desactivar modo de vuelo
- sitio activo
+ Sitio activo:
sitio mas cerca
Posición
- posiciónes
+ Posiciones
Servicio no está activo
General
Encender servicio después de un update si estuvo activado.
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/5.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/5.png
new file mode 100644
index 00000000..c924570a
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/6.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/6.png
new file mode 100644
index 00000000..3060851e
Binary files /dev/null and b/fastlane/metadata/android/de-DE/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
new file mode 100644
index 00000000..30678451
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
new file mode 100644
index 00000000..2f826e20
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/es-ES/images/1.png b/fastlane/metadata/android/es-ES/images/1.png
new file mode 100644
index 00000000..70325741
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/1.png differ
diff --git a/fastlane/metadata/android/es-ES/images/2.png b/fastlane/metadata/android/es-ES/images/2.png
new file mode 100644
index 00000000..a263486d
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/2.png differ
diff --git a/fastlane/metadata/android/es-ES/images/3.png b/fastlane/metadata/android/es-ES/images/3.png
new file mode 100644
index 00000000..62c96ebd
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/3.png differ
diff --git a/fastlane/metadata/android/es-ES/images/4.png b/fastlane/metadata/android/es-ES/images/4.png
new file mode 100644
index 00000000..56b743ab
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/4.png differ
diff --git a/fastlane/metadata/android/es-ES/images/5.png b/fastlane/metadata/android/es-ES/images/5.png
new file mode 100644
index 00000000..bf8968cb
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/5.png differ
diff --git a/fastlane/metadata/android/es-ES/images/6.png b/fastlane/metadata/android/es-ES/images/6.png
new file mode 100644
index 00000000..e4e6530c
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/6.png differ
diff --git a/fastlane/metadata/android/es-ES/images/7.png b/fastlane/metadata/android/es-ES/images/7.png
new file mode 100644
index 00000000..84092e44
Binary files /dev/null and b/fastlane/metadata/android/es-ES/images/7.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/5.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/5.png
new file mode 100644
index 00000000..d4e8064f
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/it-IT/images/phoneScreenshots/6.png b/fastlane/metadata/android/it-IT/images/phoneScreenshots/6.png
new file mode 100644
index 00000000..ce5a01b2
Binary files /dev/null and b/fastlane/metadata/android/it-IT/images/phoneScreenshots/6.png differ