From 7167f0c03d2381cc67d120b52429970767f8e450 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Sun, 29 May 2022 20:14:50 +0200
Subject: [PATCH 01/10] run executable

---
 app/src/apkFlavor/AndroidManifest.xml         |   1 +
 app/src/fdroidFlavor/AndroidManifest.xml      |   1 +
 app/src/googlePlayFlavor/AndroidManifest.xml  |   1 +
 .../java/com/jens/automation2/Action.java     |   9 ++
 .../java/com/jens/automation2/Actions.java    |   5 +
 .../ActivityManageActionRunExecutable.java    | 114 ++++++++++++++++++
 .../ActivityManageActionSpeakText.java        |   4 +-
 .../ActivityManageActionTriggerUrl.java       |   2 +-
 .../jens/automation2/ActivityManageRule.java  |  42 +++++++
 app/src/main/res/drawable/script.png          | Bin 0 -> 679 bytes
 .../activity_manage_action_run_executable.xml | 112 +++++++++++++++++
 .../activity_manage_action_speak_text.xml     |  13 +-
 .../activity_manage_action_trigger_url.xml    |   2 +-
 app/src/main/res/values/strings.xml           |   7 ++
 14 files changed, 306 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
 create mode 100644 app/src/main/res/drawable/script.png
 create mode 100644 app/src/main/res/layout/activity_manage_action_run_executable.xml

diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml
index 6bca09c5..e4464193 100644
--- a/app/src/apkFlavor/AndroidManifest.xml
+++ b/app/src/apkFlavor/AndroidManifest.xml
@@ -166,6 +166,7 @@
         <activity android:name=".ActivityManageActionVibrate" />
         <activity android:name=".ActivityManageActionControlMedia" />
         <activity android:name=".ActivityManageActionSendBroadcast" />
+        <activity android:name=".ActivityManageActionRunExecutable" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml
index 77a006c8..8236850a 100644
--- a/app/src/fdroidFlavor/AndroidManifest.xml
+++ b/app/src/fdroidFlavor/AndroidManifest.xml
@@ -164,6 +164,7 @@
         <activity android:name=".ActivityManageActionVibrate" />
         <activity android:name=".ActivityManageActionControlMedia" />
         <activity android:name=".ActivityManageActionSendBroadcast" />
+        <activity android:name=".ActivityManageActionRunExecutable" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml
index 5d60ad4a..aa4c5766 100644
--- a/app/src/googlePlayFlavor/AndroidManifest.xml
+++ b/app/src/googlePlayFlavor/AndroidManifest.xml
@@ -151,6 +151,7 @@
         <activity android:name=".ActivityManageActionVibrate" />
         <activity android:name=".ActivityManageActionControlMedia" />
         <activity android:name=".ActivityManageActionSendBroadcast" />
+        <activity android:name=".ActivityManageActionRunExecutable" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/main/java/com/jens/automation2/Action.java b/app/src/main/java/com/jens/automation2/Action.java
index bb597f6d..c75796f9 100644
--- a/app/src/main/java/com/jens/automation2/Action.java
+++ b/app/src/main/java/com/jens/automation2/Action.java
@@ -52,6 +52,7 @@ public class Action
 		createNotification,
 		closeNotification,
 		sendBroadcast,
+		runExecutable,
 		sendTextMessage;
 
 		public String getFullName(Context context)
@@ -124,6 +125,8 @@ public class Action
 					return context.getResources().getString(R.string.closeNotifications);
 				case sendBroadcast:
 					return context.getResources().getString(R.string.sendBroadcast);
+				case runExecutable:
+					return context.getResources().getString(R.string.runExecutable);
 				default:
 					return "Unknown";
 			}
@@ -267,6 +270,9 @@ public class Action
 				case sendBroadcast:
 					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.sendBroadcast));
 					break;
+				case runExecutable:
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.runExecutable));
+					break;
 				default:
 					returnString.append(action.toString());
 			}
@@ -545,6 +551,9 @@ public class Action
 				case sendBroadcast:
 					Actions.sendBroadcast(context, this.getParameter2());
 					break;
+				case runExecutable:
+					Actions.runExecutable(context, this.getParameter1(), this.getParameter2());
+					break;
 				default:
 					Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3);
 					break;
diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java
index d3c0d5f7..d113fd71 100644
--- a/app/src/main/java/com/jens/automation2/Actions.java
+++ b/app/src/main/java/com/jens/automation2/Actions.java
@@ -1907,4 +1907,9 @@ public class Actions
 			return android.provider.Settings.Global.getInt(context.getContentResolver(), android.provider.Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
 		}
 	}
