From f97bfbb732642f7a32011c8d51f7c48e42c20bfc Mon Sep 17 00:00:00 2001
From: Jens <kLv61m3x>
Date: Thu, 21 Jul 2022 23:05:51 +0200
Subject: [PATCH] close notification with button

---
 ...ActivityManageActionCloseNotification.java | 58 ++++++++++++++-----
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java
index 6c56d270..3e2eaf6a 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java
@@ -21,6 +21,7 @@ import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -49,6 +50,8 @@ public class ActivityManageActionCloseNotification extends Activity
 	
 	private static List<PackageInfo> pInfos = null;
 
+	final static String dismissRegularString = "p0815DismissString";
+
 	private static String[] directions;
 
 	ArrayAdapter<String> directionSpinnerAdapter;
@@ -269,7 +272,6 @@ public class ActivityManageActionCloseNotification extends Activity
 		rbNotificationDismissSimple = (RadioButton)findViewById(R.id.rbNotificationDismissSimple);
 		rbNotificationDismissButton = (RadioButton)findViewById(R.id.rbNotificationDismissButton);
 
-
 		directions = new String[] {
 									getResources().getString(R.string.directionStringEquals),
 									getResources().getString(R.string.directionStringContains),
@@ -301,7 +303,7 @@ public class ActivityManageActionCloseNotification extends Activity
 			public void onClick(View v)
 			{
 				String app;
-				if(tvSelectedApplication.getText().toString().equalsIgnoreCase(getResources().getString(R.string.anyApp)))
+				if (tvSelectedApplication.getText().toString().equalsIgnoreCase(getResources().getString(R.string.anyApp)))
 					app = Trigger.anyAppString;
 				else
 					app = tvSelectedApplication.getText().toString();
@@ -312,29 +314,38 @@ public class ActivityManageActionCloseNotification extends Activity
 				String text = etNotificationText.getText().toString();
 
 				Intent responseData = new Intent();
-				if(edit)
-				{
-//					editedNotificationAction.setTriggerParameter(chkNotificationDirection.isChecked());
-					responseData.putExtra(ActivityManageRule.intentNameActionParameter2, app + Action.actionParameter2Split + titleDir + Action.actionParameter2Split + title + Action.actionParameter2Split + textDir + Action.actionParameter2Split + text);
-					ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
-				}
+//				if(edit)
+//				{
+//					responseData.putExtra(ActivityManageRule.intentNameActionParameter2, app + Action.actionParameter2Split + titleDir + Action.actionParameter2Split + title + Action.actionParameter2Split + textDir + Action.actionParameter2Split + text);
+//					ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
+//				}
+//				else
+//				{
+
+				String dismissMethod;
+				if (rbNotificationDismissSimple.isChecked())
+					dismissMethod = dismissRegularString;
 				else
 				{
-//					data.putExtra(intentNameNotificationDirection, chkNotificationDirection.isChecked());
+					if(StringUtils.isEmpty(etNotificationDismissalButtonText.getText().toString()))
+					{
+						Toast.makeText(ActivityManageActionCloseNotification.this, getResources().getString(R.string.enterText), Toast.LENGTH_LONG).show();
+						return;
+					}
+					else
+						dismissMethod = etNotificationDismissalButtonText.getText().toString();
+				}
+
 					responseData.putExtra(ActivityManageRule.intentNameActionParameter2,
 													app + Action.actionParameter2Split +
 													titleDir + Action.actionParameter2Split +
 													title + Action.actionParameter2Split +
 													textDir + Action.actionParameter2Split +
-													text
+													text + Action.actionParameter2Split +
+													dismissMethod
 													);
-//					data.putExtra(intentNameNotificationApp, app);
-//					data.putExtra(intentNameNotificationTitleDir, titleDir);
-//					data.putExtra(intentNameNotificationTitle, title);
-//					data.putExtra(intentNameNotificationTextDir, textDir);
-//					data.putExtra(intentNameNotificationText, text);
 					ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
-				}
+//				}
 
 				finish();
 			}
@@ -371,6 +382,21 @@ public class ActivityManageActionCloseNotification extends Activity
 		else
 			text = "";
 
+		/*
+			That's not reliable, yet. Last parameter may be empty, hence the method might
+			be incorrectly interpreted as a text notification text.
+		 */
+
+		if (params.length >= 6)
+		{
+			rbNotificationDismissButton.setChecked(true);
+			etNotificationDismissalButtonText.setText(params[5]);
+		}
+		else
+		{
+			rbNotificationDismissSimple.setChecked(true);
+		}
+
 		if(!app.equals(Trigger.anyAppString))
 			tvSelectedApplication.setText(app);