jens/Automation
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'development' of https://git.server47.de/jens/Automation into development

Browse Source 
# Conflicts:
#	fastlane/metadata/android/en-US/changelogs/145.txt
This commit is contained in:
jens
2025-12-06 18:00:53 +01:00
parent 4478006109 d117484143
commit bbb477fc77
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/jens/automation2/ActivityManageTriggerTimeFrame.java
View File

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

6
app/src/main/java/com/jens/automation2/Trigger.java
View File

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