+
+	public static boolean runExecutable(Context context, boolean runAsRoot, String pathAndParams)
+	{
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
new file mode 100644
index 00000000..3486691d
--- /dev/null
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
@@ -0,0 +1,114 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+
+public class ActivityManageActionRunExecutable extends Activity
+{
+    final static int PICKFILE_RESULT_CODE = 4711;
+
+    CheckBox chkRunExecAsRoot;
+    EditText etRunExecutablePath, etRunExecutableParameters;
+    Button bChooseExecutable, bSaveActionRunExec;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_run_executable);
+
+        chkRunExecAsRoot = (CheckBox)findViewById(R.id.chkRunExecAsRoot);
+        etRunExecutablePath = (EditText) findViewById(R.id.etRunExecutablePath);
+        etRunExecutableParameters = (EditText) findViewById(R.id.etRunExecutableParameters);
+        bChooseExecutable = (Button) findViewById(R.id.bChooseExecutable);
+        bSaveActionRunExec = (Button) findViewById(R.id.bSaveActionRunExec);
+
+        bChooseExecutable.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                //Need to check for storage permissions
+                Intent chooseFile = new Intent(Intent.ACTION_GET_CONTENT);
+                chooseFile.setType("*/*");
+                chooseFile = Intent.createChooser(chooseFile, getResources().getString(R.string.selectSoundFile));
+                startActivityForResult(chooseFile, PICKFILE_RESULT_CODE);
+            }
+        });
+
+        bSaveActionRunExec.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                saveExecSettings();
+            }
+        });
+    }
+
+    void saveExecSettings()
+    {
+        if(etRunExecutablePath.getText().toString() == null || etRunExecutablePath.getText().toString().length() == 0)
+        {
+            Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.selectValidExecutable), Toast.LENGTH_LONG).show();
+            return;
+        }
+        else
+        {
+            File executableFile = new File(etRunExecutablePath.getText().toString());
+            if(!executableFile.exists())
+            {
+                Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.fileDoesNotExist), Toast.LENGTH_LONG).show();
+                return;
+            }
+            else
+            {
+                if(!chkRunExecAsRoot.isChecked() && !executableFile.canExecute())
+                {
+                    Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.fileNotExecutable), Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
+        }
+
+        Intent returnData = new Intent();
+        returnData.putExtra("actionParameter1", chkRunExecAsRoot.isChecked());
+
+        if(etRunExecutableParameters.getText() != null && !StringUtils.isEmpty(etRunExecutableParameters.getText().toString()))
+            returnData.putExtra("actionParameter2", etRunExecutablePath.getText().toString() + Action.actionParameter2Split + etRunExecutableParameters.getText().toString());
+        else
+            returnData.putExtra("actionParameter2", etRunExecutablePath.getText().toString());
+
+        setResult(RESULT_OK, returnData);
+        finish();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if(resultCode == RESULT_OK)
+        {
+            if(requestCode == PICKFILE_RESULT_CODE)
+            {
+                Uri fileUri = data.getData();
+                String filePath = CompensateCrappyAndroidPaths.getPath(ActivityManageActionRunExecutable.this, fileUri);
+                etRunExecutablePath.setText(filePath);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java
index cb23f2e9..f9e8bd45 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSpeakText.java
@@ -15,8 +15,6 @@ public class ActivityManageActionSpeakText extends Activity
 	private Button bSaveSpeakText;
 	private EditText etSpeakText;
 	
-//	private String existingUrl = "";
-	
 	public static boolean edit = false;
 	public static Action resultingAction = null;
 	
@@ -27,7 +25,7 @@ public class ActivityManageActionSpeakText extends Activity
 		this.setContentView(R.layout.activity_manage_action_speak_text);
 		
 		etSpeakText = (EditText)findViewById(R.id.etTextToSpeak);
-		bSaveSpeakText = (Button)findViewById(R.id.bSaveTriggerUrl);
+		bSaveSpeakText = (Button)findViewById(R.id.bSaveSpeakText);
 		bSaveSpeakText.setOnClickListener(new OnClickListener()
 		{			
 			@Override
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java b/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java
index 8a3d2bb6..9a41e210 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionTriggerUrl.java
@@ -47,7 +47,7 @@ public class ActivityManageActionTriggerUrl extends Activity
 		chkTriggerUrlUseAuthentication = (CheckBox)findViewById(R.id.chkTriggerUrlUseAuthentication);
 		lvTriggerUrlPostParameters = (ListView)findViewById(R.id.lvTriggerUrlPostParameters);
 		tlTriggerUrlAuthentication = (TableLayout)findViewById(R.id.tlTriggerUrlAuthentication);
-		bSaveTriggerUrl = (Button)findViewById(R.id.bSaveTriggerUrl);
+		bSaveTriggerUrl = (Button)findViewById(R.id.bSaveSpeakText);
 		bSaveTriggerUrl.setOnClickListener(new OnClickListener()
 		{			
 			@Override
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
index a64e6dc2..e8f55704 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
@@ -123,6 +123,8 @@ public class ActivityManageRule extends Activity
 	final static int requestCodeTriggerBroadcastReceivedEdit = 810;
 	final static int requestCodeActionSendBroadcastAdd = 811;
 	final static int requestCodeActionSendBroadcastEdit = 812;
+	final static int requestCodeActionRunExecutableAdd = 813;
+	final static int requestCodeActionRunExecutableEdit = 814;
 	
 	public static ActivityManageRule getInstance()
 	{
@@ -382,6 +384,12 @@ public class ActivityManageRule extends Activity
 						activityEditSendBroadcastIntent.putExtra(intentNameActionParameter2, a.getParameter2());
 						startActivityForResult(activityEditSendBroadcastIntent, requestCodeActionSendBroadcastEdit);
 						break;
+					case runExecutable:
+						Intent activityEditRunExecutableIntent = new Intent(ActivityManageRule.this, ActivityManageActionRunExecutable.class);
+						activityEditRunExecutableIntent.putExtra(intentNameActionParameter1, a.getParameter1());
+						activityEditRunExecutableIntent.putExtra(intentNameActionParameter2, a.getParameter2());
+						startActivityForResult(activityEditRunExecutableIntent, requestCodeActionRunExecutableEdit);
+						break;
 					case controlMediaPlayback:
 						Intent activityEditControlMediaIntent = new Intent(ActivityManageRule.this, ActivityManageActionControlMedia.class);
 						activityEditControlMediaIntent.putExtra(ActivityManageRule.intentNameActionParameter2, a.getParameter2());
@@ -1489,6 +1497,17 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionRunExecutableAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParentRule(ruleToEdit);
+				newAction.setParameter1(data.getBooleanExtra(intentNameActionParameter1, false));
+				newAction.setParameter2(data.getStringExtra(intentNameActionParameter2));
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
 		else if(requestCode == requestCodeActionControlMediaAdd)
 		{
 			if(resultCode == RESULT_OK)
@@ -1547,6 +1566,21 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionRunExecutableEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getActionSet().get(editIndex).setParentRule(ruleToEdit);
+
+				if(data.hasExtra(intentNameActionParameter1) && data.hasExtra(intentNameActionParameter2))
+				{
+					ruleToEdit.getActionSet().get(editIndex).setParameter1(data.getBooleanExtra(intentNameActionParameter1, false));
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra(intentNameActionParameter2));
+				}
+
+				this.refreshActionList();
+			}
+		}
 		else if(requestCode == requestCodeActionControlMediaEdit)
 		{
 			if(resultCode == RESULT_OK)
@@ -1759,6 +1793,8 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.notification));
 			else if(types[i].toString().equals(Action_Enum.sendBroadcast.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.satellite));
+			else if(types[i].toString().equals(Action_Enum.runExecutable.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.script));
 			else if(types[i].toString().equals(Action_Enum.sendTextMessage.toString()))
 			{
 //			    if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageSpecificRule.this, "android.permission.SEND_SMS") && !Miscellaneous.isGooglePlayInstalled(ActivityManageSpecificRule.this))
@@ -1927,6 +1963,12 @@ public class ActivityManageRule extends Activity
 						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionSendBroadcast.class);
 						startActivityForResult(intent, requestCodeActionSendBroadcastAdd);
 					}
+					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.runExecutable.toString()))
+					{
+						newAction.setAction(Action_Enum.runExecutable);
+						Intent intent = new Intent(ActivityManageRule.this, ActivityManageActionRunExecutable.class);
+						startActivityForResult(intent, requestCodeActionRunExecutableAdd);
+					}
 					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.controlMediaPlayback.toString()))
 					{
 						newAction.setAction(Action_Enum.controlMediaPlayback);
diff --git a/app/src/main/res/drawable/script.png b/app/src/main/res/drawable/script.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebedb555cd530a935c757cc073f68fbef405b828
GIT binary patch
literal 679
zcmeAS@N?(olHy`uVBq!ia0vp^Za}QT!3HFqFZ8SfQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0VLoj{n;&a;*SC@59p8c`CQpH@<ySd_{TkeHcQqUYxtqEKe6
zXR2ptVDP1AAp--Gn5T<lNQU#<8N0i*90eS{&kw12%q`fK{eYQSeutDqhXRL^1V>Y2
zXU3vO%u}>E+!j6i&HP*VxBAwwjd5--o90HoXEQb}Sg=xW)+^_7(=*%*e<YOS*M?Q^
zXZqiL{MMO8JW@v=7VN2;?zQyO!dn+MSFAa!b8120I_b9eK{{enrK`mHx6X8xH0knU
zXzxfAFyv8cb39_uA;BhiSRqNmg{K)!P@vOAL9X9k)c5kebwU3WR{c7&fJe$z^}+O?
zzrQvIM9!C-;<#9Y>u)Yh=QXj(K57f&);HgNyX^Yvn>kKO6L*~MbXy#tH~rxA&o3We
z6KhuLJFfiWZ=J`|pn{z-3qrK+K3yQvW6!a9nZ)|*-dmz{g_@VEPCq@dA#1Bwv0Q(9
zQLgf_r$q-J7BpOb$@2X3Otao(mg5qKKi1eSuese(Xf^jj-u8vJ-ySNlQsvwm$KQ5X
zkyE1A&E$H9iN^h~@Rx00BxEa+*qRyV_MA;~4o|m{JDg*t%-DUj>6z7BzNfdn&ZHPM
zUd>|t{deAxHP^Fm<ZV|;*nazB%>Mh!YjRGVekzo-aYmi&POpUl9G`yv*&qIjTQFEd
zM5AxNbV*@$_rcc_Po})!<Y!?jF*@|{L#&^HL`#lY_IlyZ%xhGiUDH3aDDzgXZg%Iv
z)r<efXHO}ys*OG!m9$}c!eZ0zb>}_$K{4Pj#;ia8jE<n8eTUQ<U^-&(boFyt=akR{
E02!7W3jhEB

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_manage_action_run_executable.xml b/app/src/main/res/layout/activity_manage_action_run_executable.xml
new file mode 100644
index 00000000..81a05c05
--- /dev/null
+++ b/app/src/main/res/layout/activity_manage_action_run_executable.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_margin="@dimen/default_margin" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_span="2"
+            android:textSize="25dp"
+            android:textStyle="bold"
+            android:layout_marginBottom="@dimen/default_margin"
+            android:text="@string/runExecutable" />
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:stretchColumns="1"
+            android:shrinkColumns="1">
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/runAsRoot" />
+
+                <CheckBox
+                    android:id="@+id/chkRunExecAsRoot"
+                    android:layout_marginBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" >
+
+                </CheckBox>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/path" />
+
+                <EditText
+                    android:id="@+id/etRunExecutablePath"
+                    android:layout_marginBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="textUri" >
+
+                </EditText>
+
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/default_margin"
+                    android:text="@string/parameters" />
+
+                <EditText
+                    android:id="@+id/etRunExecutableParameters"
+                    android:layout_marginBottom="10dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:inputType="text" >
+
+                </EditText>
+
+            </TableRow>
+        </TableLayout>
+
+        <Button
+            android:id="@+id/bChooseExecutable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/chooseExecutable" />
+
+        <ScrollView
+            android:layout_marginTop="@dimen/default_margin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tvLegend"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:text="@string/urlLegend" />
+
+        </ScrollView>
+
+        <Button
+            android:id="@+id/bSaveActionRunExec"
+            android:layout_marginTop="15dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/save" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_manage_action_speak_text.xml b/app/src/main/res/layout/activity_manage_action_speak_text.xml
index 3621d548..4bdaca1f 100644
--- a/app/src/main/res/layout/activity_manage_action_speak_text.xml
+++ b/app/src/main/res/layout/activity_manage_action_speak_text.xml
@@ -2,13 +2,22 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:layout_margin="10dp" >
+    android:layout_margin="@dimen/default_margin" >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical" >
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_span="2"
+            android:textSize="25dp"
+            android:textStyle="bold"
+            android:layout_marginBottom="@dimen/default_margin"
+            android:text="@string/actionSpeakText" />
+
         <TextView
             android:id="@+id/tvRuleTitle"
             android:layout_width="wrap_content"
@@ -40,7 +49,7 @@
         </ScrollView>
 
         <Button
-            android:id="@+id/bSaveTriggerUrl"
+            android:id="@+id/bSaveSpeakText"
             android:layout_marginTop="15dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_manage_action_trigger_url.xml b/app/src/main/res/layout/activity_manage_action_trigger_url.xml
index 0559e531..ec796c77 100644
--- a/app/src/main/res/layout/activity_manage_action_trigger_url.xml
+++ b/app/src/main/res/layout/activity_manage_action_trigger_url.xml
@@ -110,7 +110,7 @@
 		</ScrollView>
 
 		<Button
-			android:id="@+id/bSaveTriggerUrl"
+			android:id="@+id/bSaveSpeakText"
 			android:layout_marginTop="15dp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba87f14d..e945d5cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -820,4 +820,11 @@
     <string name="enterBroadcast">Enter a broadcast action.</string>
     <string name="broadcastExplanation">This action allows to send a broadcast across the Android OS messaging system. This is not user-visible, but apps who listen for that specific broadcast can respond to it being sent.</string>
     <string name="directionStringDoesNotContain">does not contain</string>
+    <string name="runExecutable">Run executable</string>
+    <string name="path">Path</string>
+    <string name="parameters">Parameters</string>
+    <string name="chooseExecutable">Choose executable</string>
+    <string name="runAsRoot">Run as root</string>
+    <string name="selectValidExecutable">Select a valid executable file.</string>
+    <string name="fileNotExecutable">The file is not executable.</string>
 </resources>
\ No newline at end of file

From 00f296d2d12fa02746bb9c95aaa9f38d610d383d Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Wed, 1 Jun 2022 22:36:30 +0200
Subject: [PATCH 02/10] wifi action

---
 app/src/apkFlavor/AndroidManifest.xml         |   1 +
 app/src/fdroidFlavor/AndroidManifest.xml      |   1 +
 app/src/googlePlayFlavor/AndroidManifest.xml  |   1 +
 .../java/com/jens/automation2/Action.java     |  16 +-
 .../java/com/jens/automation2/Actions.java    | 159 +++++++++++++++++-
 .../jens/automation2/ActivityMainScreen.java  |   2 +-
 .../ActivityManageActionRunExecutable.java    |   8 +-
 .../ActivityManageActionStartActivity.java    |   2 +-
 .../automation2/ActivityManageActionWifi.java |  63 +++++++
 .../jens/automation2/ActivityManageRule.java  |  40 ++++-
 .../jens/automation2/ActivityPermissions.java |   4 +-
 .../jens/automation2/ActivitySettings.java    |   2 +-
 .../jens/automation2/AutomationService.java   |   4 +
 .../com/jens/automation2/Miscellaneous.java   |   2 +-
 .../jens/automation2/ReceiverCoordinator.java |   2 +-
 .../layout/activity_manage_action_wifi.xml    |  97 +++++++++++
 app/src/main/res/values/strings.xml           |   3 +
 17 files changed, 388 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java
 create mode 100644 app/src/main/res/layout/activity_manage_action_wifi.xml

diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml
index e4464193..7d22baea 100644
--- a/app/src/apkFlavor/AndroidManifest.xml
+++ b/app/src/apkFlavor/AndroidManifest.xml
@@ -167,6 +167,7 @@
         <activity android:name=".ActivityManageActionControlMedia" />
         <activity android:name=".ActivityManageActionSendBroadcast" />
         <activity android:name=".ActivityManageActionRunExecutable" />
+        <activity android:name=".ActivityManageActionWifi" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml
index 8236850a..d219b249 100644
--- a/app/src/fdroidFlavor/AndroidManifest.xml
+++ b/app/src/fdroidFlavor/AndroidManifest.xml
@@ -165,6 +165,7 @@
         <activity android:name=".ActivityManageActionControlMedia" />
         <activity android:name=".ActivityManageActionSendBroadcast" />
         <activity android:name=".ActivityManageActionRunExecutable" />
+        <activity android:name=".ActivityManageActionWifi" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml
index aa4c5766..dd348758 100644
--- a/app/src/googlePlayFlavor/AndroidManifest.xml
+++ b/app/src/googlePlayFlavor/AndroidManifest.xml
@@ -152,6 +152,7 @@
         <activity android:name=".ActivityManageActionControlMedia" />
         <activity android:name=".ActivityManageActionSendBroadcast" />
         <activity android:name=".ActivityManageActionRunExecutable" />
+        <activity android:name=".ActivityManageActionWifi" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/main/java/com/jens/automation2/Action.java b/app/src/main/java/com/jens/automation2/Action.java
index c75796f9..351b80ba 100644
--- a/app/src/main/java/com/jens/automation2/Action.java
+++ b/app/src/main/java/com/jens/automation2/Action.java
@@ -330,7 +330,15 @@ public class Action
 
 				if (parts.length > 4 && !StringUtils.isBlank(parts[4]))
 					returnString.append(", " + Miscellaneous.getAnyContext().getResources().getString(R.string.ifString) + " " + Miscellaneous.getAnyContext().getResources().getString(R.string.text) + " " + Trigger.getMatchString(parts[3]) + " " + parts[4]);
-
+			}
+			else if(this.getAction().equals(Action_Enum.setWifi))
+			{
+				if(!StringUtils.isEmpty(this.parameter2))
+				{
+					boolean useRoot = Boolean.parseBoolean(this.parameter2);
+					if(useRoot)
+						returnString.append(" " + Miscellaneous.getAnyContext().getResources().getString(R.string.usingRoot));
+				}
 			}
 			else if(this.getAction().equals(Action_Enum.controlMediaPlayback))
 			{
@@ -552,7 +560,11 @@ public class Action
 					Actions.sendBroadcast(context, this.getParameter2());
 					break;
 				case runExecutable:
-					Actions.runExecutable(context, this.getParameter1(), this.getParameter2());
+					String[] execParts = this.getParameter2().split(Action.actionParameter2Split);
+					if(execParts.length == 1)
+						Actions.runExecutable(context, this.getParameter1(), execParts[0], null);
+					else if(execParts.length == 2)
+						Actions.runExecutable(context, this.getParameter1(), execParts[0], execParts[1]);
 					break;
 				default:
 					Miscellaneous.logEvent("w", "Action", context.getResources().getString(R.string.unknownActionSpecified), 3);
diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java
index d113fd71..c34657aa 100644
--- a/app/src/main/java/com/jens/automation2/Actions.java
+++ b/app/src/main/java/com/jens/automation2/Actions.java
@@ -52,7 +52,12 @@ import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.conn.util.InetAddressUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -63,7 +68,9 @@ import java.security.KeyStore;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 
@@ -1908,8 +1915,156 @@ public class Actions
 		}
 	}
 
-	public static boolean runExecutable(Context context, boolean runAsRoot, String pathAndParams)
+	public static boolean runExecutable(Context context, boolean runAsRoot, String path, String parameters)
 	{
-		return false;
+		if(runAsRoot)
+		{
+			if(!StringUtils.isEmpty(parameters))
+				return executeCommandViaSu(new String[] { path + " " + parameters });
+			else
+				return executeCommandViaSu(new String[] { path });
+		}
+		else
+		{
+			Object[] result;
+
+			File executable = new File(path);
+			File workingDir = new File(executable.getParent());
+
+			if(!StringUtils.isEmpty(parameters))
+				result = runExternalApplication(path, 0, workingDir, parameters);
+			else
+				result = runExternalApplication(path, 0, workingDir, null);
+
+			boolean execResult = (boolean) result[0];
+
+			return execResult;
+		}
+	}
+
+	/**
+	 *
+	 * @param commandToExecute
+	 * @param timeout
+	 * @param params
+	 * @return Returns an array: 0=exit code, 1=cmdline output
+	 */
+	public static Object[] runExternalApplication(String commandToExecute, long timeout, File workingDirectory, String params)
+	{
+		/*
+		 * Classes stolen from https://github.com/stleary/JSON-java
+		 */
+
+		String fullCommand;
+
+		if(!StringUtils.isEmpty(params))
+			fullCommand = commandToExecute + " " + params;
+		else
+			fullCommand = commandToExecute;
+
+		Miscellaneous.logEvent("i", "Running executable", "Running external application " + fullCommand, 4);
+
+		Object[] returnObject = new Object[2];
+
+		StringBuilder output = new StringBuilder();
+		String line = null;
+		OutputStream stdin = null;
+		InputStream stderr = null;
+		InputStream stdout = null;
+
+		try
+		{
+			Process process = null;
+
+			if(workingDirectory != null)
+				process = Runtime.getRuntime().exec(fullCommand, null, workingDirectory);
+			else
+				process = Runtime.getRuntime().exec(fullCommand);
+			stdin = process.getOutputStream ();
+			stderr = process.getErrorStream ();
+			stdout = process.getInputStream ();
+
+			// "write" the parms into stdin
+			/*line = "param1" + "\n";
+			stdin.write(line.getBytes() );
+			stdin.flush();
+
+			line = "param2" + "\n";
+			stdin.write(line.getBytes() );
+			stdin.flush();
+
+			line = "param3" + "\n";
+			stdin.write(line.getBytes() );
+			stdin.flush();*/
+
+			stdin.close();
+
+			// clean up if any output in stdout
+			BufferedReader brCleanUp = new BufferedReader (new InputStreamReader (stdout));
+			while ((line = brCleanUp.readLine ()) != null)
+			{
+				Miscellaneous.logEvent ("i", "Running executable", "[Stdout] " + line, 4);
+				output.append(line);
+			}
+			brCleanUp.close();
+
+			// clean up if any output in stderr
+			brCleanUp = new BufferedReader (new InputStreamReader(stderr));
+			while ((line = brCleanUp.readLine ()) != null)
+			{
+				Miscellaneous.logEvent ("i", "Running executable", "[Stderr] " + line, 4);
+				output.append(line);
+			}
+			brCleanUp.close();
+
+			try
+			{
+				// Wait for the process to exit, we want the return code
+				if(timeout > 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+				{
+					try
+					{
+						if(!process.waitFor(timeout, TimeUnit.MILLISECONDS))
+						{
+							Miscellaneous.logEvent("i", "Running executable", "Timeout of " + String.valueOf(timeout) + " ms reached. Killing check attempt.", 3);
+							process.destroyForcibly();
+						}
+					}
+					catch(NoSuchMethodError e)
+					{
+						process.waitFor();
+					}
+				}
+				else
+					process.waitFor();
+			}
+			catch (InterruptedException e)
+			{
+				Miscellaneous.logEvent("i", "Running executable", "Waiting for process failed: " + Log.getStackTraceString(e), 4);
+				Miscellaneous.logEvent("i", "Running executable", Log.getStackTraceString(e), 1);
+			}
+
+			if(process.exitValue() == 0)
+				Miscellaneous.logEvent("i", "Running executable", "ReturnCode: " + String.valueOf(process.exitValue()), 4);
+			else
+				Miscellaneous.logEvent("i", "Running executable", "External execution (RC=" + String.valueOf(process.exitValue()) + ") returned error: " + output.toString(), 3);
+
+			returnObject[0] = process.exitValue();
+			returnObject[1] = output.toString();
+
+			return returnObject;
+		}
+		catch (IOException e)
+		{
+			Miscellaneous.logEvent("e", "Running executable", Log.getStackTraceString(e), 1);
+		}
+
+		Miscellaneous.logEvent("i", "Running executable", "Error running external application.", 1);
+
+//		if(slotMap != null)
+//			for(String key : slotMap.keySet())
+//				System.clearProperty(key);
+
+		return null;
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
index 909bec9d..d88bc842 100644
--- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
+++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
@@ -80,7 +80,7 @@ public class ActivityMainScreen extends ActivityGeneric
 
 		bDonate = (Button)findViewById(R.id.bDonate);
 
-		if(!BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
+		if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_googleplay))
 			bDonate.setVisibility(View.VISIBLE);
 
 		toggleService.setChecked(AutomationService.isMyServiceRunning(this));
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
index 3486691d..e332ff38 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
@@ -76,7 +76,7 @@ public class ActivityManageActionRunExecutable extends Activity
             }
             else
             {
-                if(!chkRunExecAsRoot.isChecked() && !executableFile.canExecute())
+                if(false)//!chkRunExecAsRoot.isChecked() && !executableFile.canExecute())
                 {
                     Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.fileNotExecutable), Toast.LENGTH_LONG).show();
                     return;
@@ -85,12 +85,12 @@ public class ActivityManageActionRunExecutable extends Activity
         }
 
         Intent returnData = new Intent();
-        returnData.putExtra("actionParameter1", chkRunExecAsRoot.isChecked());
+        returnData.putExtra(ActivityManageRule.intentNameActionParameter1, chkRunExecAsRoot.isChecked());
 
         if(etRunExecutableParameters.getText() != null && !StringUtils.isEmpty(etRunExecutableParameters.getText().toString()))
-            returnData.putExtra("actionParameter2", etRunExecutablePath.getText().toString() + Action.actionParameter2Split + etRunExecutableParameters.getText().toString());
+            returnData.putExtra(ActivityManageRule.intentNameActionParameter2, etRunExecutablePath.getText().toString() + Action.actionParameter2Split + etRunExecutableParameters.getText().toString());
         else
-            returnData.putExtra("actionParameter2", etRunExecutablePath.getText().toString());
+            returnData.putExtra(ActivityManageRule.intentNameActionParameter2, etRunExecutablePath.getText().toString());
 
         setResult(RESULT_OK, returnData);
         finish();
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java
index cc0dd2eb..58787aa0 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java
@@ -380,7 +380,7 @@ public class ActivityManageActionStartActivity extends Activity
 				int targetSdkVersion = getApplicationContext().getApplicationInfo().targetSdkVersion;
 				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && targetSdkVersion >= 30 && !ActivityPermissions.havePermission(Manifest.permission.QUERY_ALL_PACKAGES, ActivityManageActionStartActivity.this))// && shouldShowRequestPermissionRationale(Manifest.permission.QUERY_ALL_PACKAGES))
 				{
-					if(BuildConfig.FLAVOR.equals("googlePlayFlavor"))
+					if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
 					{
 						// This ain't possible anymore.
 						Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.featureNotInGooglePlayVersion) + Miscellaneous.lineSeparator + Miscellaneous.lineSeparator + getResources().getString(R.string.startActivityInsertManually), ActivityManageActionStartActivity.this).show();
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java
new file mode 100644
index 00000000..63364aa4
--- /dev/null
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java
@@ -0,0 +1,63 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+public class ActivityManageActionWifi extends Activity
+{
+    CheckBox chkWifiRunAsRoot;
+    RadioButton rbActionWifiOn, rbActionWifiOff;
+    Button bActionWifiSave;
+    TextView tvWifiExplanation1, tvWifiExplanation2;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_action_wifi);
+
+        chkWifiRunAsRoot = (CheckBox)findViewById(R.id.chkWifiRunAsRoot);
+        rbActionWifiOn = (RadioButton) findViewById(R.id.rbActionWifiOn);
+        rbActionWifiOff = (RadioButton)findViewById(R.id.rbActionWifiOff);
+        bActionWifiSave = (Button) findViewById(R.id.bActionWifiSave);
+        tvWifiExplanation1 = (TextView)findViewById(R.id.tvWifiExplanation1);
+        tvWifiExplanation2 = (TextView)findViewById(R.id.tvWifiExplanation2);
+
+        Intent input = getIntent();
+        if(input.hasExtra(ActivityManageRule.intentNameActionParameter1))
+            rbActionWifiOn.setChecked(input.getBooleanExtra(ActivityManageRule.intentNameActionParameter1, true));
+
+        if(input.hasExtra(ActivityManageRule.intentNameActionParameter2))
+            chkWifiRunAsRoot.setChecked(Boolean.parseBoolean(input.getStringExtra(ActivityManageRule.intentNameActionParameter2)));
+
+//        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+//            Miscellaneous.messageBox(getResources().getString(R.string.app_name), getResources().getString(R.string.android10WifiToggleNotice), ActivityManageActionWifi.this).show();
+
+        if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
+            tvWifiExplanation1.setVisibility(View.VISIBLE);
+        else
+            tvWifiExplanation1.setVisibility(View.GONE);
+
+        bActionWifiSave.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                Intent response = new Intent();
+                response.putExtra(ActivityManageRule.intentNameActionParameter1, rbActionWifiOn.isChecked());
+                response.putExtra(ActivityManageRule.intentNameActionParameter2, String.valueOf(chkWifiRunAsRoot.isChecked()));
+                setResult(RESULT_OK, response);
+                finish();
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
index e8f55704..21a96c6d 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
@@ -125,6 +125,8 @@ public class ActivityManageRule extends Activity
 	final static int requestCodeActionSendBroadcastEdit = 812;
 	final static int requestCodeActionRunExecutableAdd = 813;
 	final static int requestCodeActionRunExecutableEdit = 814;
+	final static int requestCodeActionSetWifiAdd = 815;
+	final static int requestCodeActionSetWifiEdit = 816;
 	
 	public static ActivityManageRule getInstance()
 	{
@@ -390,6 +392,12 @@ public class ActivityManageRule extends Activity
 						activityEditRunExecutableIntent.putExtra(intentNameActionParameter2, a.getParameter2());
 						startActivityForResult(activityEditRunExecutableIntent, requestCodeActionRunExecutableEdit);
 						break;
+					case setWifi:
+						Intent activityEditSetWifiIntent = new Intent(ActivityManageRule.this, ActivityManageActionWifi.class);
+						activityEditSetWifiIntent.putExtra(intentNameActionParameter1, a.getParameter1());
+						activityEditSetWifiIntent.putExtra(intentNameActionParameter2, a.getParameter2());
+						startActivityForResult(activityEditSetWifiIntent, requestCodeActionSetWifiEdit);
+						break;
 					case controlMediaPlayback:
 						Intent activityEditControlMediaIntent = new Intent(ActivityManageRule.this, ActivityManageActionControlMedia.class);
 						activityEditControlMediaIntent.putExtra(ActivityManageRule.intentNameActionParameter2, a.getParameter2());
@@ -1518,6 +1526,17 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionSetWifiAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newAction.setParentRule(ruleToEdit);
+				newAction.setParameter1(data.getBooleanExtra(ActivityManageRule.intentNameActionParameter1, true));
+				newAction.setParameter2(data.getStringExtra(ActivityManageRule.intentNameActionParameter2));
+				ruleToEdit.getActionSet().add(newAction);
+				this.refreshActionList();
+			}
+		}
 		else if(requestCode == requestCodeActionCreateNotificationAdd)
 		{
 			if(resultCode == RESULT_OK)
@@ -1581,6 +1600,21 @@ public class ActivityManageRule extends Activity
 				this.refreshActionList();
 			}
 		}
