From fe68c6b937d194cb82f317902afdd403c04b4d84 Mon Sep 17 00:00:00 2001
From: Andreas Fertig <mail@andyf.de>
Date: Sat, 15 Apr 2017 20:09:09 +0200
Subject: [PATCH] add any additional monitor to monitor evidence source

---
 Resources/de.lproj/Localizable.strings | Bin 123054 -> 123224 bytes
 Resources/en.lproj/Localizable.strings | Bin 120968 -> 121124 bytes
 Source/MonitorEvidenceSource.m         |  25 +++++++++++++++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index 0d87860b28073b2e8e6bd694febe814763656a30..3ef2b707d19c7907a51ede8ffbe7e8b41f338ffb 100644
GIT binary patch
delta 123
zcmZ2?kp0FX_6@s41k)K(8A=#}8A=(_fiRV!c=AOaaoIeEN(KdnM1~X~%mm73GUPMl
z0r@#V(cH;rUyI9o0oA4h`I!vK3>iRn5m2TaNP|=Zd6V-+q$mG)%{MuLoo%|p9Y&4j
NM<UxFi7=iy4FD{HBa;9C

delta 23
fcmca{h<)8b_6@s4rtkA-)M)Mz-QFY0c;++!geVGk

diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 6c273948acd44301fbb9137d6a11bb384ab98ab4..20b666b1d5d8855109a7e26e6031d67e76e566a9 100644
GIT binary patch
delta 116
zcmeC!$i8F~`-UtL!E}aHh7yKghEj%fAWUT_p1#qVQB>ZMA&;SwL4hHWAq5CCfl4wN
n@_}NB3^_p2+{udKlCt<!c#BI<Kd_EbuX&Ql_DLd)-wp!+b%h;c

delta 23
fcmZ3oiM?YZ`-Uu$=@+grYBcMKZr2lK{B{@scc2NX

diff --git a/Source/MonitorEvidenceSource.m b/Source/MonitorEvidenceSource.m
index 00004d52a..3b404ac45 100644
--- a/Source/MonitorEvidenceSource.m
+++ b/Source/MonitorEvidenceSource.m
@@ -11,6 +11,8 @@
 
 @implementation MonitorEvidenceSource
 
+#define ANY_ADDITIONAL_MONITOR_SERIAL @"any-additional-monitor"
+
 - (id)init
 {
 	if (!(self = [super init]))
@@ -113,12 +115,16 @@ - (BOOL)doesRuleMatch:(NSDictionary *)rule
 	NSEnumerator *en = [monitors objectEnumerator];
 	NSDictionary *mon;
 	NSString *serial = [rule valueForKey:@"parameter"];
-	while ((mon = [en nextObject])) {
-		if ([[mon valueForKey:@"serial"] isEqualToString:serial]) {
-			match = YES;
-			break;
-		}
-	}
+    if ((1 < [monitors count]) && [serial isEqualToString:ANY_ADDITIONAL_MONITOR_SERIAL]) {
+        match = YES;
+    } else {
+        while ((mon = [en nextObject])) {
+            if ([[mon valueForKey:@"serial"] isEqualToString:serial]) {
+                match = YES;
+                break;
+            }
+        }
+    }
 	[lock unlock];
 
 	return match;
@@ -135,6 +141,13 @@ - (NSArray *)getSuggestions
 
 	[lock lock];
 	NSEnumerator *en = [monitors objectEnumerator];
+
+    // add any monitor by default
+    [arr addObject:[NSDictionary dictionaryWithObjectsAndKeys:
+                    @"Monitor", @"type",
+                    ANY_ADDITIONAL_MONITOR_SERIAL, @"parameter",
+                    NSLocalizedString(@"Any additional monitor", @"In getSuggestions"), @"description", nil]];
+
 	NSDictionary *mon;
 	while ((mon = [en nextObject])) {
 		NSString *name = [mon valueForKey:@"name"];