Merge remote-tracking branch 'origin/development-stable' into development

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

@@ -353,6 +353,7 @@ public class ActivityControlCenter extends Activity
         systemInfoText.append("Device details" + Miscellaneous.lineSeparator);
         systemInfoText.append("OS version: " + System.getProperty("os.version") + Miscellaneous.lineSeparator);
         systemInfoText.append("API Level: " + android.os.Build.VERSION.SDK + Miscellaneous.lineSeparator);
+        systemInfoText.append("Target SDK: " + Miscellaneous.getAnyContext().getApplicationInfo().targetSdkVersion + Miscellaneous.lineSeparator);
         systemInfoText.append("Device: " + android.os.Build.DEVICE + Miscellaneous.lineSeparator);
         systemInfoText.append("Model: " + android.os.Build.MODEL + Miscellaneous.lineSeparator);
         systemInfoText.append("Product: " + android.os.Build.PRODUCT + Miscellaneous.lineSeparator);

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

@@ -1384,8 +1384,18 @@ public class ActivityManageRule extends Activity
 		{
 			if(resultCode == RESULT_OK)
 			{
-				newTrigger = ActivityManageTriggerNotification.resultingTrigger;
+				Trigger editedTrigger = new Trigger();
-				newTrigger.setParentRule(ruleToEdit);
+				editedTrigger.setTriggerType(Trigger_Enum.notification);
+				editedTrigger.setTriggerParameter(data.getBooleanExtra(ActivityManageTriggerNotification.intentNameNotificationDirection, false));
+				editedTrigger.setTriggerParameter2(
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationApp) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTitleDir) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTitle) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationTextDir) + Trigger.triggerParameter2Split +
+						data.getStringExtra(ActivityManageTriggerNotification.intentNameNotificationText)
+				);
+				editedTrigger.setParentRule(ruleToEdit);
+				ruleToEdit.getTriggerSet().set(editIndex, editedTrigger);
 				this.refreshTriggerList();
 			}
 		}
@@ -1846,7 +1856,7 @@ public class ActivityManageRule extends Activity
 						newAction.setAction(Action_Enum.setWifi);
 						getActionParameter1Dialog(ActivityManageRule.this).show();
 
-						if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+						if(context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.Q)
 							Miscellaneous.messageBox(context.getResources().getString(R.string.app_name), context.getResources().getString(R.string.android10WifiToggleNotice), context).show();
 					}
 					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setBluetooth.toString()))

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

@@ -322,23 +322,14 @@ public class ActivityManageTriggerNotification extends Activity
 				String textDir = Trigger.getMatchCode(spinnerTextDirection.getSelectedItem().toString());
 				String text = etNotificationText.getText().toString();
 
-				if(edit)
+				Intent data = new Intent();
-				{
+				data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
-					editedNotificationTrigger.setTriggerParameter(chkNotificationDirection.isChecked());
+				data.putExtra(intentNameNotificationApp, app);
-					editedNotificationTrigger.setTriggerParameter2(app + triggerParameter2Split + titleDir + triggerParameter2Split + title + triggerParameter2Split + textDir + triggerParameter2Split + text);
+				data.putExtra(intentNameNotificationTitleDir, titleDir);
-					ActivityManageTriggerNotification.this.setResult(RESULT_OK);
+				data.putExtra(intentNameNotificationTitle, title);
-				}
+				data.putExtra(intentNameNotificationTextDir, textDir);
-				else
+				data.putExtra(intentNameNotificationText, text);
-				{
+				ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
-					Intent data = new Intent();
-					data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
-					data.putExtra(intentNameNotificationApp, app);
-					data.putExtra(intentNameNotificationTitleDir, titleDir);
-					data.putExtra(intentNameNotificationTitle, title);
-					data.putExtra(intentNameNotificationTextDir, textDir);
-					data.putExtra(intentNameNotificationText, text);
-					ActivityManageTriggerNotification.this.setResult(RESULT_OK, data);
-				}
 
 				finish();
 			}

fastlane/metadata/android/en-US/changelogs/120.txt

@@ -1,5 +1,7 @@
 * New trigger: device has just started
 * New trigger: service has just started
-* New parameter for trigger Screen state: New state "locked"
 * New trigger: Respond to customizable broadcasts
-* New action: Send broadcasts
+* New parameter for trigger Screen state: New state "locked"
+* New action: Send broadcasts
+* Fixed: Crash when editing notification trigger
+* Fixed: TimeFrame trigger - time may have changed when crossing timezones