+		else if(requestCode == requestCodeActionSetWifiEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				ruleToEdit.getActionSet().get(editIndex).setParentRule(ruleToEdit);
+
+				if(data.hasExtra(intentNameActionParameter1) && data.hasExtra(intentNameActionParameter2))
+				{
+					ruleToEdit.getActionSet().get(editIndex).setParameter1(data.getBooleanExtra(intentNameActionParameter1, false));
+					ruleToEdit.getActionSet().get(editIndex).setParameter2(data.getStringExtra(intentNameActionParameter2));
+				}
+
+				this.refreshActionList();
+			}
+		}
 		else if(requestCode == requestCodeActionControlMediaEdit)
 		{
 			if(resultCode == RESULT_OK)
@@ -1844,10 +1878,8 @@ public class ActivityManageRule extends Activity
 					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setWifi.toString()))
 					{
 						newAction.setAction(Action_Enum.setWifi);
-						getActionParameter1Dialog(ActivityManageRule.this).show();
-
-						if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-							Miscellaneous.messageBox(context.getResources().getString(R.string.app_name), context.getResources().getString(R.string.android10WifiToggleNotice), context).show();
+						Intent editSetWifiIntent = new Intent(context, ActivityManageActionWifi.class);
+						startActivityForResult(editSetWifiIntent, requestCodeActionSetWifiAdd);
 					}
 					else if(Action.getActionTypesAsArray()[which].toString().equals(Action_Enum.setBluetooth.toString()))
 					{
diff --git a/app/src/main/java/com/jens/automation2/ActivityPermissions.java b/app/src/main/java/com/jens/automation2/ActivityPermissions.java
index 62a47c56..34d04caf 100644
--- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java
+++ b/app/src/main/java/com/jens/automation2/ActivityPermissions.java
@@ -250,7 +250,7 @@ public class ActivityPermissions extends Activity
                 }
                 else if(s.equalsIgnoreCase(Manifest.permission.ACTIVITY_RECOGNITION) || s.equalsIgnoreCase(permissionNameGoogleActivityDetection))
                 {
-                    if(!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
+                    if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_fdroid))
                         if (!havePermission(s, context))
                             return true;
                 }
@@ -381,7 +381,7 @@ public class ActivityPermissions extends Activity
                             }
                             else if (singlePermission.equalsIgnoreCase(Manifest.permission.ACTIVITY_RECOGNITION) || singlePermission.equalsIgnoreCase(permissionNameGoogleActivityDetection))
                             {
-                                if (!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
+                                if (!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_fdroid))
                                     addToArrayListUnique(singlePermission, requiredPermissions);
                             }
                             else
diff --git a/app/src/main/java/com/jens/automation2/ActivitySettings.java b/app/src/main/java/com/jens/automation2/ActivitySettings.java
index a8e81a3c..6c69ce73 100644
--- a/app/src/main/java/com/jens/automation2/ActivitySettings.java
+++ b/app/src/main/java/com/jens/automation2/ActivitySettings.java
@@ -18,7 +18,7 @@ public class ActivitySettings extends PreferenceActivity
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(layout.activity_settings);
 
