diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java index 2144393..2bc7a20 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java @@ -46,8 +46,8 @@ public class ActivityManageTriggerTimeFrame extends Activity setContentView(R.layout.activity_manage_trigger_timeframe); - if(Build.VERSION.SDK_INT == 34) - Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.Android14TimePickerHint), ActivityManageTriggerTimeFrame.this).show(); +// if(Build.VERSION.SDK_INT == 34) +// Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.Android14TimePickerHint), ActivityManageTriggerTimeFrame.this).show(); startPicker = (TimePicker)findViewById(R.id.tpTimeFrameStart); stopPicker = (TimePicker)findViewById(R.id.tpTimeFrameStop); diff --git a/app/src/main/java/com/jens/automation2/Trigger.java b/app/src/main/java/com/jens/automation2/Trigger.java index 1b518eb..c4cbc73 100644 --- a/app/src/main/java/com/jens/automation2/Trigger.java +++ b/app/src/main/java/com/jens/automation2/Trigger.java @@ -679,13 +679,11 @@ public class Trigger { if(Miscellaneous.isRegularExpression(conditions[1])) { - if (map.get(conditions[0]).matches(conditions[1])) - return this.getTriggerParameter(); + return (map.get(conditions[0]).matches(conditions[1]) == this.getTriggerParameter()); } else { - if (map.get(conditions[0]).equals(conditions[1])) - return this.getTriggerParameter(); + return (map.get(conditions[0]).equals(conditions[1]) == this.getTriggerParameter()); } } } diff --git a/fastlane/metadata/android/en-US/changelogs/145.txt b/fastlane/metadata/android/en-US/changelogs/145.txt index ce8a75b..9f9b45d 100644 --- a/fastlane/metadata/android/en-US/changelogs/145.txt +++ b/fastlane/metadata/android/en-US/changelogs/145.txt @@ -5,5 +5,6 @@ * Fixed: Permission BLUETOOTH_CONNECT requested for Bluetooth trigger editor in Google Play version * Fixed: Airplane mode trigger didn't work if no locations where defined. * Fixed: Vibrate action didn't work on some devices +* Fixed: Variable trigger didn't always compare correctly. * Fixed: Permission check for ability to schedule exact timers * Added Possibility to select UI theme, hence enabling modern UI designs \ No newline at end of file