From 1e7ccf520036fe141c8b122878ac90928237886b Mon Sep 17 00:00:00 2001 From: jens Date: Sun, 29 May 2022 13:57:47 +0200 Subject: [PATCH] not equals direction --- .../com/jens/automation2/ActivityControlCenter.java | 1 + .../ActivityManageActionCloseNotification.java | 6 +----- .../main/java/com/jens/automation2/Miscellaneous.java | 10 ++-------- app/src/main/java/com/jens/automation2/Trigger.java | 3 +++ app/src/main/res/values/strings.xml | 1 + 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java index 3020049..2453142 100644 --- a/app/src/main/java/com/jens/automation2/ActivityControlCenter.java +++ b/app/src/main/java/com/jens/automation2/ActivityControlCenter.java @@ -356,6 +356,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("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/ActivityManageActionCloseNotification.java b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java index 6af829b..ff44128 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageActionCloseNotification.java @@ -1,7 +1,5 @@ package com.jens.automation2; -import static com.jens.automation2.Trigger.triggerParameter2Split; - import android.app.Activity; import android.app.AlertDialog; import android.app.ProgressDialog; @@ -18,8 +16,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.ArrayAdapter; import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; @@ -49,7 +45,6 @@ public class ActivityManageActionCloseNotification extends Activity TextView tvSelectedApplication; private static List pInfos = null; - public static Trigger resultingTrigger; private static String[] directions; @@ -271,6 +266,7 @@ public class ActivityManageActionCloseNotification extends Activity directions = new String[] { getResources().getString(R.string.directionStringEquals), getResources().getString(R.string.directionStringContains), + getResources().getString(R.string.directionStringDoesNotContain), getResources().getString(R.string.directionStringStartsWith), getResources().getString(R.string.directionStringEndsWith), getResources().getString(R.string.directionStringNotEquals) diff --git a/app/src/main/java/com/jens/automation2/Miscellaneous.java b/app/src/main/java/com/jens/automation2/Miscellaneous.java index acfa9d2..c55297b 100644 --- a/app/src/main/java/com/jens/automation2/Miscellaneous.java +++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java @@ -481,6 +481,8 @@ public class Miscellaneous extends Service return !haystack.equalsIgnoreCase(needle); case Trigger.directionContains: return haystack.toLowerCase().contains(needle.toLowerCase()); + case Trigger.directionNotContains: + return !haystack.toLowerCase().contains(needle.toLowerCase()); case Trigger.directionStartsWith: return haystack.toLowerCase().startsWith(needle.toLowerCase()); case Trigger.directionEndsWith: @@ -710,14 +712,6 @@ public class Miscellaneous extends Service } }); -// alertDialog.setNegativeButton(context.getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() -// { -// public void onClick(DialogInterface dialog, int whichButton) -// { -// // Canceled. -// } -// }); - return alertDialog.create(); } diff --git a/app/src/main/java/com/jens/automation2/Trigger.java b/app/src/main/java/com/jens/automation2/Trigger.java index 6d2c085..47e109b 100644 --- a/app/src/main/java/com/jens/automation2/Trigger.java +++ b/app/src/main/java/com/jens/automation2/Trigger.java @@ -1646,6 +1646,7 @@ public class Trigger public static final String directionEquals = "eq"; public static final String directionContains = "ct"; + public static final String directionNotContains = "nc"; public static final String directionStartsWith = "sw"; public static final String directionEndsWith = "ew"; public static final String directionNotEquals = "ne"; @@ -1675,6 +1676,8 @@ public class Trigger return directionEquals; else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringContains))) return directionContains; + else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringDoesNotContain))) + return directionNotContains; else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringStartsWith))) return directionStartsWith; else if(direction.equalsIgnoreCase(Miscellaneous.getAnyContext().getString(R.string.directionStringEndsWith))) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 182e379..ba87f14 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -819,4 +819,5 @@ Send broadcast Enter a broadcast action. 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. + does not contain \ No newline at end of file