-		if(BuildConfig.FLAVOR.equals("apkFlavor"))
+		if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_apk))
 		{
 			chkPrefUpdateCheck = (CheckBoxPreference) findPreference("automaticUpdateCheck");
 			chkPrefUpdateCheck.setEnabled(true);
diff --git a/app/src/main/java/com/jens/automation2/AutomationService.java b/app/src/main/java/com/jens/automation2/AutomationService.java
index 98f31063..2d5fc7fd 100644
--- a/app/src/main/java/com/jens/automation2/AutomationService.java
+++ b/app/src/main/java/com/jens/automation2/AutomationService.java
@@ -43,6 +43,10 @@ public class AutomationService extends Service implements OnInitListener
 	protected final static int notificationIdRestrictions = 1005;
 	protected final static int notificationIdLocationRestriction = 1006;
 
+	public static final String flavor_name_apk = "apkFlavor";
+	public static final String flavor_name_fdroid = "fdroidFlavor";
+	public static final String flavor_name_googleplay = "googlePlayFlavor";
+
 	final static String NOTIFICATION_CHANNEL_ID_SERVICE = "com.jens.automation2_service";
 	final static String NOTIFICATION_CHANNEL_NAME_SERVICE = "Service notification";
 
diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java
index c55297b8..e21bd74b 100644
--- a/app/src/main/java/com/jens/automation2/Miscellaneous.java
+++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java
@@ -1620,7 +1620,7 @@ public class Miscellaneous extends Service
 	{
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
 		{
-			if (BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
+			if (BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_googleplay))
 			{
 				if(checkExistingRules)
 				{
diff --git a/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java b/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
index 4d759539..6ba9f9a7 100644
--- a/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
+++ b/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
@@ -318,7 +318,7 @@ public class ReceiverCoordinator
             MediaPlayerListener.getInstance().stopListener(AutomationService.getInstance());
         }
 
-        if(!BuildConfig.FLAVOR.equalsIgnoreCase("fdroidFlavor"))
+        if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_fdroid))
         {
             if (Rule.isAnyRuleUsing(Trigger.Trigger_Enum.activityDetection))
             {
diff --git a/app/src/main/res/layout/activity_manage_action_wifi.xml b/app/src/main/res/layout/activity_manage_action_wifi.xml
new file mode 100644
index 00000000..a9db50fc
--- /dev/null
+++ b/app/src/main/res/layout/activity_manage_action_wifi.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_margin="@dimen/default_margin" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_span="2"
+            android:textSize="25dp"
+            android:textStyle="bold"
+            android:layout_marginBottom="@dimen/default_margin"
+            android:text="@string/actionSetWifi"/>
+
+        <TextView
+            android:id="@+id/tvWifiExplanation1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/wifiExplanation1" />
+
+        <TextView
+            android:id="@+id/tvWifiExplanation2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:text="@string/wifiExplanation2" />
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:stretchColumns="1"
+            android:shrinkColumns="1" >
+
+            <TableRow>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/runAsRoot" />
+
+                <CheckBox
+                    android:id="@+id/chkWifiRunAsRoot"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/runAsRoot" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_marginTop="@dimen/default_margin">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/state" />
+
+                <RadioGroup
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" >
+
+                    <RadioButton
+                        android:id="@+id/rbActionWifiOn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="@string/on" />
+
+                    <RadioButton
+                        android:id="@+id/rbActionWifiOff"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/off" />
+
+                </RadioGroup>
+
+            </TableRow>
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/bActionWifiSave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:text="@string/save" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e945d5cf..61f0aea0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -827,4 +827,7 @@
     <string name="runAsRoot">Run as root</string>
     <string name="selectValidExecutable">Select a valid executable file.</string>
     <string name="fileNotExecutable">The file is not executable.</string>
+    <string name="wifiExplanation1">If you downloaded Automation from Google Play Store unfortunately it cannot be turn wifi on or off anymore. Please blame Google for that restriction, not me.\n\nYou can bypass that restriction by rooting your device and activating the checkbox below. Alternatively download this application from F-Droid or my website.</string>
+    <string name="wifiExplanation2">While airplane mode is activated, wifi can only be toggled from applications when using root permissions for that.</string>
+    <string name="usingRoot">using root</string>
 </resources>
\ No newline at end of file

From c1809bd23c48d5302f6b5e5abfb48574b44ed4e2 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Thu, 2 Jun 2022 17:41:41 +0200
Subject: [PATCH 03/10] run executable action

---
 .../automation2/ActivityControlCenter.java    |   2 +-
 .../ActivityManageActionRunExecutable.java    |   2 +-
 .../automation2/ActivityManageActionWifi.java |   2 +-
 .../jens/automation2/ActivityManageRule.java  |   4 +-
 .../com/jens/automation2/Miscellaneous.java   |  38 +++++++++---------
 app/src/main/res/drawable/megaphone.png       | Bin 0 -> 2198 bytes
 app/src/main/res/drawable/satellite.png       | Bin 2993 -> 0 bytes
 .../activity_manage_action_run_executable.xml |   5 +++
 app/src/main/res/values/strings.xml           |   5 ++-
 9 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/drawable/megaphone.png
 delete mode 100644 app/src/main/res/drawable/satellite.png

diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
index 06a18339..0a6de714 100644
--- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
+++ b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java
@@ -357,7 +357,7 @@ public class ActivityControlCenter extends Activity
         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);
-        systemInfoText.append("Rooted: " + String.valueOf(Miscellaneous.isPhoneRooted()));
+        systemInfoText.append("Rooted: " + String.valueOf(Miscellaneous.isPhoneRooted()) + Miscellaneous.lineSeparator);
         systemInfoText.append("Country: " + Miscellaneous.getUserCountry(Miscellaneous.getAnyContext()) + Miscellaneous.lineSeparator);
         systemInfoText.append("OS language: " + Locale.getDefault().getDisplayName() + Miscellaneous.lineSeparator);
         systemInfoText.append("Logfile written: " + String.valueOf(Settings.writeLogFile) + Miscellaneous.lineSeparator);
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
index e332ff38..1111e043 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionRunExecutable.java
@@ -76,7 +76,7 @@ public class ActivityManageActionRunExecutable extends Activity
             }
             else
             {
-                if(false)//!chkRunExecAsRoot.isChecked() && !executableFile.canExecute())
+                if(!chkRunExecAsRoot.isChecked() && !executableFile.canExecute())
                 {
                     Toast.makeText(ActivityManageActionRunExecutable.this, getResources().getString(R.string.fileNotExecutable), Toast.LENGTH_LONG).show();
                     return;
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java
index 63364aa4..38b948f0 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionWifi.java
@@ -42,7 +42,7 @@ public class ActivityManageActionWifi extends Activity
 //        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
 //            Miscellaneous.messageBox(getResources().getString(R.string.app_name), getResources().getString(R.string.android10WifiToggleNotice), ActivityManageActionWifi.this).show();
 
-        if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
+        if(getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.Q)
             tvWifiExplanation1.setVisibility(View.VISIBLE);
         else
             tvWifiExplanation1.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
index 4c6b5ac3..b3c353df 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
@@ -540,7 +540,7 @@ public class ActivityManageRule extends Activity
 			else if(types[i].toString().equals(Trigger_Enum.roaming.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.roaming));
 			else if(types[i].toString().equals(Trigger_Enum.broadcastReceived.toString()))
-				items.add(new Item(typesLong[i].toString(), R.drawable.satellite));
+				items.add(new Item(typesLong[i].toString(), R.drawable.megaphone));
 			else if(types[i].toString().equals(Trigger_Enum.phoneCall.toString()))
             {
 				if(ActivityPermissions.isPermissionDeclaratedInManifest(ActivityManageRule.this, "android.permission.SEND_SMS"))
@@ -1836,7 +1836,7 @@ public class ActivityManageRule extends Activity
 			else if(types[i].toString().equals(Action_Enum.closeNotification.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.notification));
 			else if(types[i].toString().equals(Action_Enum.sendBroadcast.toString()))
-				items.add(new Item(typesLong[i].toString(), R.drawable.satellite));
+				items.add(new Item(typesLong[i].toString(), R.drawable.megaphone));
 			else if(types[i].toString().equals(Action_Enum.runExecutable.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.script));
 			else if(types[i].toString().equals(Action_Enum.sendTextMessage.toString()))
diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java
index e21bd74b..d32272d8 100644
--- a/app/src/main/java/com/jens/automation2/Miscellaneous.java
+++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java
@@ -738,8 +738,8 @@ public class Miscellaneous extends Service
 	   *
 	   * @return <code>true</code> if the device is rooted, <code>false</code> otherwise.
 	   */
-	  public static boolean isPhoneRooted()
-	  {
+	public static boolean isPhoneRooted()
+	{
 //	  	if(true)
 //	  		return true;
 
@@ -747,30 +747,30 @@ public class Miscellaneous extends Service
 	    String buildTags = Build.TAGS;
 	    if (buildTags != null && buildTags.contains("test-keys"))
 	    {
-	      return true;
+			return true;
 	    }
 
 	    // check if /system/app/Superuser.apk is present
-	    try
-	    {
-	      File file = new File("/system/app/Superuser.apk");
-	      if (file.exists())
-	      {
-	        return true;
-	      }
-	    }
-	    catch (Exception e1)
-	    {
+		try
+		{
+	    	File file = new File("/system/app/Superuser.apk");
+			if (file.exists())
+			{
+				return true;
+			}
+		}
+		catch (Exception e1)
+		{
 	      // ignore
-	    }
+		}
 
 	    // try executing commands
-	    return 	canExecuteCommand("/system/xbin/which su")
+		return 	canExecuteCommand("/system/xbin/which su")
 	    			||
 	    		canExecuteCommand("/system/bin/which su")
 	    			||
 	    		canExecuteCommand("which su");
-	  }
+	}
 
 	  // executes a command on the system
 	  private static boolean canExecuteCommand(String command)
@@ -798,9 +798,9 @@ public class Miscellaneous extends Service
      * Disables the SSL certificate checking for new instances of {@link HttpsURLConnection} This has been created to
      * aid testing on a local box, not for use on production.
      */
-	    private static void disableSSLCertificateChecking()
-	    {
-	        try
+	private static void disableSSLCertificateChecking()
+	{
+		try
 	        {	            
 	        	SSLSocketFactory ssf = null;
 	        	
diff --git a/app/src/main/res/drawable/megaphone.png b/app/src/main/res/drawable/megaphone.png
new file mode 100644
index 0000000000000000000000000000000000000000..b425f4651198a196bd5dbc90ae3b325ccab79428
GIT binary patch
literal 2198
zcmXw4c{~&DAK$)`JC({tNs_DBW>m<ExfwAnN5z`^*oMj7+*kV+xhpwB7b}`l?rU-s
za%DM&h$W_+-<E!B>-Wd=Jg?95Jn!fIeBRIJ^LbLvTboLV%7_90010z5BRlSB!fh(T
zJGniwk3!`Rz#uzQLjd*t!3D0d!_xp|0030p660V6xwZ(=%rOW6P~7#W0WF*!|Jmd~
zGIk&#3B<5KZ%;200EvXkpAWw3=Z%v$BKTvy@$yFQZr(U7$(w+e_ac#qx)2C1(4A{v
zbH@?<{R#LW4MLzNgvi6V@gR_J_do&!rU8Y}XX>}O95R16&;$=s2sY3iaGrZANyFOM
zUj7<fLt6s|g{}q`0RTcp=0*ngUdVTMoGDpD;KV#BI23*`5&S+WX3C)`y=jcnej_^`
z3<|$p=9C;mlS%Ap+U+VMDa}e?lsqm&`OKs0ZDnx}hHqS<IejwG!k}m-ne;&<17zvT
z@Y$h8MJ%)a3mKmHQPI9AVHK639Pw*%dvs|zIBL@A>m<Bg=M)z4mC+CtAw){*)^yzZ
z42@IWws|7<OlmKE?4NH_Rf@+84thY_6`x97m;5r-%SP1{LT4>%$V4L4Xj}R3;#b=~
zGL0z(iVk2cFF*VA(*N$^<&Txfxif-#k@9c5l#{?#uoNeeJF1ni>C0Ymnpi`DNHKKe
zD6HXtwZV%<AfHzWnV+AJmXVbu_dri7&MASEtw7NaWF*DKY0zx|ewCoWr<)z-Z2kBu
z4Y?BOiAJOSjE<2LK3J*5iv+VzluM3m#Cf3VsTGldxy}1>&^HdK`?yrObshyt-A$X8
zVJoa4yo6_#o20Ou3&iIaMlcAS9@o_FQbDl;er=f}wY9b5W3Pj70(P8(b!HsVO{~`&
zI1{;f2~-eMz(Vl(OAq`i!A{hLO}f9lm#(U>ua6%tcdP`eB4ROYg)QYKh$WU&552x~
zBFW@0V2}caQ|IUBLlYaObJg+fsr&J3tRXyu=6y_H^@_8z^TM0hZ%pH9mn13duz0I%
z;mU@=EUlj>T!5;*i_7H1*jQvpM8wZgouIkXU2oN$U-nd7di|lo`PF-EEv?Mkldppw
z>XGKt2K>~n?l}v9>?I`JI_JI?mIk(DzJVfKXER#G%WBLX8(goYQkNj087SS>0zcJ~
zfCzY(UF|zUPpOUix&FGc5*D(_#*zsfIS$Z5A<UmecU9xaHUJaMJNS}nTXfInOzkIv
zX57R}KWCIS*35S2M4+{NNj3qK&2d8Yu&WzO;|NThq^JB6JfwLB%TX8u-Z3v|LG!g%
zs}`p-wN;MolN}fun*G<7YzyuzoJM2~rXMx6peL7F=44MuuEt7tF2|fg7KDN1gjWWL
zUHljV1~)_RMcW*)Zb5rf*3}bWEbaEF#p~mhxQ;Fg*3^03@wsH3*|yqgAzisK0h^>v
z^Ub6zn_ci+g(LYkw3Kj=R{abFuNll5w7Zq!Nx?jvmV1}`!1Pu&_yzg*c2#doZPSg<
z5$Apx^}68&v#8U(%{sgnG)}Oe6k;m2xva-}bw6`I?J52=NA}Pmb+`$QMr$irlMhXg
zl-~EWUxlOEMi%?RSIQt<m~@;YF%8kd+ACF5R9JUcV@iv+FzabWMMVL0`*Q0>Amny|
zU;>QMT?d}FX?5gr3ED~Ol>Yu?aWeq*$g0eyV9BHR{<l*BEOjU9%-r$y#ZmbC+|;A3
z-Av=}`SQ5AXb;MrhG|`g`!BzDVt1koe-1x$S$-JRo=FwWO1W0U*bY);!`+9TT)4l9
zz~lzdA9<T@Y&srEk37W@k}=Sq8{JLbKk=N84SD4^I(?Ebu_&uDqK&Pv(pByx=3&N0
zK7DfbNDa5<Am*F1q&qiS^sujopR770HwxJ}@hXPde58v@fs{0kq9Q}=_oV&2{KDhk
zW&L*j)DHS0qx$J0oaxU^4PWL(Y<W~qec@%cGFyu8t*$cqq~AwqKbm;ExVLS#B%d&b
z)Y3~#O0uNe%Ym7}T-aUa5_I_ehKYk9OYZ?Mh(uTQ)<D{*8B2`uCF_;`!YUwP{LRqa
zs*vT0F3r8YG18sC#aBaLh>$Rh9eM_Ize>J;sLVd^E59a?&!pqJ%u5IQ`=>4{f5Q#>
zP6vLV$bi8s^(x!1faH@cXTU#1t&$|zz}nBnB4qIje&7~{5oOOv9ya6{2hAt5|KaSJ
z7^(J%#=Oddd;aJ6;C^vw?e~>33yp@GHPUXW7IUGX!+^$>nKfzVhA#io$nebP!qmhg
zeU(gHa${sOq$us?p39j7@^H4P*3>Ke`z(l>s`k}G;F>RnV*pLp9mDY}GfnZ}zC3fA
z<(n#aUJmCLh8Hdx9SRk;f*ob$X-Acx?@)bA_Mty2S9+deKl+w(nX<;%35m8E75-xI
zFcSW!dK>R&?8rKsyM-K2FoJk@+!N@zm*G?~SR&$FC!l#w3ziKVX&q_V^w<n0lN&YO
z@k-|fmU*&Nx@{2Fu(+JHpc9w*F(qE7G^5&RVLqhvh(BAA-rIVSBUr^#*8VYax3U6<
zaAqjE>{3V7b^X>x<cf~Zgu4>X5KfC<5e*gLETeAoQnA>=KT#n)*0k`+*{{hZO60@y
zaH_rhG4X!QU+u&Ncb=1v>;{+z+vv&P8+&WoKAeb|DlQS_{}DcE)w)@7rdM`hQ?K_C
z#B+}Qe>!{q<G!M@OTIcoC-^BVArtd4GZxZZ!mk~+aR*u*lTmwIqRq4T_b?gXRjJD8
z^-9RI|9eR0f1SaFlVRI}x>niSAH1vFW;5uhEl8%2SYLwG!Xo!e2bddM8&M5iWB&&#
C*dV6>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/satellite.png b/app/src/main/res/drawable/satellite.png
deleted file mode 100644
index f44a177aafe0495daf17abfffc82eaa65886d28f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2993
zcmZWrdpwhG8=u1n35{e<qk|^Qh8!!5B&THv`Sml*jBOSx<X8@sEK*d?l9gja(~@I3
zMp|+#XGL-ra;$fn-uI99^Lg&){@l-fUEk|_-OqKnZ=$TtgayHZ002PP{IrQJdp^Y;
zM|SbC-$+(mF?-_jw>2{c6t~MvvKPEKBP$~Spd?;s69Z(g1<0qJ`~d)9+V<cQX#Cd5
z{wPN=b)?wgDFiIQA49<s2zUw>f+10`BoYR4!~^f|1-0LxSg<9<wk3@&QM`Qp0A3gh
zhJf)ysB2-*$JeqqVcVM~SbujvJeh*`B>{{e{&*spfQ9@&syhKs#`saxdTazd*{Y7)
zs%YO!e(qR+7llIh*Mq@)$ym}~F<(C%%mYio;0Z9eHXIJuhW!^(b%&_xHcwTzAl3iz
zQsu~seeGhq%&~#=B?tN8ab6Sv5~&VBU2-Gf-61BvL=2t;F~NG^-7(wDA=@0-6x{u=
z?Db`=yDyRGOY&FSra}Ir<MBrYb_MI_3xlhv!y3n`*4Q?{96vlM0T@3l0L4b7s9BrZ
zK`v{kX{o{0)tCIT+5e#1+{DPv3t9C*fQ;^uh_Nz<Bb9O|J)HL*v3#4{VXW|+>r6+?
zYmXT56qF>$`3M%0aQST%Emul!w<vvq^hMaW^p2#{q9Uwxp?cKx!WZ@vsy%GgD72rz
z{ba)BB$Q80bTH=^uKLd4ou!c3_qr3+w<G|S>TTef(BPG-mKK}piU1pJJw3hdt}gud
z$=UW-p;O)AjlM(cSLYd$$`?-94)Zk_gJq@4PoWcIEDxg!x?FKM{)zT<cV-3C(529`
zkXEri-P_#kvJxqIa7R8RjX4$Q-^`2XGu0fk(20+6)UipsF0`^Dn&)s%OG{G)ck&9?
z=+^^45=sS0t1|_G0+b#p9*~E-3+ih&TpI|QUtFwwn4GxigCQo?x0(s|XE~C?Waj3k
z-0d;PVl3%qpy`>J;n%<oDBZ1%`Lg16lZjastkC9p;M(b{(&DW}C1;C@pElb<+r%~N
z>qfYBboH*4-32jqY>eih<KKoO%9?^yOfIgeVyKUH@JZC$nuqI~oGi0r$$k{W18F4)
zm)dvlB>D&XRa_bLtJ86(URG2r@$$Dw?wSfAEiB&Q);_W?4gN;#ExAry-$Cp-8DVsJ
zK{2q|V|a3;Zhk%ieq?rb_Ecl7X}}9hY+&z;D8`BV9DcX(S>Xnn2YGR^vOZ$@;+}%D
zsEiD`;h7oWiNQf~3r<kJa%E+a7q;2PQxn;kb#^vW$R|{dV=_6TxE+&Z+rp>vPSjf#
z(a`$wuGDDo<lfb_wQDt*^1P5=tAp=*B*#v)J%&blxMv{xq+egDDd8Blus|b&LtIp(
z%XLsC-2HuSd3wzefbj4HeqKYAD}=Y@Ny6AhEg*cejnH`rp?t=1PJ16r9!idM%hR&M
zj(g%tu3AJUeR|W>Dzr(r^;+<#|2hmox$NQVj}`?MJYum#FBdW6h9`8Q<at}Z=IEu9
za_F<T*!%I~OrsKUi7&6Z9Hi+~nTzGj(S#%nW0md=L5tVbiGm+R%+pafYLn3git_@F
zTEOaaW+oAW*R}V!c87iV@F7=MSNEBaPk8>08-ZRotbS9chGX>a?Ec&=EooMyAhO%l
z-Z<u|;yqD`JU%Omc)hpVx9O<*(jG@DpC%k0Arc}QJ)u%q!BbLF^6%k8hpLncf8X4R
zLFr?aRavicwu<)(*A7Gr_Zy}iwS!`M)$F8F9(ZNxKDIg?@wncEnRt)4h5KCMUN|k<
zgvibMA?o0iz+fz^P*0U9C@74?L!r<zpu8N2b7BgUf{Xq_KYq}i4agG<SdHjUO8ehs
z$FdrmG<a;$i3-P6B@i7SAsPqL*)f@%oWh;g(&CYYAE;mq<!-p0cWP>C@->azS9)^k
z2FGh5b1{|Q&!3c~6Pt7l6?SL(DB7cw9$DSE{^h7SVZrI4R6=B=9!#6RcznEce+E-Q
zTPd}ntPBAWdiQ$ljoEbLHCCE@j;?f+#jPDY{8}mYnPz8K+~dRlV)TXIiKj?)f<4it
zWrz{)3u@wDCXi<_T;E~^v+0mbqn;&avX;o=g8u5knfMp!4J5T)=Y7<`OIIBVLdTl#
z95|`HfA_J<kjJ&cu?>ZRR?lrLBJa$oebDh58`CTdrKKA4-4mb6Dtykngv~`=aEQ5g
zP3~Finb<yDgO_9Cv24;{We`l@McC<J0-^Nh+|X|c(iHYD+&}W6%)*z|v(^r$z@LM>
z9&}h{ue^*cLelPyj<zmiQTAuKV)D;CEzUPqu0uIpE%AG*(t`ws-Hr#0oecV6)jEPu
zRh_~1=MFYrUVjr_v#K~Z-B%W1i$?d%|4HNI$yi(H)~6IOL~P=WU^(jWo^FFQ`Doy|
zg*DTLPt7PN0Y+DsYhlsV^$KV8y{pxHnbFFu{rNHoQIUt&SvRP?C+6xK8j9lM;zG1E
zH9M8n)#rnIt%E1$c2ah7y^BVDW}lq2d(wiEaQl_zo^sTQc42Q3Z^?YV<K;HyaE2A!
zM+uR`U63nSKr5z!zf(ONgmrXX=n^C!F$bzv%Cf~sV(OnXvh1N*rLK(C%ns;n_PlRv
z2B-wcRG%XsrOD#o9z^5}I`S8(zGDq`duJChq?}VzvvOaGrIdURsWiB~>jn0VwRHxS
zR(LaZef@L;r?S#~w$_(xj$fYMzvr{ckuC}D^z1VfQ$j5`pRP#9f~CJdgv!nkSp!`H
z#|QqIW)zh1=;?oQs^p<AuG|Y%?(dG3Tigo*g)6%_@03!xu6+9fTS--CUg%8$mPa8*
z)g&^h9WA_kiPh2BtQ-}`3@hR%4PP8>T=tpXVq}m!?L@%XfZ6HH$*{h@zA`dxll$mG
z_Dt$uJc$%rtH#QW_VLja!L2}asA}i_{N600H^EgEnPkM5ps*EM6<0kd&ANVgS+S==
zUp|EC-}K56T1K}G1A#zq1}cI$eSuQsSTfobEhKruvFeHzp|7-Id?-_X2v=B~Mj+-l
z?L(AGxsep|MG@{<H6ncc>ot7OgeBIqd(JvSUtOeym@&89cS^=bM&N>5>LH8d1n5s9
zflzHz5-$6D+Lf65%NlnyrK6jBpx3w)VJF42RpknniBR|m=|335R~I$@GzrtP`gkM2
z;Aqur(kAcU2zkA4(WT5&c={8gAY`aI)VTBQcUE0Z80tal@!o;%xF0z@SEBbRf|?UX
zQjzM2kh@jo$G}QeRaLf~-plb(nJ3S3as^wFtoDz0f5oMvGCJg1`&~{;-4%>h2_r5i
z=KRKS*&<eOku-HOazp_%#&^LiDtgr1fMl3wR}2bUvD;~BWe&wIFI{IoF@6$>L@tpa
z{iu0liUzLTLjLn?xv)U;eW|5GAUh+^UqPE1WD4amPF{Ot>b*Fp=)r~fi)YG-pNCo5
z$h%%`XdKU$S?A{3kMNZZ*_w^kq1$1L@kQqcH$Jx9RbmK6KU%E62})M_jJwHc5f2za
zKRh#!2d|(Q;zHRI9qsA*HB^I@!bQ!$<jQ@A2Fa`Q7#;udxVxh3HMcm539NfPE3*R|
z!<~8Ph#7i15NF6akm%>ZKWF1hq7BvV525qyU}eL*Z|tb-ku&%fyuO65y<WO^-vfmm
z3mqSF%&5J_2^kr)ZQL3=H=1jzOGp{!&xKlkAP}f=?BCNIa3J-ew47YVP1?6xv9aR<
jy6@SQ`UZdDFaB5IwzqZh=j++`K!CZawMntD>$U#?p3#3;

diff --git a/app/src/main/res/layout/activity_manage_action_run_executable.xml b/app/src/main/res/layout/activity_manage_action_run_executable.xml
index 81a05c05..f230ccdd 100644
--- a/app/src/main/res/layout/activity_manage_action_run_executable.xml
+++ b/app/src/main/res/layout/activity_manage_action_run_executable.xml
@@ -18,6 +18,11 @@
             android:layout_marginBottom="@dimen/default_margin"
             android:text="@string/runExecutable" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/runExecutableExplanation" />
+
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 61f0aea0..c933d919 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -820,14 +820,15 @@
     <string name="enterBroadcast">Enter a broadcast action.</string>
     <string name="broadcastExplanation">This action allows to send a broadcast across the Android OS messaging system. This is not user-visible, but apps who listen for that specific broadcast can respond to it being sent.</string>
     <string name="directionStringDoesNotContain">does not contain</string>
-    <string name="runExecutable">Run executable</string>
+    <string name="runExecutable">Run script or executable</string>
     <string name="path">Path</string>
     <string name="parameters">Parameters</string>
     <string name="chooseExecutable">Choose executable</string>
     <string name="runAsRoot">Run as root</string>
     <string name="selectValidExecutable">Select a valid executable file.</string>
     <string name="fileNotExecutable">The file is not executable.</string>
-    <string name="wifiExplanation1">If you downloaded Automation from Google Play Store unfortunately it cannot be turn wifi on or off anymore. Please blame Google for that restriction, not me.\n\nYou can bypass that restriction by rooting your device and activating the checkbox below. Alternatively download this application from F-Droid or my website.</string>
+    <string name="wifiExplanation1">Apps targeting Android Q or higher cannot turn wifi on or off anymore. Please blame Google for this restriction, not me.\n\nYou can bypass this restriction by rooting your device and activating the checkbox below. Alternatively download this application from F-Droid or my website as I am not forced to target the latest API level in those versions.</string>
     <string name="wifiExplanation2">While airplane mode is activated, wifi can only be toggled from applications when using root permissions for that.</string>
     <string name="usingRoot">using root</string>
+    <string name="runExecutableExplanation">You can select a script or an executable file here that will be executed as an action.\n\nBut there are some prerequisites which you have to deal with on your own. Google has made it very hard to run anything other than regular Android applications.\n\n1.\nThe file must be marked as executable in the file system. On a regular Android system (without root) this is actually the hard part.\n\n2.\nThat also means Automation must be able to execute the file, not just the owner or the group.\n\n3.\nIf it is a script, a valid shell be specified in the script\'s header.</string>
 </resources>
\ No newline at end of file

From b3ad72cc50b693a52828b74cf772966a73bc6697 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Thu, 2 Jun 2022 17:55:02 +0200
Subject: [PATCH 04/10] wifi receiver efficiency

---
 .../location/WifiBroadcastReceiver.java       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java b/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java
index 5f4d68a3..79e93d9c 100644
--- a/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java
+++ b/app/src/main/java/com/jens/automation2/location/WifiBroadcastReceiver.java
@@ -26,7 +26,7 @@ public class WifiBroadcastReceiver extends BroadcastReceiver
 	public static Boolean wasConnected = false;
 	protected static String lastWifiSsid = "";
 	public static boolean lastConnectedState = false;
-	protected static boolean mayCellLocationChangedReceiverBeActivatedFromWifiPointOfWifi = true;
+	protected static boolean mayCellLocationChangedReceiverBeActivatedFromWifiPointOfView = true;
 	protected static WifiBroadcastReceiver wifiBrInstance;
 	protected static IntentFilter wifiListenerIntentFilter;
 	protected static boolean wifiListenerActive=false;
@@ -52,7 +52,7 @@ public class WifiBroadcastReceiver extends BroadcastReceiver
 
 	public static boolean mayCellLocationReceiverBeActivated()
 	{
-		return mayCellLocationChangedReceiverBeActivatedFromWifiPointOfWifi;
+		return mayCellLocationChangedReceiverBeActivatedFromWifiPointOfView;
 	}
 
 	@Override
@@ -63,18 +63,12 @@ public class WifiBroadcastReceiver extends BroadcastReceiver
 	//		int state = -1;
 			NetworkInfo myWifi = null;
 			
-	//		if(intent.getAction().equals(WifiManager.RSSI_CHANGED_ACTION)) //gefeuert bei Verbindung
-	//		{
-	//			Miscellaneous.logEvent("i", "WifiReceiver", "RSSI_CHANGED_ACTION: " + String.valueOf(intent.getIntExtra(WifiManager.RSSI_CHANGED_ACTION, -1)));
-	//		}
-	//		else 
 			if(intent.getAction().equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) //gefeuert bei Trennung
 			{
 	//			state = intent.getIntExtra(WifiManager.NETWORK_STATE_CHANGED_ACTION, -1);
 	//			Miscellaneous.logEvent("i", "WifiReceiver", "NETWORK_STATE_CHANGED_ACTION: " + String.valueOf(state));
 				myWifi = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
 			}
-				
 			
 			WifiManager myWifiManager = (WifiManager)context.getSystemService(Context.WIFI_SERVICE);
 	//		ConnectivityManager connManager = (ConnectivityManager)context.getSystemService(context.CONNECTIVITY_SERVICE);
@@ -95,8 +89,14 @@ public class WifiBroadcastReceiver extends BroadcastReceiver
 				if(Settings.useWifiForPositioning && PointOfInterest.reachedPoiWithActivateWifiRule())	// Poi has wifi
 				{
 					Miscellaneous.logEvent("i", "WifiReceiver", context.getResources().getString(R.string.poiHasWifiStoppingCellLocationListener), 2);
-					mayCellLocationChangedReceiverBeActivatedFromWifiPointOfWifi = false;
+					mayCellLocationChangedReceiverBeActivatedFromWifiPointOfView = false;
 					CellLocationChangedReceiver.stopCellLocationChangedReceiver();
+
+					/*
+						TODO: Every time the screen is turned on, we receiver a "wifi has been connected"-event.
+						This is technically wrong and not really any changed to when the screen was off. It has
+						to be filtered.
+					 */
 				}
 				else
 				{
@@ -110,7 +110,7 @@ public class WifiBroadcastReceiver extends BroadcastReceiver
 			{
 				wasConnected = true;
 				Miscellaneous.logEvent("i", "WifiReceiver", "WifiReceiver just activated. Wifi already connected. Stopping CellLocationReceiver", 3);
-				mayCellLocationChangedReceiverBeActivatedFromWifiPointOfWifi = false;
+				mayCellLocationChangedReceiverBeActivatedFromWifiPointOfView = false;
 				CellLocationChangedReceiver.stopCellLocationChangedReceiver();
 				SensorActivity.stopAccelerometerTimer();
 				String ssid = myWifiManager.getConnectionInfo().getSSID();
@@ -126,7 +126,7 @@ public class WifiBroadcastReceiver extends BroadcastReceiver
 					{
 						wasConnected = false;
 						Miscellaneous.logEvent("i", "WifiReceiver", String.format(context.getResources().getString(R.string.disconnectedFromWifi), getLastWifiSsid()) + " Switching to CellLocationChangedReceiver.", 3);
-						mayCellLocationChangedReceiverBeActivatedFromWifiPointOfWifi = true;
+						mayCellLocationChangedReceiverBeActivatedFromWifiPointOfView = true;
 						CellLocationChangedReceiver.startCellLocationChangedReceiver();
 						lastConnectedState = false;
 						findRules(AutomationService.getInstance());

From b35208b7aae7e4f08e220eb57c7215724a6aa6b6 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Fri, 3 Jun 2022 19:26:34 +0200
Subject: [PATCH 05/10] tethering detection

---
 .../java/com/jens/automation2/Actions.java    | 31 +++++++++++++++++++
 .../jens/automation2/ActivityMainScreen.java  | 10 ++++++
 .../receivers/BroadcastListener.java          | 19 ++++++++++--
 .../main/res/layout/main_overview_layout.xml  |  6 ++++
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java
index c34657aa..243ccb1f 100644
--- a/app/src/main/java/com/jens/automation2/Actions.java
+++ b/app/src/main/java/com/jens/automation2/Actions.java
@@ -67,6 +67,7 @@ import java.net.NetworkInterface;
 import java.security.KeyStore;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -2067,4 +2068,34 @@ public class Actions
 
 		return null;
 	}
+
+	public static boolean isTetheringActive1(Context context)
+	{
+		try
+		{
+			for(Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();)
+			{
+				NetworkInterface intf = en.nextElement();
+
+				for(Enumeration<InetAddress> enumIpAddr = intf.getInetAddresses(); enumIpAddr.hasMoreElements();)
+				{
+					InetAddress inetAddress = enumIpAddr.nextElement();
+
+					if(!intf.isLoopback())
+					{
+						if(intf.getName().contains("rndis"))
+						{
+							return true;
+						}
+					}
+				}
+			}
+		}
+		catch(Exception e)
+		{
+			Miscellaneous.logEvent("e", "isTetheringActive()", Log.getStackTraceString(e), 3);
+		}
+
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
index d88bc842..52a9b7b8 100644
--- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
+++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
@@ -78,6 +78,16 @@ public class ActivityMainScreen extends ActivityGeneric
 		tbLockSound = (ToggleButton) findViewById(R.id.tbLockSound);
 		toggleService = (ToggleButton) findViewById(R.id.tbArmMastListener);
 
+		Button bTether = (Button)findViewById(R.id.bTethering);
+		bTether.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View view)
+			{
+				Toast.makeText(ActivityMainScreen.this, "Tethering active: " + String.valueOf(Actions.isTetheringActive1(ActivityMainScreen.this)), Toast.LENGTH_LONG).show();
+			}
+		});
+
 		bDonate = (Button)findViewById(R.id.bDonate);
 
 		if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_googleplay))
diff --git a/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java b/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java
index e4102b2d..bec1fc7d 100644
--- a/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java
+++ b/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java
@@ -3,6 +3,7 @@ package com.jens.automation2.receivers;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -53,8 +54,22 @@ public class BroadcastListener extends android.content.BroadcastReceiver impleme
         for(String key : intent.getExtras().keySet())
         {
             Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
-//            Object ob = intent.getExtras().get(key);
-//            Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
+            Object ob = intent.getExtras().get(key);
+
+            String target = null;
+
+            if(Build.VERSION.SDK_INT >= 26)
+                target = "tetherArray";
+            else
+                target = "activeArray";
+
+            if(key.equals(target) && ob instanceof ArrayList)
+            {
+                if(((ArrayList<String>)ob).size() > 0)
+                    ;
+            }
+
+            Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
         }
 
         ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.broadcastReceived);
diff --git a/app/src/main/res/layout/main_overview_layout.xml b/app/src/main/res/layout/main_overview_layout.xml
index 32129c9c..038f010a 100644
--- a/app/src/main/res/layout/main_overview_layout.xml
+++ b/app/src/main/res/layout/main_overview_layout.xml
@@ -339,6 +339,12 @@
 	  		android:layout_marginTop="30dp"
 	  		android:gravity="center_horizontal" >
 
+			<Button
+				android:id="@+id/bTethering"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/test" />
+
 			<Button
 				android:id="@+id/bShowHelp"
 				android:layout_gravity="center_vertical"

From bb1b3b014904c37a02f9b2119ab96a09d374c40a Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Sat, 4 Jun 2022 02:44:26 +0200
Subject: [PATCH 06/10] tethering detection

---
 app/src/apkFlavor/AndroidManifest.xml         |   1 +
 app/src/fdroidFlavor/AndroidManifest.xml      |   1 +
 app/src/googlePlayFlavor/AndroidManifest.xml  |   1 +
 .../jens/automation2/ActivityMainScreen.java  |  11 --
 .../jens/automation2/ActivityManageRule.java  |  38 +++++
 .../ActivityManageTriggerTethering.java       |  46 +++++++
 .../jens/automation2/ReceiverCoordinator.java |  29 +++-
 .../java/com/jens/automation2/Trigger.java    |  20 ++-
 .../receivers/BroadcastListener.java          |  17 +--
 .../receivers/TetheringReceiver.java          | 130 ++++++++++++++++++
 .../layout/activity_manage_action_wifi.xml    |   3 +
 .../activity_manage_trigger_tethering.xml     |  72 ++++++++++
 .../main/res/layout/main_overview_layout.xml  |   6 -
 app/src/main/res/values-de/strings.xml        |  14 ++
 app/src/main/res/values/strings.xml           |   3 +
 15 files changed, 356 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java
 create mode 100644 app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java
 create mode 100644 app/src/main/res/layout/activity_manage_trigger_tethering.xml

diff --git a/app/src/apkFlavor/AndroidManifest.xml b/app/src/apkFlavor/AndroidManifest.xml
index 7d22baea..5c59e0cf 100644
--- a/app/src/apkFlavor/AndroidManifest.xml
+++ b/app/src/apkFlavor/AndroidManifest.xml
@@ -168,6 +168,7 @@
         <activity android:name=".ActivityManageActionSendBroadcast" />
         <activity android:name=".ActivityManageActionRunExecutable" />
         <activity android:name=".ActivityManageActionWifi" />
+        <activity android:name=".ActivityManageTriggerTethering" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/fdroidFlavor/AndroidManifest.xml b/app/src/fdroidFlavor/AndroidManifest.xml
index d219b249..47a480d7 100644
--- a/app/src/fdroidFlavor/AndroidManifest.xml
+++ b/app/src/fdroidFlavor/AndroidManifest.xml
@@ -166,6 +166,7 @@
         <activity android:name=".ActivityManageActionSendBroadcast" />
         <activity android:name=".ActivityManageActionRunExecutable" />
         <activity android:name=".ActivityManageActionWifi" />
+        <activity android:name=".ActivityManageTriggerTethering" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/googlePlayFlavor/AndroidManifest.xml b/app/src/googlePlayFlavor/AndroidManifest.xml
index dd348758..8410205e 100644
--- a/app/src/googlePlayFlavor/AndroidManifest.xml
+++ b/app/src/googlePlayFlavor/AndroidManifest.xml
@@ -153,6 +153,7 @@
         <activity android:name=".ActivityManageActionSendBroadcast" />
         <activity android:name=".ActivityManageActionRunExecutable" />
         <activity android:name=".ActivityManageActionWifi" />
+        <activity android:name=".ActivityManageTriggerTethering" />
         <activity
             android:name=".ActivityMainTabLayout"
             android:launchMode="singleTask">
diff --git a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
index 52a9b7b8..54f8ad4f 100644
--- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
+++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
@@ -77,17 +77,6 @@ public class ActivityMainScreen extends ActivityGeneric
 		tvLockSoundDuration = (TextView)findViewById(R.id.tvlockSoundDuration);
 		tbLockSound = (ToggleButton) findViewById(R.id.tbLockSound);
 		toggleService = (ToggleButton) findViewById(R.id.tbArmMastListener);
-
-		Button bTether = (Button)findViewById(R.id.bTethering);
-		bTether.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View view)
-			{
-				Toast.makeText(ActivityMainScreen.this, "Tethering active: " + String.valueOf(Actions.isTetheringActive1(ActivityMainScreen.this)), Toast.LENGTH_LONG).show();
-			}
-		});
-
 		bDonate = (Button)findViewById(R.id.bDonate);
 
 		if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_googleplay))
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
index b3c353df..aa4cd1ae 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java
@@ -127,6 +127,8 @@ public class ActivityManageRule extends Activity
 	final static int requestCodeActionRunExecutableEdit = 814;
 	final static int requestCodeActionSetWifiAdd = 815;
 	final static int requestCodeActionSetWifiEdit = 816;
+	final static int requestCodeTriggerTetheringAdd = 817;
+	final static int requestCodeTriggerTetheringEdit = 818;
 
 	public static ActivityManageRule getInstance()
 	{
@@ -312,6 +314,11 @@ public class ActivityManageRule extends Activity
 						broadcastEditor.putExtra(intentNameTriggerParameter2, selectedTrigger.getTriggerParameter2());
 						startActivityForResult(broadcastEditor, requestCodeTriggerBroadcastReceivedEdit);
 						break;
+					case tethering:
+						Intent tetheringEditor = new Intent(ActivityManageRule.this, ActivityManageTriggerTethering.class);
+						tetheringEditor.putExtra(intentNameTriggerParameter1, selectedTrigger.getTriggerParameter());
+						startActivityForResult(tetheringEditor, requestCodeTriggerTetheringEdit);
+						break;
 					default:
 						break;
 				}
@@ -568,6 +575,8 @@ public class ActivityManageRule extends Activity
 				items.add(new Item(typesLong[i].toString(), R.drawable.alarm));
 			else if(types[i].toString().equals(Trigger_Enum.serviceStarts.toString()))
 				items.add(new Item(typesLong[i].toString(), R.drawable.alarm));
+			else if(types[i].toString().equals(Trigger_Enum.tethering.toString()))
+				items.add(new Item(typesLong[i].toString(), R.drawable.router));
 			else
 				items.add(new Item(typesLong[i].toString(), R.drawable.placeholder));
 		}
@@ -767,6 +776,13 @@ public class ActivityManageRule extends Activity
 						startActivityForResult(broadcastTriggerEditor, requestCodeTriggerBroadcastReceivedAdd);
 						return;
 					}
+					else if(triggerType == Trigger_Enum.tethering)
+					{
+						newTrigger.setTriggerType(Trigger_Enum.tethering);
+						Intent tetheringTriggerEditor = new Intent(myContext, ActivityManageTriggerTethering.class);
+						startActivityForResult(tetheringTriggerEditor, requestCodeTriggerTetheringAdd);
+						return;
+					}
 					else
 						getTriggerParameterDialog(context, booleanChoices).show();
 
@@ -1782,6 +1798,28 @@ public class ActivityManageRule extends Activity
 				this.refreshTriggerList();
 			}
 		}
+		else if(requestCode == requestCodeTriggerTetheringAdd)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				newTrigger.setTriggerParameter(data.getBooleanExtra(intentNameTriggerParameter1, true));
+				newTrigger.setParentRule(ruleToEdit);
+				ruleToEdit.getTriggerSet().add(newTrigger);
+				this.refreshTriggerList();
+			}
+		}
+		else if(requestCode == requestCodeTriggerTetheringEdit)
+		{
+			if(resultCode == RESULT_OK)
+			{
+				Trigger editedTrigger = new Trigger();
+				editedTrigger.setTriggerType(Trigger_Enum.tethering);
+				editedTrigger.setTriggerParameter(data.getBooleanExtra(intentNameTriggerParameter1, true));
+				editedTrigger.setParentRule(ruleToEdit);
+				ruleToEdit.getTriggerSet().set(editIndex, editedTrigger);
+				this.refreshTriggerList();
+			}
+		}
 	}
 
 	protected AlertDialog getActionTypeDialog()
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java
new file mode 100644
index 00000000..15ad0be0
--- /dev/null
+++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerTethering.java
@@ -0,0 +1,46 @@
+package com.jens.automation2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+public class ActivityManageTriggerTethering extends Activity
+{
+    RadioButton rbTetheringOn, rTetheringOff;
+    Button bTriggerTetheringSave;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_manage_trigger_tethering);
+
+        rbTetheringOn = (RadioButton) findViewById(R.id.rbTetheringOn);
+        rTetheringOff = (RadioButton)findViewById(R.id.rTetheringOff);
+        bTriggerTetheringSave = (Button) findViewById(R.id.bTriggerTetheringSave);
+
+        Intent input = getIntent();
+        if(input.hasExtra(ActivityManageRule.intentNameTriggerParameter1))
+            rbTetheringOn.setChecked(input.getBooleanExtra(ActivityManageRule.intentNameTriggerParameter1, true));
+
+        bTriggerTetheringSave.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                Intent response = new Intent();
+                response.putExtra(ActivityManageRule.intentNameTriggerParameter1, rbTetheringOn.isChecked());
+                setResult(RESULT_OK, response);
+                finish();
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java b/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
index 6ba9f9a7..23a1f77e 100644
--- a/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
+++ b/app/src/main/java/com/jens/automation2/ReceiverCoordinator.java
@@ -18,6 +18,7 @@ import com.jens.automation2.receivers.NoiseListener;
 import com.jens.automation2.receivers.PhoneStatusListener;
 import com.jens.automation2.receivers.ProcessListener;
 import com.jens.automation2.receivers.ScreenStateReceiver;
+import com.jens.automation2.receivers.TetheringReceiver;
 import com.jens.automation2.receivers.TimeZoneListener;
 
 import androidx.annotation.RequiresApi;
@@ -59,7 +60,8 @@ public class ReceiverCoordinator
                     ProcessListener.class,
                     MediaPlayerListener.class,
                     ScreenStateReceiver.class,
-                    TimeZoneListener.class
+                    TimeZoneListener.class,
+                    TetheringReceiver.class
              };
         }
         catch (ClassNotFoundException e)
@@ -77,7 +79,8 @@ public class ReceiverCoordinator
                     PhoneStatusListener.class,
                     ProcessListener.class,
                     ScreenStateReceiver.class,
-                    TimeZoneListener.class
+                    TimeZoneListener.class,
+                    TetheringReceiver.class
             };
         }
     }
@@ -176,6 +179,9 @@ public class ReceiverCoordinator
         if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.deviceOrientation))
             DeviceOrientationListener.getInstance().startListener(AutomationService.getInstance());
 
+        if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.tethering))
+            TetheringReceiver.getInstance().startListener(AutomationService.getInstance());
+
         try
         {
             Class testClass = Class.forName(ActivityManageRule.activityDetectionClassPath);
@@ -216,6 +222,7 @@ public class ReceiverCoordinator
             ProcessListener.stopProcessListener(AutomationService.getInstance());
             MediaPlayerListener.getInstance().stopListener(AutomationService.getInstance());
             DeviceOrientationListener.getInstance().stopListener(AutomationService.getInstance());
+            TetheringReceiver.getInstance().stopListener(AutomationService.getInstance());
 
             try
             {
@@ -415,6 +422,24 @@ public class ReceiverCoordinator
             }
         }
 
