From 0d3a13e753dff9539b9318f3b56cdf47fa516947 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Sun, 3 Apr 2022 16:20:20 +0200
Subject: [PATCH] fix in DateTimeTrigger management and executions when service
 already stopped

---
 .../com/jens/automation2/ActivityControlCenter.java   |  4 ++++
 .../java/com/jens/automation2/ActivityManagePoi.java  |  1 -
 .../jens/automation2/receivers/DateTimeListener.java  | 11 +----------
 .../main/res/layout/activity_manage_specific_poi.xml  |  4 ++--
 fastlane/metadata/android/en-US/changelogs/119.txt    |  3 +++
 5 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/119.txt

diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
index 04cb1c3..393e2e8 100644
--- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
+++ b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
@@ -222,6 +222,10 @@ public class ActivityControlCenter extends Activity
                     }
 
                     Settings.readFromPersistentStorage(ActivityControlCenter.this);
+
+                    AutomationService service = AutomationService.getInstance();
+                    if(service != null)
+                        service.applySettingsAndRules();
                 }
                 else
                     Toast.makeText(ActivityControlCenter.this, getResources().getString(R.string.noFilesImported), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java
index 5f071f7..990465f 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java
@@ -34,7 +34,6 @@ public class ActivityManagePoi extends Activity
 	public LocationManager myLocationManager;
 	MyLocationListenerGps myLocationListenerGps = new MyLocationListenerGps();
 	Location locationGps = null, locationNetwork = null;
-//	Location locationWifi = null;
 	MyLocationListenerNetwork myLocationListenerNetwork = new MyLocationListenerNetwork();
 	Button bGetPosition, bSavePoi;
 	ImageButton ibShowOnMap;
diff --git a/app/src/main/java/com/jens/automation2/receivers/DateTimeListener.java b/app/src/main/java/com/jens/automation2/receivers/DateTimeListener.java
index 5eb2f06..1fa1491 100644
--- a/app/src/main/java/com/jens/automation2/receivers/DateTimeListener.java
+++ b/app/src/main/java/com/jens/automation2/receivers/DateTimeListener.java
@@ -50,12 +50,8 @@ public class DateTimeListener extends BroadcastReceiver implements AutomationLis
 	public void onReceive(Context context, Intent intent)
 	{
 		Miscellaneous.logEvent("i", "AlarmListener", "Alarm received", 2);
-		Date now = new Date();
-		String timeString = String.valueOf(now.getHours()) + ":" + String.valueOf(now.getMinutes()) + ":" + String.valueOf(now.getSeconds());
-		Time passTime = Time.valueOf(timeString);
 
 		ArrayList<Rule> allRulesWithNowInTimeFrame = Rule.findRuleCandidates(Trigger_Enum.timeFrame);
-//		ArrayList<Rule> allRulesWithNowInTimeFrame = Rule.findRuleCandidatesByTime(passTime);
 		for(int i=0; i<allRulesWithNowInTimeFrame.size(); i++)
 		{
 			if(allRulesWithNowInTimeFrame.get(i).getsGreenLight(context))
@@ -385,8 +381,6 @@ public class DateTimeListener extends BroadcastReceiver implements AutomationLis
 			calSet.set(Calendar.SECOND, 0);
 			calSet.set(Calendar.MILLISECOND, 0);
 
-//				if(this.applies(null))
-//				{
 			// If the starting time is a day ahead remove 1 day.
 			if(calSet.getTimeInMillis() > now.getTimeInMillis())
 				calSet.add(Calendar.DAY_OF_MONTH, -1);
@@ -401,11 +395,8 @@ public class DateTimeListener extends BroadcastReceiver implements AutomationLis
 			 * Das war mal aktiviert. Allerdings: Die ganze Funktion liefert zurück, wenn die Regel NOCH nicht
 			 * zutrifft, aber wir z.B. gleich den zeitlichen Bereich betreten.
 			 */
-//					if(trigger.checkDateTime(calSchedule.getTime(), false))
-//					{
+
 			return calSchedule;
-//					}
-//				}
 		}
 		else
 			Miscellaneous.logEvent("i", "DateTimeListener", "Trigger " + trigger.toString() + " is not executed repeatedly.", 5);
diff --git a/app/src/main/res/layout/activity_manage_specific_poi.xml b/app/src/main/res/layout/activity_manage_specific_poi.xml
index c13d41c..12677cc 100644
--- a/app/src/main/res/layout/activity_manage_specific_poi.xml
+++ b/app/src/main/res/layout/activity_manage_specific_poi.xml
@@ -57,7 +57,7 @@
                 		android:layout_width="wrap_content"
 			            android:layout_height="wrap_content"
 			            android:ems="10"
-			            android:inputType="numberSigned" />
+			            android:inputType="text" />
 			        
 			    </TableRow>
 			
@@ -78,7 +78,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:ems="10"
-						android:inputType="numberSigned" />
+						android:inputType="text" />
 				</TableRow>
 			    
 				<TableRow
diff --git a/fastlane/metadata/android/en-US/changelogs/119.txt b/fastlane/metadata/android/en-US/changelogs/119.txt
new file mode 100644
index 0000000..8463367
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/119.txt
@@ -0,0 +1,3 @@
+* Fixed: Management of DateTimeTrigger was sometimes releaded incorrectly while service was running
+* Fixed: DateTimeTrigger: Repeated executions sometimes not working
+* Fixed: DateTimeTrigger: Repeated executions continued to run after service was stopped
\ No newline at end of file