From d74e2eae687406c4edd478144eecd8f0a560c66a Mon Sep 17 00:00:00 2001
From: Jens <kLv61m3x>
Date: Wed, 17 Aug 2022 23:36:30 +0200
Subject: [PATCH] tethering type

---
 .../main/java/com/jens/automation2/Trigger.java    | 14 +++++++++++++-
 .../automation2/receivers/TetheringReceiver.java   | 14 ++++++++++++++
 build.gradle                                       |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/jens/automation2/Trigger.java b/app/src/main/java/com/jens/automation2/Trigger.java
index 2a060f2..d51ff34 100644
--- a/app/src/main/java/com/jens/automation2/Trigger.java
+++ b/app/src/main/java/com/jens/automation2/Trigger.java
@@ -977,7 +977,19 @@ public class Trigger
 
 	boolean checkTetheringActive()
 	{
-		return TetheringReceiver.isTetheringActive() == triggerParameter;
+		if(TetheringReceiver.isTetheringActive() == triggerParameter)
+		{
+			if(getTriggerParameter2().equals(ActivityManageTriggerTethering.tetheringTypeAny))
+				return true;
+
+			for(String oneOfLastTypes : TetheringReceiver.getLastTetheringTypes())
+			{
+				if(oneOfLastTypes.equals(getTriggerParameter2()))
+					return true;
+			}
+		}
+
+		return false;
 	}
 
 	public boolean checkDateTime(Object triggeringObject, boolean checkifStateChangedSinceLastRuleExecution)
diff --git a/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java b/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java
index 7f2b846..7cd6407 100644
--- a/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java
+++ b/app/src/main/java/com/jens/automation2/receivers/TetheringReceiver.java
@@ -12,6 +12,7 @@ import com.jens.automation2.Rule;
 import com.jens.automation2.Trigger;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class TetheringReceiver extends android.content.BroadcastReceiver implements AutomationListenerInterface
 {
@@ -20,8 +21,14 @@ public class TetheringReceiver extends android.content.BroadcastReceiver impleme
     private static TetheringReceiver receiverInstance = null;
     private static IntentFilter intentFilter = null;
 
+    private static List<String> lastTetheringTypes = null;
     private static boolean tetheringActive = false;
 
+    public static List<String> getLastTetheringTypes()
+    {
+        return lastTetheringTypes;
+    }
+
     public static TetheringReceiver getInstance()
     {
         if(receiverInstance == null)
@@ -53,7 +60,14 @@ public class TetheringReceiver extends android.content.BroadcastReceiver impleme
             if(key.equals(target) && ob instanceof ArrayList)
             {
                 if(((ArrayList<String>)ob).size() > 0)
+                {
                     tetheringActive = true;
+
+                    for(String adapterName : (ArrayList<String>)ob)
+                    {
+                        String test = adapterName;
+                    }
+                }
                 else
                     tetheringActive = false;
             }
diff --git a/build.gradle b/build.gradle
index 7778248..dad47d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files