+        if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.tethering))
+        {
+            if(!TetheringReceiver.getInstance().isListenerRunning())
+            {
+                Miscellaneous.logEvent("i", "TetheringReceiver", "Starting TetheringReceiver because used in a new/changed rule.", 4);
+//                if(DevicePositionListener.getInstance().haveAllPermission())
+                TetheringReceiver.getInstance().startListener(AutomationService.getInstance());
+            }
+        }
+        else
+        {
+            if(TetheringReceiver.getInstance().isListenerRunning())
+            {
+                Miscellaneous.logEvent("i", "TetheringReceiver", "Shutting down TetheringReceiver because not used in any rule.", 4);
+                TetheringReceiver.getInstance().stopListener(AutomationService.getInstance());
+            }
+        }
+
         AutomationService.updateNotification();
     }
 }
diff --git a/app/src/main/java/com/jens/automation2/Trigger.java b/app/src/main/java/com/jens/automation2/Trigger.java
index ae3e0919..ba51232b 100644
--- a/app/src/main/java/com/jens/automation2/Trigger.java
+++ b/app/src/main/java/com/jens/automation2/Trigger.java
@@ -24,10 +24,10 @@ import com.jens.automation2.receivers.NotificationListener;
 import com.jens.automation2.receivers.PhoneStatusListener;
 import com.jens.automation2.receivers.ProcessListener;
 import com.jens.automation2.receivers.ScreenStateReceiver;
