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

close notification with button

Browse Source
This commit is contained in:
Jens 2022-07-21 23:05:51 +02:00
parent 937c6ffe1d
commit f97bfbb732
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java
View File

@ -21,6 +21,7 @@ import android.widget.EditText;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -49,6 +50,8 @@ public class ActivityManageActionCloseNotification extends Activity
private static List<PackageInfo> pInfos = null; private static List<PackageInfo> pInfos = null;
final static String dismissRegularString = "p0815DismissString";
private static String[] directions; private static String[] directions;
ArrayAdapter<String> directionSpinnerAdapter; ArrayAdapter<String> directionSpinnerAdapter;
@ -269,7 +272,6 @@ public class ActivityManageActionCloseNotification extends Activity
rbNotificationDismissSimple = (RadioButton)findViewById(R.id.rbNotificationDismissSimple); rbNotificationDismissSimple = (RadioButton)findViewById(R.id.rbNotificationDismissSimple);
rbNotificationDismissButton = (RadioButton)findViewById(R.id.rbNotificationDismissButton); rbNotificationDismissButton = (RadioButton)findViewById(R.id.rbNotificationDismissButton);
directions = new String[] { directions = new String[] {
getResources().getString(R.string.directionStringEquals), getResources().getString(R.string.directionStringEquals),
getResources().getString(R.string.directionStringContains), getResources().getString(R.string.directionStringContains),
@ -312,29 +314,38 @@ public class ActivityManageActionCloseNotification extends Activity
String text = etNotificationText.getText().toString(); String text = etNotificationText.getText().toString();
Intent responseData = new Intent(); Intent responseData = new Intent();
if(edit) // if(edit)
{ // {
// editedNotificationAction.setTriggerParameter(chkNotificationDirection.isChecked()); // responseData.putExtra(ActivityManageRule.intentNameActionParameter2, app + Action.actionParameter2Split + titleDir + Action.actionParameter2Split + title + Action.actionParameter2Split + textDir + Action.actionParameter2Split + text);
responseData.putExtra(ActivityManageRule.intentNameActionParameter2, app + Action.actionParameter2Split + titleDir + Action.actionParameter2Split + title + Action.actionParameter2Split + textDir + Action.actionParameter2Split + text); // ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData); // }
} // else
// {
String dismissMethod;
if (rbNotificationDismissSimple.isChecked())
dismissMethod = dismissRegularString;
else 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, responseData.putExtra(ActivityManageRule.intentNameActionParameter2,
app + Action.actionParameter2Split + app + Action.actionParameter2Split +
titleDir + Action.actionParameter2Split + titleDir + Action.actionParameter2Split +
title + Action.actionParameter2Split + title + Action.actionParameter2Split +
textDir + 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); ActivityManageActionCloseNotification.this.setResult(RESULT_OK, responseData);
} // }
finish(); finish();
} }
@ -371,6 +382,21 @@ public class ActivityManageActionCloseNotification extends Activity
else else
text = ""; 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)) if(!app.equals(Trigger.anyAppString))
tvSelectedApplication.setText(app); tvSelectedApplication.setText(app);