From 2361c758c9e8899be9885ba3f9e5ad3c1abfab58 Mon Sep 17 00:00:00 2001 From: jens Date: Mon, 6 Jun 2022 20:06:11 +0200 Subject: [PATCH] store descriptions --- .../java/com/jens/automation2/Actions.java | 11 +++++- .../ActivityManageActionSendBroadcast.java | 34 ++++++++++++------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java index 243ccb1f..4375ff49 100644 --- a/app/src/main/java/com/jens/automation2/Actions.java +++ b/app/src/main/java/com/jens/automation2/Actions.java @@ -197,7 +197,16 @@ public class Actions { Miscellaneous.logEvent("i", "sendBroadcast", "Sending broadcast with action " + action, 5); Intent broadcastIntent = new Intent(); - broadcastIntent.setAction(action); + + if(action.contains(Action.actionParameter2Split)) + { + String[] parts = action.split(Action.actionParameter2Split); + broadcastIntent.setAction(parts[0]); + add params + } + else + broadcastIntent.setAction(action); + context.sendBroadcast(broadcastIntent); } diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java index b5abee78..16b4c8c9 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java @@ -51,6 +51,7 @@ public class ActivityManageActionSendBroadcast extends Activity intentTypeSpinnerAdapter = new ArrayAdapter(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionSendBroadcast.supportedIntentTypes); spinnerParameterType.setAdapter(intentTypeSpinnerAdapter); intentTypeSpinnerAdapter.notifyDataSetChanged(); + intentPairAdapter = new ArrayAdapter(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList); bSaveSendBroadcast.setOnClickListener(new View.OnClickListener() { @@ -61,7 +62,19 @@ public class ActivityManageActionSendBroadcast extends Activity { Intent answer = new Intent(); - answer.putExtra(ActivityManageRule.intentNameActionParameter2, etBroadcastToSend.getText().toString()); + String param2 = etBroadcastToSend.getText().toString(); + + if(intentPairList.size() > 0) + { + param2 += Action.actionParameter2Split; + + for (String s : intentPairList) + param2 += s + ";"; + + param2 = param2.substring(0, param2.length() - 1); + } + + answer.putExtra(ActivityManageRule.intentNameActionParameter2, param2); setResult(RESULT_OK, answer); finish(); } @@ -101,20 +114,17 @@ public class ActivityManageActionSendBroadcast extends Activity String[] params = param2Parts[1].split(";"); - if(startIndex > -1 && params.length > startIndex) + intentPairList.clear(); + + for(int i = 0; i < params.length; i++) { - intentPairList.clear(); + if(lvIntentPairs.getVisibility() != View.VISIBLE) + lvIntentPairs.setVisibility(View.VISIBLE); - for(int i=startIndex; i