+import com.jens.automation2.receivers.TetheringReceiver;
 
 import org.apache.commons.lang3.StringUtils;
 
-import java.sql.Time;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -59,6 +59,7 @@ public class Trigger
 		deviceStarts,
 		serviceStarts,
 		broadcastReceived,
+		tethering,
 		phoneCall; //phoneCall always needs to be at the very end because of Google's shitty so called privacy
 
 		public String getFullName(Context context)
@@ -113,6 +114,8 @@ public class Trigger
 					return context.getResources().getString(R.string.serviceStarts);
 				case broadcastReceived:
 					return context.getResources().getString(R.string.broadcastReceivedTitle);
+				case tethering:
+					return context.getResources().getString(R.string.tetheringState);
 				default:
 					return "Unknown";
 			}
@@ -228,6 +231,10 @@ public class Trigger
 					if(!checkBroadcastReceived())
 						result = false;
 					break;
+				case tethering:
+					if(!checkTetheringActive())
+						result = false;
+					break;
 				default:
 					break;
 			}
@@ -919,6 +926,11 @@ public class Trigger
 		return true;
 	}
 
+	boolean checkTetheringActive()
+	{
+		return TetheringReceiver.isTetheringActive() == triggerParameter;
+	}
+
 	public boolean checkDateTime(Object triggeringObject, boolean checkifStateChangedSinceLastRuleExecution)
 	{
 		/*
@@ -1636,6 +1648,12 @@ public class Trigger
 
 				returnString.append(": " + triggerParameter2);
 				break;
+			case tethering:
+				if(triggerParameter)
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.tetheringActive));
+				else
+					returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.tetheringNotActive));
+				break;
 			default:
 				returnString.append("error");
 				break;
diff --git a/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java b/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java
index bec1fc7d..204a3b5d 100644
--- a/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java
+++ b/app/src/main/java/com/jens/automation2/receivers/BroadcastListener.java
@@ -6,6 +6,7 @@ import android.content.IntentFilter;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.jens.automation2.ActivityPermissions;
 import com.jens.automation2.AutomationService;
@@ -54,22 +55,6 @@ public class BroadcastListener extends android.content.BroadcastReceiver impleme
         for(String key : intent.getExtras().keySet())
         {
             Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
-            Object ob = intent.getExtras().get(key);
-
-            String target = null;
-
-            if(Build.VERSION.SDK_INT >= 26)
-                target = "tetherArray";
-            else
-                target = "activeArray";
-
-            if(key.equals(target) && ob instanceof ArrayList)
-            {
-                if(((ArrayList<String>)ob).size() > 0)
-                    ;
-            }
-
-            Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
         }
 
         ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.broadcastReceived);
diff --git a/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java b/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java
new file mode 100644
index 00000000..7f2b8461
--- /dev/null
+++ b/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java
@@ -0,0 +1,130 @@
+package com.jens.automation2.receivers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
+import android.util.Log;
+
+import com.jens.automation2.AutomationService;
+import com.jens.automation2.Miscellaneous;
+import com.jens.automation2.Rule;
+import com.jens.automation2.Trigger;
+
+import java.util.ArrayList;
+
+public class TetheringReceiver extends android.content.BroadcastReceiver implements AutomationListenerInterface
+{
+    public static AutomationService automationServiceRef = null;
+    private static boolean receiverActive = false;
+    private static TetheringReceiver receiverInstance = null;
+    private static IntentFilter intentFilter = null;
+
+    private static boolean tetheringActive = false;
+
+    public static TetheringReceiver getInstance()
+    {
+        if(receiverInstance == null)
+            receiverInstance = new TetheringReceiver();
+
+        return receiverInstance;
+    }
+
+    public static boolean isTetheringActive()
+    {
+        return tetheringActive;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent)
+    {
+        for(String key : intent.getExtras().keySet())
+        {
+//            Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
+            Object ob = intent.getExtras().get(key);
+
+            String target = null;
+
+            if(Build.VERSION.SDK_INT >= 26)
+                target = "tetherArray";
+            else
+                target = "activeArray";
+
+            if(key.equals(target) && ob instanceof ArrayList)
+            {
+                if(((ArrayList<String>)ob).size() > 0)
+                    tetheringActive = true;
+                else
+                    tetheringActive = false;
+            }
+
+//            Miscellaneous.logEvent("i", "Broadcast extra", "Broadcast " + intent.getAction() + " has extra " + key + " and type " + intent.getExtras().get(key).getClass().getName(), 4);
+        }
+
+        ArrayList<Rule> ruleCandidates = Rule.findRuleCandidates(Trigger.Trigger_Enum.tethering);
+        for(int i=0; i<ruleCandidates.size(); i++)
+        {
+            if(ruleCandidates.get(i).getsGreenLight(context))
+                ruleCandidates.get(i).activate(automationServiceRef, false);
+        }
+    }
+
+    @Override
+    public void startListener(AutomationService automationService)
+    {
+        if(!receiverActive)
+        {
+            TetheringReceiver.automationServiceRef = automationService;
+
+            if(receiverInstance == null)
+                receiverInstance = new TetheringReceiver();
+
+            if(intentFilter == null)
+            {
+                intentFilter = new IntentFilter();
+                intentFilter.addAction("android.net.conn.TETHER_STATE_CHANGED");
+            }
+
+            try
+            {
+                automationServiceRef.registerReceiver(receiverInstance, intentFilter);
+                receiverActive = true;
+            }
+            catch(Exception e)
+            {
+                    /*
+                        We might be confronted with permission issues here.
+                     */
+                Miscellaneous.logEvent("e", "TetheringReceiver", Log.getStackTraceString(e), 1);
+                receiverActive = false;
+            }
+        }
+    }
+
+    @Override
+    public void stopListener(AutomationService automationService)
+    {
+        if(receiverActive)
+        {
+            if(receiverInstance != null)
+            {
+                automationServiceRef.unregisterReceiver(receiverInstance);
+                receiverInstance = null;
+            }
+
+            receiverActive = false;
+        }
+    }
+
+    @Override
+    public boolean isListenerRunning()
+    {
+        return receiverActive;
+    }
+
+    @Override
+    public Trigger.Trigger_Enum[] getMonitoredTrigger()
+    {
+        return new Trigger.Trigger_Enum[] { Trigger.Trigger_Enum.tethering};
+    }
+}
diff --git a/app/src/main/res/layout/activity_manage_action_wifi.xml b/app/src/main/res/layout/activity_manage_action_wifi.xml
index a9db50fc..581d224d 100644
--- a/app/src/main/res/layout/activity_manage_action_wifi.xml
+++ b/app/src/main/res/layout/activity_manage_action_wifi.xml
@@ -58,11 +58,14 @@
                 android:layout_marginTop="@dimen/default_margin">
 
                 <TextView
+                    android:layout_gravity="center_vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/default_margin"
                     android:text="@string/state" />
 
                 <RadioGroup
+                    android:layout_gravity="center_vertical"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" >
 
diff --git a/app/src/main/res/layout/activity_manage_trigger_tethering.xml b/app/src/main/res/layout/activity_manage_trigger_tethering.xml
new file mode 100644
index 00000000..24d64133
--- /dev/null
+++ b/app/src/main/res/layout/activity_manage_trigger_tethering.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_margin="@dimen/default_margin" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_span="2"
+            android:textSize="25dp"
+            android:textStyle="bold"
+            android:layout_marginBottom="@dimen/default_margin"
+            android:text="@string/tetheringState"/>
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:stretchColumns="1"
+            android:shrinkColumns="1" >
+
+            <TableRow
+                android:layout_marginTop="@dimen/default_margin">
+
+                <TextView
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/default_margin"
+                    android:text="@string/state" />
+
+                <RadioGroup
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" >
+
+                    <RadioButton
+                        android:id="@+id/rbTetheringOn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="@string/on" />
+
+                    <RadioButton
+                        android:id="@+id/rTetheringOff"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/off" />
+
+                </RadioGroup>
+
+            </TableRow>
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/bTriggerTetheringSave"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/default_margin"
+            android:text="@string/save" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_overview_layout.xml b/app/src/main/res/layout/main_overview_layout.xml
index 038f010a..32129c9c 100644
--- a/app/src/main/res/layout/main_overview_layout.xml
+++ b/app/src/main/res/layout/main_overview_layout.xml
@@ -339,12 +339,6 @@
 	  		android:layout_marginTop="30dp"
 	  		android:gravity="center_horizontal" >
 
-			<Button
-				android:id="@+id/bTethering"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/test" />
-
 			<Button
 				android:id="@+id/bShowHelp"
 				android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 80a1ae7f..fe7b755f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -723,4 +723,18 @@
     <string name="explanationBroadcastTrigger">La mayoría de los eventos en su teléfono se \"publicado\" transmitiéndolos a través del sistema operativo.\nPor ejemplo, activar / desactivar el modo avión activará dicha transmisión. Esas transmisiones no son automáticamente visibles / audibles, pero si una aplicación (como Automatización) está interesada, puede conectarse a ellas. Cuando ocurran, se le notificará y podrá reaccionar.\n\nPuede definir aquí un evento de difusión para el que la aplicación esperará. Puede ingresarlo manualmente, copiarlo y pegarlo desde algún lugar o elegir uno de la lista de sugerencias. Como este desencadenante está destinado a ser y seguir siendo muy flexible, no puedo proporcionarle explicaciones para los elementos.\n\nLa lista de sugerencias no pretende estar completa. Visite la siguiente URL para echar un vistazo a la documentación de Android.\nTambién cualquier aplicación puede enviar eventos personalizados que no aparecerán en la documentación de Android, por supuesto.\n\nMuchas transmisiones requieren permisos específicos para funcionar. Intento solicitar permisos donde sé que serán necesarios. Si cree que se requiere un permiso para la acción que ingresó, hágamelo saber.\n\nNo recibido significa que no ha habido tal transmisión desde que se inició el servicio. Responder a ciertos parámetros está en desarrollo.</string>
     <string name="logsExplanation">Um eine unnötige Abnutzung Ihres Speichers zu vermeiden, werden Protokolle standardmäßig nicht gespeichert. Wenn Sie also ein Problem haben, aktivieren Sie bitte zuerst die Anmeldeeinstellungen und setzen Sie den Protokollpegel auf 5. Reproduzieren Sie dann das Problem. Erst dann können Protokolle angehängt werden.</string>
     <string name="directionStringDoesNotContain">enthält nicht</string>
+    <string name="path">Pfad</string>
+    <string name="runExecutable">Programm/Script ausführen</string>
+    <string name="parameters">Parameter</string>
+    <string name="chooseExecutable">Datei auswählen</string>
+    <string name="runAsRoot">Als root ausführen</string>
+    <string name="selectValidExecutable">Wählen Sie eine gültige ausführbare Datei aus.</string>
+    <string name="fileNotExecutable">Diese Datei ist nicht ausführbar.</string>
+    <string name="usingRoot">als root</string>
+    <string name="tetheringActive">Tethering ist aktiv</string>
+    <string name="tetheringNotActive">Tethering ist nicht aktiv</string>
+    <string name="tetheringState">Tethering Status</string>
+    <string name="wifiExplanation2">Während der Flugmodus aktiv ist, kann WLAN nur von Anwendungen ein- oder ausgeschaltet werden, wenn root-Rechte dafür verwendet werden.</string>
+    <string name="wifiExplanation1">Anwendungen, die auf Android Q oder höher ausgerichtet sind, können WLAN nicht mehr ein- oder ausschalten. Daran ist Google schuld, nicht ich.\n\nSie können diese Einschränkung umgehen, indem Sie Ihr Gerät rooten und die Checkbox unten aktivieren. Alternativ laden Sie sich diese Anwendung von F-Droid oder meiner Webseite herunter. In diesen Versionen bin ich nicht gezwungen, die Anwendungen auf die neuesten API Level zu unterstützen.</string>
+    <string name="runExecutableExplanation">Sie können ein Script oder eine andere ausführbare Datei auswählen, die dann als Aktion ausgeführt wird.\n\nAllerdings gibt es ein paar Voraussetzungen, um die Sie sich selbst kümmern müssen. Google hat es sehr schwer gemacht, irgendetwas außer normalen Android Anwendungen auszuführen.\n\n1.\nDie Datei muß im Dateisystem als ausführbar markiert sein. Auf einem normalen Android-System (ohne Root) ist das in der Tat der schwierigste Teil.\n\n2.\nDas bedeutet auch, daß auch Automation in der Lage sein muß, die Datei auszuführen, nicht nur der Besitzer oder die Gruppe.\n\n3.\nWenn es ein Script ist, muß eine gültige Shell im Header des Scripts definiert sein.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c933d919..f3de4649 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -831,4 +831,7 @@
     <string name="wifiExplanation2">While airplane mode is activated, wifi can only be toggled from applications when using root permissions for that.</string>
     <string name="usingRoot">using root</string>
     <string name="runExecutableExplanation">You can select a script or an executable file here that will be executed as an action.\n\nBut there are some prerequisites which you have to deal with on your own. Google has made it very hard to run anything other than regular Android applications.\n\n1.\nThe file must be marked as executable in the file system. On a regular Android system (without root) this is actually the hard part.\n\n2.\nThat also means Automation must be able to execute the file, not just the owner or the group.\n\n3.\nIf it is a script, a valid shell be specified in the script\'s header.</string>
+    <string name="tetheringActive">tethering is active</string>
+    <string name="tetheringNotActive">tethering is not active</string>
+    <string name="tetheringState">Tethering state</string>
 </resources>
\ No newline at end of file

From f5a36362228461372edbcf81bde788f157203cf9 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Sat, 4 Jun 2022 14:32:20 +0200
Subject: [PATCH 07/10] intent pairs for sendBroadcast

---
 .../ActivityManageActionSendBroadcast.java    | 167 +++++++-
 .../ActivityManageActionStartActivity.java    | 394 +++++++++---------
 .../activity_manage_action_send_broadcast.xml | 117 +++++-
 3 files changed, 476 insertions(+), 202 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java
index f346984d..b5abee78 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionSendBroadcast.java
@@ -5,19 +5,33 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.InputType;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.Spinner;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ActivityManageActionSendBroadcast extends Activity
 {
     EditText etBroadcastToSend;
-    Button bBroadcastSendShowSuggestions, bSaveSendBroadcast;
+    Button bBroadcastSendShowSuggestions, bSaveSendBroadcast, bAddIntentPair;
+    ListView lvIntentPairs;
+    EditText etParameterName, etParameterValue;
+    Spinner spinnerParameterType;
+    ArrayAdapter<String> intentTypeSpinnerAdapter, intentPairAdapter;
+    private static final String[] supportedIntentTypes = { "boolean", "byte", "char", "double", "float", "int", "long", "short", "String", "Uri" };
+    private ArrayList<String> intentPairList = new ArrayList<>();
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState)
@@ -28,6 +42,15 @@ public class ActivityManageActionSendBroadcast extends Activity
         etBroadcastToSend = (EditText)findViewById(R.id.etBroadcastToSend);
         bBroadcastSendShowSuggestions = (Button)findViewById(R.id.bBroadcastSendShowSuggestions);
         bSaveSendBroadcast = (Button)findViewById(R.id.bSaveSendBroadcast);
+        bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
+        lvIntentPairs = (ListView) findViewById(R.id.lvIntentPairs);
+        etParameterName = (EditText) findViewById(R.id.etParameterName);
+        etParameterValue = (EditText) findViewById(R.id.etParameterValue);
+        spinnerParameterType = (Spinner) findViewById(R.id.spinnerParameterType);
+
+        intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionSendBroadcast.supportedIntentTypes);
+        spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
+        intentTypeSpinnerAdapter.notifyDataSetChanged();
 
         bSaveSendBroadcast.setOnClickListener(new View.OnClickListener()
         {
@@ -37,6 +60,7 @@ public class ActivityManageActionSendBroadcast extends Activity
                 if(checkInput())
                 {
                     Intent answer = new Intent();
+
                     answer.putExtra(ActivityManageRule.intentNameActionParameter2, etBroadcastToSend.getText().toString());
                     setResult(RESULT_OK, answer);
                     finish();
@@ -66,7 +90,120 @@ public class ActivityManageActionSendBroadcast extends Activity
         Intent input = getIntent();
 
         if(input.hasExtra(ActivityManageRule.intentNameActionParameter2))
-            etBroadcastToSend.setText(input.getStringExtra(ActivityManageRule.intentNameActionParameter2));
+        {
+            String param2 = input.getStringExtra(ActivityManageRule.intentNameActionParameter2);
+            if(!param2.contains(Action.actionParameter2Split))
+                etBroadcastToSend.setText(input.getStringExtra(ActivityManageRule.intentNameActionParameter2));
+            else
+            {
+                String[] param2Parts = param2.split(Action.actionParameter2Split);
+                etBroadcastToSend.setText(param2Parts[0]);
+
+                String[] params = param2Parts[1].split(";");
+
+                if(startIndex > -1 && params.length > startIndex)
+                {
+                    intentPairList.clear();
+
+                    for(int i=startIndex; i<params.length; i++)
+                    {
+                        if(lvIntentPairs.getVisibility() != View.VISIBLE)
+                            lvIntentPairs.setVisibility(View.VISIBLE);
+
+                        intentPairList.add(params[i]);
+                    }
+
+                    updateIntentPairList();
+                }
+            }
+        }
+
+        bAddIntentPair.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                // type;name;value
+                if(spinnerParameterType.getSelectedItem().toString().length() == 0)
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                if(etParameterName.getText().toString().length() == 0)
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterName.getText().toString().contains(Action.intentPairSeparator))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterName.getText().toString().contains(";"))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                if(etParameterValue.getText().toString().length() == 0)
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterValue.getText().toString().contains(Action.intentPairSeparator))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+                    return;
+                }
+                else if(etParameterValue.getText().toString().contains(";"))
+                {
+                    Toast.makeText(ActivityManageActionSendBroadcast.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeparator + etParameterName.getText().toString() + Action.intentPairSeparator + etParameterValue.getText().toString();
+                intentPairList.add(param);
+
+                spinnerParameterType.setSelection(0);
+                etParameterName.setText("");
+                etParameterValue.setText("");
+
+                updateIntentPairList();
+
+                if(lvIntentPairs.getVisibility() != View.VISIBLE)
+                    lvIntentPairs.setVisibility(View.VISIBLE);
+            }
+        });
+
+        lvIntentPairs.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener()
+        {
+            @Override
+            public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+            {
+                getIntentPairDialog(arg2).show();
+                return false;
+            }
+        });
+
+        spinnerParameterType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
+        {
+            @Override
+            public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+            {
+                if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
+                    ActivityManageActionSendBroadcast.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
+                else
+                    ActivityManageActionSendBroadcast.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> arg0)
+            {
+                // TODO Auto-generated method stub
+
+            }
+        });
     }
 
     boolean checkInput()
@@ -80,4 +217,30 @@ public class ActivityManageActionSendBroadcast extends Activity
 
         return true;
     }
+
+    private void updateIntentPairList()
+    {
+        if(lvIntentPairs.getAdapter() == null)
+            lvIntentPairs.setAdapter(intentPairAdapter);
+
+        intentPairAdapter.notifyDataSetChanged();
+    }
+
+    private AlertDialog getIntentPairDialog(final int itemPosition)
+    {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ActivityManageActionSendBroadcast.this);
+        alertDialogBuilder.setTitle(getResources().getString(R.string.whatToDoWithIntentPair));
+        alertDialogBuilder.setItems(new String[]{getResources().getString(R.string.delete)}, new DialogInterface.OnClickListener()
+        {
+            @Override
+            public void onClick(DialogInterface dialog, int which)
+            {
+                // Only 1 choice at the moment, no need to check
+                ActivityManageActionSendBroadcast.this.intentPairList.remove(itemPosition);
+                updateIntentPairList();
+            }
+        });
+        AlertDialog alertDialog = alertDialogBuilder.create();
+        return alertDialog;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java
index 58787aa0..4e6b628f 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManageActionStartActivity.java
@@ -60,6 +60,202 @@ public class ActivityManageActionStartActivity extends Activity
 	final static String startByBroadcastString = "1";
 
 	final static int requestCodeForRequestQueryAllPackagesPermission = 4711;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_manage_action_start_activity);
+
+		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
+		etParameterName = (EditText)findViewById(R.id.etParameterName);
+		etParameterValue = (EditText)findViewById(R.id.etParameterValue);
+		bSelectApp = (Button)findViewById(R.id.bSelectApp);
+		bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
+		bSaveActionStartOtherActivity = (Button)findViewById(R.id.bSaveActionStartOtherActivity);
+		spinnerParameterType = (Spinner)findViewById(R.id.spinnerParameterType);
+		etPackageName = (EditText) findViewById(R.id.etPackageName);
+		etActivityOrActionPath = (EditText) findViewById(R.id.etActivityOrActionPath);
+		rbStartAppSelectByActivity = (RadioButton)findViewById(R.id.rbStartAppSelectByActivity);
+		rbStartAppSelectByAction = (RadioButton)findViewById(R.id.rbStartAppSelectByAction);
+		showStartProgramExamples = (Button)findViewById(R.id.showStartProgramExamples);
+		rbStartAppByActivity = (RadioButton)findViewById(R.id.rbStartAppByActivity);
+		rbStartAppByBroadcast = (RadioButton)findViewById(R.id.rbStartAppByBroadcast);
+
+		intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionStartActivity.supportedIntentTypes);
+		spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
+		intentTypeSpinnerAdapter.notifyDataSetChanged();
+
+		intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList);
+
+		bSelectApp.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				int targetSdkVersion = getApplicationContext().getApplicationInfo().targetSdkVersion;
+				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && targetSdkVersion >= 30 && !ActivityPermissions.havePermission(Manifest.permission.QUERY_ALL_PACKAGES, ActivityManageActionStartActivity.this))// && shouldShowRequestPermissionRationale(Manifest.permission.QUERY_ALL_PACKAGES))
+				{
+					if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
+					{
+						// This ain't possible anymore.
+						Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.featureNotInGooglePlayVersion) + Miscellaneous.lineSeparator + Miscellaneous.lineSeparator + getResources().getString(R.string.startActivityInsertManually), ActivityManageActionStartActivity.this).show();
+					}
+					else
+						requestPermissions(new String[] {Manifest.permission.QUERY_ALL_PACKAGES}, requestCodeForRequestQueryAllPackagesPermission);
+				}
+				else
+					getAppList();
+			}
+		});
+
+		bAddIntentPair.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				// type;name;value
+				if(spinnerParameterType.getSelectedItem().toString().length() == 0)
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+
+				if(etParameterName.getText().toString().length() == 0)
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterName.getText().toString().contains(Action.intentPairSeparator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterName.getText().toString().contains(";"))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+					return;
+				}
+
+				if(etParameterValue.getText().toString().length() == 0)
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterValue.getText().toString().contains(Action.intentPairSeparator))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
+					return;
+				}
+				else if(etParameterValue.getText().toString().contains(";"))
+				{
+					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
+					return;
+				}
+
+				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeparator + etParameterName.getText().toString() + Action.intentPairSeparator + etParameterValue.getText().toString();
+				intentPairList.add(param);
+
+				spinnerParameterType.setSelection(0);
+				etParameterName.setText("");
+				etParameterValue.setText("");
+
+				updateIntentPairList();
+
+				if(lvIntentPairs.getVisibility() != View.VISIBLE)
+					lvIntentPairs.setVisibility(View.VISIBLE);
+			}
+		});
+
+		showStartProgramExamples.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlShowExamples));
+				startActivity(browserIntent);
+			}
+		});
+
+		lvIntentPairs.setOnItemLongClickListener(new OnItemLongClickListener()
+		{
+			@Override
+			public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+			{
+				getIntentPairDialog(arg2).show();
+				return false;
+			}
+		});
+
+		bSaveActionStartOtherActivity.setOnClickListener(new OnClickListener()
+		{
+			@Override
+			public void onClick(View v)
+			{
+				if(saveAction())
+				{
+					ActivityManageActionStartActivity.this.setResult(RESULT_OK);
+					finish();
+				}
+			}
+		});
+
+		lvIntentPairs.setOnTouchListener(new OnTouchListener()
+		{
+			@Override
+			public boolean onTouch(View v, MotionEvent event)
+			{
+				v.getParent().requestDisallowInterceptTouchEvent(true);
+				return false;
+			}
+		});
+
+		spinnerParameterType.setOnItemSelectedListener(new OnItemSelectedListener()
+		{
+			@Override
+			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
+			{
+				if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
+					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
+				else
+					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> arg0)
+			{
+				// TODO Auto-generated method stub
+
+			}
+		});
+
+		rbStartAppSelectByActivity.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				if(isChecked)
+					bSelectApp.setEnabled(isChecked);
+			}
+		});
+
+		rbStartAppSelectByAction.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+		{
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+			{
+				if(isChecked)
+					bSelectApp.setEnabled(!isChecked);
+			}
+		});
+
+		Intent i = getIntent();
+		if(i.getBooleanExtra("edit", false) == true)
+		{
+			edit = true;
+			loadValuesIntoGui();
+		}
+	}
 	
 	private class CustomPackageInfo extends PackageInfo implements Comparable<CustomPackageInfo>
 	{
@@ -82,7 +278,6 @@ public class ActivityManageActionStartActivity extends Activity
 					
 			return name1.compareTo(name2);
 		}
-		
 	}
 	
 	private static List<PackageInfo> pInfos = null;
@@ -343,203 +538,6 @@ public class ActivityManageActionStartActivity extends Activity
 		getActivityListTask.execute();
 		progressDialog = ProgressDialog.show(ActivityManageActionStartActivity.this, "", ActivityManageActionStartActivity.this.getResources().getString(R.string.gettingListOfInstalledApplications));
 	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_manage_action_start_activity);
-		
-		lvIntentPairs = (ListView)findViewById(R.id.lvIntentPairs);
-		etParameterName = (EditText)findViewById(R.id.etParameterName);
-		etParameterValue = (EditText)findViewById(R.id.etParameterValue);
-		bSelectApp = (Button)findViewById(R.id.bSelectApp);
-		bAddIntentPair = (Button)findViewById(R.id.bAddIntentPair);
-		bSaveActionStartOtherActivity = (Button)findViewById(R.id.bSaveActionStartOtherActivity);
-		spinnerParameterType = (Spinner)findViewById(R.id.spinnerParameterType);
-		etPackageName = (EditText) findViewById(R.id.etPackageName);
-		etActivityOrActionPath = (EditText) findViewById(R.id.etActivityOrActionPath);
-		rbStartAppSelectByActivity = (RadioButton)findViewById(R.id.rbStartAppSelectByActivity);
-		rbStartAppSelectByAction = (RadioButton)findViewById(R.id.rbStartAppSelectByAction);
-		showStartProgramExamples = (Button)findViewById(R.id.showStartProgramExamples);
-
-		rbStartAppByActivity = (RadioButton)findViewById(R.id.rbStartAppByActivity);
-		rbStartAppByBroadcast = (RadioButton)findViewById(R.id.rbStartAppByBroadcast);
-		
-		intentTypeSpinnerAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionStartActivity.supportedIntentTypes);
-		spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
-		intentTypeSpinnerAdapter.notifyDataSetChanged();
-		
-		intentPairAdapter = new ArrayAdapter<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, intentPairList);
-		
-		bSelectApp.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				int targetSdkVersion = getApplicationContext().getApplicationInfo().targetSdkVersion;
-				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && targetSdkVersion >= 30 && !ActivityPermissions.havePermission(Manifest.permission.QUERY_ALL_PACKAGES, ActivityManageActionStartActivity.this))// && shouldShowRequestPermissionRationale(Manifest.permission.QUERY_ALL_PACKAGES))
-				{
-					if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
-					{
-						// This ain't possible anymore.
-						Miscellaneous.messageBox(getResources().getString(R.string.info), getResources().getString(R.string.featureNotInGooglePlayVersion) + Miscellaneous.lineSeparator + Miscellaneous.lineSeparator + getResources().getString(R.string.startActivityInsertManually), ActivityManageActionStartActivity.this).show();
-					}
-					else
-						requestPermissions(new String[] {Manifest.permission.QUERY_ALL_PACKAGES}, requestCodeForRequestQueryAllPackagesPermission);
-				}
-				else
-					getAppList();
-			}
-		});
-		
-		bAddIntentPair.setOnClickListener(new OnClickListener()
-		{			
-			@Override
-			public void onClick(View v)
-			{
-				// type;name;value
-				if(spinnerParameterType.getSelectedItem().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.selectTypeOfIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-					
-				if(etParameterName.getText().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterNameForIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-				else if(etParameterName.getText().toString().contains(Action.intentPairSeparator))
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
-					return;
-				}
-				else if(etParameterName.getText().toString().contains(";"))
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				if(etParameterValue.getText().toString().length() == 0)
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, getResources().getString(R.string.enterValueForIntentPair), Toast.LENGTH_LONG).show();
-					return;
-				}
-				else if(etParameterValue.getText().toString().contains(Action.intentPairSeparator))
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), Action.intentPairSeparator), Toast.LENGTH_LONG).show();
-					return;
-				}
-				else if(etParameterValue.getText().toString().contains(";"))
-				{
-					Toast.makeText(ActivityManageActionStartActivity.this, String.format(getResources().getString(R.string.stringNotAllowed), ";"), Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				String param = supportedIntentTypes[spinnerParameterType.getSelectedItemPosition()] + Action.intentPairSeparator + etParameterName.getText().toString() + Action.intentPairSeparator + etParameterValue.getText().toString();
-				intentPairList.add(param);
-				
-				spinnerParameterType.setSelection(0);
-				etParameterName.setText("");
-				etParameterValue.setText("");
-				
-				updateIntentPairList();
-
-				if(lvIntentPairs.getVisibility() != View.VISIBLE)
-					lvIntentPairs.setVisibility(View.VISIBLE);
-			}
-		});
-
-		showStartProgramExamples.setOnClickListener(new OnClickListener()
-		{
-			@Override
-			public void onClick(View v)
-			{
-				Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlShowExamples));
-				startActivity(browserIntent);
-			}
-		});
-		
-		lvIntentPairs.setOnItemLongClickListener(new OnItemLongClickListener()
-		{
-			@Override
-			public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3)
-			{
-				getIntentPairDialog(arg2).show();
-				return false;
-			}
-		});
-		
-		bSaveActionStartOtherActivity.setOnClickListener(new OnClickListener()
-		{		
-			@Override
-			public void onClick(View v)
-			{
-				if(saveAction())
-				{
-					ActivityManageActionStartActivity.this.setResult(RESULT_OK);
-					finish();
-				}
-			}
-		});
-
-		lvIntentPairs.setOnTouchListener(new OnTouchListener()
-		{			
-			@Override
-			public boolean onTouch(View v, MotionEvent event)
-			{
-				v.getParent().requestDisallowInterceptTouchEvent(true);
-				return false;
-			}
-		});
-		
-		spinnerParameterType.setOnItemSelectedListener(new OnItemSelectedListener()
-		{
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3)
-			{
-				if(supportedIntentTypes[arg2].equals("double") | supportedIntentTypes[arg2].equals("float") | supportedIntentTypes[arg2].equals("int") | supportedIntentTypes[arg2].equals("long") | supportedIntentTypes[arg2].equals("short"))
-					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_NUMBER);
-				else
-					ActivityManageActionStartActivity.this.etParameterValue.setInputType(InputType.TYPE_CLASS_TEXT);
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0)
-			{
-				// TODO Auto-generated method stub
-				
-			}
-		});
-
-		rbStartAppSelectByActivity.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
-		{
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-			{
-				if(isChecked)
-					bSelectApp.setEnabled(isChecked);
-			}
-		});
-
-		rbStartAppSelectByAction.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
-		{
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-			{
-				if(isChecked)
-					bSelectApp.setEnabled(!isChecked);
-			}
-		});
-		
-		Intent i = getIntent();
-		if(i.getBooleanExtra("edit", false) == true)
-		{
-			edit = true;
-			loadValuesIntoGui();
-		}
-	}
 	
 	private void loadValuesIntoGui()
 	{
diff --git a/app/src/main/res/layout/activity_manage_action_send_broadcast.xml b/app/src/main/res/layout/activity_manage_action_send_broadcast.xml
index 56b1ffe2..b14429c2 100644
--- a/app/src/main/res/layout/activity_manage_action_send_broadcast.xml
+++ b/app/src/main/res/layout/activity_manage_action_send_broadcast.xml
@@ -21,13 +21,19 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/default_margin"
             android:text="@string/broadcastExplanation" />
 
+        <TextView
+            android:layout_marginTop="@dimen/default_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Broadcast:" />
+
         <EditText
             android:id="@+id/etBroadcastToSend"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="@dimen/default_margin"/>
+            android:layout_height="wrap_content"/>
 
         <Button
             android:id="@+id/bBroadcastSendShowSuggestions"
@@ -36,6 +42,113 @@
             android:layout_marginVertical="@dimen/default_margin"
             android:text="@string/broadcastsShowSuggestions" />
 
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:stretchColumns="1"
+            android:shrinkColumns="1" >
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_span="2"
+                    android:textSize="25dp"
+                    android:textStyle="bold"
+                    android:layout_marginBottom="@dimen/default_margin"
+                    android:text="@string/addParameters" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_span="2"
+                    android:layout_marginBottom="@dimen/default_margin"
+                    android:text="@string/intentDataComment" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/parameterType" />
+
+                <Spinner
+                    android:id="@+id/spinnerParameterType"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tvCurrentNfcIdValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/parameterName" />
+
+                <EditText
+                    android:id="@+id/etParameterName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/parameterValue" />
+
+                <EditText
+                    android:id="@+id/etParameterValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+            </TableRow>
+
+        </TableLayout>
+
+        <Button
+            android:id="@+id/bAddIntentPair"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/addIntentValue" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="10dp"
+            android:background="#aa000000" />
+
+        <ListView
+            android:id="@+id/lvIntentPairs"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="115dp"
+            android:layout_marginBottom="@dimen/default_margin" />
+
         <Button
             android:id="@+id/bSaveSendBroadcast"
             android:layout_width="wrap_content"

From f738e02b721473ffdff8b0de7d1b98c8ef034684 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Mon, 6 Jun 2022 02:47:51 +0200
Subject: [PATCH 08/10] store descriptions

---
 fastlane/metadata/android/de-DE/full_description.txt | 5 ++++-
 fastlane/metadata/android/en-US/full_description.txt | 5 ++++-
 fastlane/metadata/android/es-ES/full_description.txt | 5 ++++-
 fastlane/metadata/android/it-IT/full_description.txt | 6 ++++--
 fastlane/metadata/android/nl-NL/full_description.txt | 5 ++++-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index 16b5dc73..1e318e39 100644
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -53,6 +53,9 @@ Wenn Sie ein Problem mit der Anwendung haben und mich dazu kontaktieren möchten
 
 Spenden sind sicher eine gute, aber nicht die einzige Möglichkeit mich zu motivieren :-)
 * Wer mir etwas Gutes tun will, kann die Anwendung auch im Play Store bewerten (https://play.google.com/store/apps/details?id=com.jens.automation2).
-* Außerdem ist Hilfe bei der Übersetzung willkommen. Englisch, Spanisch und Deutsch kann ich selbst. Aber sonst ist alles gern gesehen.
+* Wenn Ihnen die Anwendung gefällt, freue ich mich auch einfach nur über eine Email mit ein paar netten Worten.
+* Außerdem ist immer Hilfe bei der Übersetzung willkommen. Englisch, Spanisch und Deutsch kann ich selbst, Italienisch ist bereits abgedeckt. Aber sonst ist alles gern gesehen.
+* Wenn Sie ein Talent/Erfahrung auf dem Gebiet Grafikdesign haben und Ideen für hübschere Symbole haben, lassen Sie es mich wissen.
+* Falls Sie einen interessanten Anwendungsfall haben oder einen Weg gefunden haben, Auslöser und Aktionen so zu kombinieren, um etwas Besonderes umzusetzen und Sie denken, daß man das auf die Beispielseite (https://server47.de/automation/examples.html) setzen sollte, kontaktieren Sie mich doch.
 
 Erklärungen zu den vielen Berechtigungen können hier abgerufen werden: https://server47.de/automation/permissions.php
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 97dea882..82d0673e 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -53,6 +53,9 @@ If you have a problem and think about contacting me please
 
 Donations are certainly a good, but not the only way to motivate me :-)
 * If you'd like to support me, you can also leave a positive review for the app on Google Play (https://play.google.com/store/apps/details?id=com.jens.automation2).
-* Furthermore I can always use help in translating the app. English, German and some Spanish are among my own skills. But everything else is more than welcome.
+* If you like the app, simply some warm words via email are always appreciated.
+* Furthermore I can always use help in translating the app. English, German and some Spanish are among my own skills. Italian is covered by somebody already. But everything else is more than welcome.
+* If you have a talent/experience in graphics design and have some ideas for nicer icons let me know.
+* If you have an interesting use-case or found a way to combine triggers and actions to achieve something intriguing and you think it's worth putting it on the examples page (https://server47.de/automation/examples.html), let me know.
 
 Explanation of the many permissions can be found here: https://server47.de/automation/permissions.php
\ No newline at end of file
diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
index b6ace1c0..13c77b50 100644
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@@ -53,6 +53,9 @@ Si tiene un problema y considera contactarme
 
 Donaciónes seguramente son una buena, pero no la unica posibilidad de apoyarme :-)
 * Si quiere apoyarme puedes escribir un buena revisión en Google Play (https://play.google.com/store/apps/details?id=com.jens.automation2).
-* Además siempre necesito ayuda en traduciendo la app. Ingles, Aleman y Español  estan en mis habilidades. Per todo lo demás es bienvenido.
+* Si le gusta la aplicación, simplemente algunas palabras cálidas por correo electrónico siempre son apreciadas.
+* Además siempre necesito ayuda en traduciendo la app. Ingles, Aleman y Español estan en mis habilidades. Todavia tengo ayuda con Italiono. Per todo lo demás es bienvenido.
+* Si tiene talento/experiencia en el campo del diseño gráfico y tienes ideas para crear iconos más bonitos, házmelo saber.
+* Si tiene un caso de uso interesante o ha encontrado una forma de combinar condiciones y acciones para lograr algo intrigante y cree que vale la pena ponerlo en la página de ejemplos (https://server47.de/automation/examples.html), házmelo saber.
 
 Puedes leer una explicación de los permisos aqui: https://server47.de/automation/permissions.php
\ No newline at end of file
diff --git a/fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
index c584a5ec..a3eaf294 100644
--- a/fastlane/metadata/android/it-IT/full_description.txt
+++ b/fastlane/metadata/android/it-IT/full_description.txt
@@ -53,8 +53,10 @@ Se hai un problema e stai pensando di contattarmi, per favore:
 
 Donativi sono sicuramente una buona forma di motivarmi, ma non l'unica :-)
 * Se vuoi darmi il tuo supporto, puoi anche lasciare una rassegna positiva su Google Play (https://play.google.com/store/apps/details?id=com.jens.automation2).
-* Inoltre, ho sempre bisogno di aiuto per tradurre l'applicazione.
-Inglese, Tedesco e un po' di Spagnolo son parte delle mie abilità. Ma per tutte le altre, apprezzo molto ogni aiuto.
+* Se l'applicazione vi piace, sono sempre gradite alcune parole affettuose via e-mail.
+* Inoltre, ho sempre bisogno di aiuto per tradurre l'applicazione. Inglese, Tedesco e un po' di Spagnolo son parte delle mie abilità. L'italiano è già coperto da qualcuno. Ma per tutte le altre, apprezzo molto ogni aiuto.
+* Se avete talento/esperienza nel design grafico e avete qualche idea per icone più belle fatemelo sapere.
+* Se avete un caso d'uso interessante o avete trovato un modo per combinare trigger e azioni per ottenere qualcosa di intrigante e pensate che valga la pena inserirlo nella pagina degli esempi (https://server47.de/automation/examples.html), fatemelo sapere.
 
 Una spiegazione di tutti i permessi si trova qui:
 https://server47.de/automation/permissions.php
diff --git a/fastlane/metadata/android/nl-NL/full_description.txt b/fastlane/metadata/android/nl-NL/full_description.txt
index b28c791b..b3a5c7b3 100644
--- a/fastlane/metadata/android/nl-NL/full_description.txt
+++ b/fastlane/metadata/android/nl-NL/full_description.txt
@@ -56,6 +56,9 @@ Als je een probleem hebt en erover denkt om contact met me op te nemen
 
 Donaties zijn zeker een goede, maar niet de enige manier om mij te motiveren :-)
 * Als je me wilt steunen, kun je ook een positieve review voor de app achterlaten op Google Play ( https://play.google.com/store/apps/details?id=com.jens.automation2 ).
-* Verder kan ik altijd hulp gebruiken bij het vertalen van de app. Engels, Duits en wat Spaans behoren tot mijn eigen vaardigheden. Maar al het andere is meer dan welkom.
+* Als de app u bevalt, worden enkele warme woorden via e-mail altijd op prijs gesteld.
+* Verder kan ik altijd hulp gebruiken bij het vertalen van de app. Engels, Duits en wat Spaans behoren tot mijn eigen vaardigheden. Italiaans wordt al door iemand gedekt. Maar al het andere is meer dan welkom.
+* Als je talent/ervaring hebt in grafische vormgeving en ideeën hebt voor mooiere iconen, laat het me weten.
+* Als u een interessante use-case heeft of een manier om triggers en acties te combineren om iets intrigerends te bereiken en u denkt dat het de moeite waard is om het op de voorbeelden pagina te zetten (https://server47.de/automation/examples.html), laat het me weten.
 
 Uitleg van de vele permissies vind je hier (Engels) : https://server47.de/automation/permissions.php
\ No newline at end of file

From 2361c758c9e8899be9885ba3f9e5ad3c1abfab58 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Mon, 6 Jun 2022 20:06:11 +0200
Subject: [PATCH 09/10] 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<String>(this, R.layout.text_view_for_poi_listview_mediumtextsize, ActivityManageActionSendBroadcast.supportedIntentTypes);
         spinnerParameterType.setAdapter(intentTypeSpinnerAdapter);
         intentTypeSpinnerAdapter.notifyDataSetChanged();
+        intentPairAdapter = new ArrayAdapter<String>(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<params.length; i++)
-                    {
-                        if(lvIntentPairs.getVisibility() != View.VISIBLE)
-                            lvIntentPairs.setVisibility(View.VISIBLE);
-
-                        intentPairList.add(params[i]);
-                    }
-
-                    updateIntentPairList();
+                    intentPairList.add(params[i]);
                 }
+
+                updateIntentPairList();
             }
         }
 

From 5272b56032f11a9f6790980776f90b5990ea9867 Mon Sep 17 00:00:00 2001
From: jens <android-development@gmx.de>
Date: Tue, 7 Jun 2022 17:18:35 +0200
Subject: [PATCH 10/10] send broadcast with intents

---
 .../java/com/jens/automation2/Action.java     |   4 +
 .../java/com/jens/automation2/Actions.java    | 175 +++++++++---------
 2 files changed, 94 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/Action.java b/app/src/main/java/com/jens/automation2/Action.java
index 351b80ba..ff8b1e14 100644
--- a/app/src/main/java/com/jens/automation2/Action.java
+++ b/app/src/main/java/com/jens/automation2/Action.java
@@ -368,6 +368,10 @@ public class Action
 						returnString.append(Miscellaneous.getAnyContext().getResources().getString(R.string.unknown));
 				}
 			}
+			else if(this.getAction().equals(Action_Enum.sendBroadcast))
+			{
+				returnString.append(": " + parameter2.replace(Action.actionParameter2Split, "; ").replace(Action.intentPairSeparator, "/"));
+			}
 			else if (parameter2 != null && parameter2.length() > 0)
 				returnString.append(": " + parameter2.replace(Action.actionParameter2Split, "; "));
 		}
diff --git a/app/src/main/java/com/jens/automation2/Actions.java b/app/src/main/java/com/jens/automation2/Actions.java
index 4375ff49..535cd44b 100644
--- a/app/src/main/java/com/jens/automation2/Actions.java
+++ b/app/src/main/java/com/jens/automation2/Actions.java
@@ -202,7 +202,9 @@ public class Actions
 		{
 			String[] parts = action.split(Action.actionParameter2Split);
 			broadcastIntent.setAction(parts[0]);
-			add params
+
+			String[] intentparts = parts[1].split(";");
+			broadcastIntent = packParametersIntoIntent(broadcastIntent, intentparts, 0);
 		}
 		else
 			broadcastIntent.setAction(action);
@@ -1017,8 +1019,6 @@ public class Actions
 		{
 			Intent externalActivityIntent;
 
-			int paramsStartIndex;
-
 			if (!startByAction)
 			{
 				// selected by activity
@@ -1030,8 +1030,6 @@ public class Actions
 
 				Miscellaneous.logEvent("i", "StartOtherApp", "Starting app by activity: " + packageName + " " + className, 3);
 
-				paramsStartIndex = 2;
-
 				externalActivityIntent = new Intent(Intent.ACTION_MAIN);
 				externalActivityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
 
@@ -1059,86 +1057,7 @@ public class Actions
 			externalActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
 			// Pack intents
-			for (int i = 3; i < params.length; i++)
-			{
-				String[] singleParam = params[i].split(Action.intentPairSeparator);
-
-    			/*Class c = Class.forName(singleParam[0]);
-				for(Method m : c.getMethods())
-				{
-					if(m.getName().startsWith("parse"))
-					{
-						Object o = m.invoke(null, singleParam[0]);
-						externalActivityIntent.putExtra(singleParam[1], o);
-					}
-				}*/
-
-				if (singleParam[0].equals("boolean"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Boolean.parseBoolean(singleParam[2]));
-				}
-				else if (singleParam[0].equals("byte"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Byte.parseByte(singleParam[2]));
-				}
-				else if (singleParam[0].equals("char"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], singleParam[2].charAt(0));
-				}
-				else if (singleParam[0].equals("CharSequence"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], (CharSequence) singleParam[2]);
-				}
-				else if (singleParam[0].equals("double"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Double.parseDouble(singleParam[2]));
-				}
-				else if (singleParam[0].equals("float"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Float.parseFloat(singleParam[2]));
-				}
-				else if (singleParam[0].equals("int"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Integer.parseInt(singleParam[2]));
-				}
-				else if (singleParam[0].equals("long"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Long.parseLong(singleParam[2]));
-				}
-				else if (singleParam[0].equals("short"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], Short.parseShort(singleParam[2]));
-				}
-				else if (singleParam[0].equals("Uri"))
-				{
-					if (singleParam[1].equalsIgnoreCase("IntentData"))
-					{
-						Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with value " + singleParam[2] + " as standard data parameter.", 3);
-						externalActivityIntent.setData(Uri.parse(singleParam[2]));
-					}
-					else
-					{
-						Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-						externalActivityIntent.putExtra(singleParam[1], Uri.parse(singleParam[2]));
-					}
-				}
-				else if (singleParam[0].equals("String"))
-				{
-					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
-					externalActivityIntent.putExtra(singleParam[1], singleParam[2]);
-				}
-				else
-					Miscellaneous.logEvent("w", "StartOtherApp", "Unknown type of parameter " + singleParam[0] + " found.  Name " + singleParam[1] + " and value " + singleParam[2], 3);
-			}
+			externalActivityIntent = packParametersIntoIntent(externalActivityIntent, params, 3);
 
 			if (params[2].equals(ActivityManageActionStartActivity.startByActivityString))
 				automationServerRef.startActivity(externalActivityIntent);
@@ -1152,6 +1071,92 @@ public class Actions
 		}
 	}
 
+	public static Intent packParametersIntoIntent(Intent intent, String[] params, int startIndex)
+	{
+		for (int i = startIndex; i < params.length; i++)
+		{
+			String[] singleParam = params[i].split(Action.intentPairSeparator);
+
+    			/*Class c = Class.forName(singleParam[0]);
+				for(Method m : c.getMethods())
+				{
+					if(m.getName().startsWith("parse"))
+					{
+						Object o = m.invoke(null, singleParam[0]);
+						externalActivityIntent.putExtra(singleParam[1], o);
+					}
+				}*/
+
+			if (singleParam[0].equals("boolean"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Boolean.parseBoolean(singleParam[2]));
+			}
+			else if (singleParam[0].equals("byte"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Byte.parseByte(singleParam[2]));
+			}
+			else if (singleParam[0].equals("char"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], singleParam[2].charAt(0));
+			}
+			else if (singleParam[0].equals("CharSequence"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], (CharSequence) singleParam[2]);
+			}
+			else if (singleParam[0].equals("double"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Double.parseDouble(singleParam[2]));
+			}
+			else if (singleParam[0].equals("float"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Float.parseFloat(singleParam[2]));
+			}
+			else if (singleParam[0].equals("int"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Integer.parseInt(singleParam[2]));
+			}
+			else if (singleParam[0].equals("long"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Long.parseLong(singleParam[2]));
+			}
+			else if (singleParam[0].equals("short"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], Short.parseShort(singleParam[2]));
+			}
+			else if (singleParam[0].equals("Uri"))
+			{
+				if (singleParam[1].equalsIgnoreCase("IntentData"))
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with value " + singleParam[2] + " as standard data parameter.", 3);
+					intent.setData(Uri.parse(singleParam[2]));
+				}
+				else
+				{
+					Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+					intent.putExtra(singleParam[1], Uri.parse(singleParam[2]));
+				}
+			}
+			else if (singleParam[0].equals("String"))
+			{
+				Miscellaneous.logEvent("i", "StartOtherApp", "Adding parameter of type " + singleParam[0] + " with name " + singleParam[1] + " and value " + singleParam[2], 3);
+				intent.putExtra(singleParam[1], singleParam[2]);
+			}
+			else
+				Miscellaneous.logEvent("w", "StartOtherApp", "Unknown type of parameter " + singleParam[0] + " found.  Name " + singleParam[1] + " and value " + singleParam[2], 3);
+		}
+
+		return intent;
+	}
+
 	public static void waitBeforeNextAction(Long waitTime)
 	{
 		Miscellaneous.logEvent("i", "waitBeforeNextAction", "waitBeforeNextAction for " + String.valueOf(waitTime) + " milliseconds.", 4);