Fix DelegateProxy bug (#32)

henrimagi · web-flow · commit 0341b768dd99 · 2020-11-21T10:56:30.000+02:00
diff --git a/Sources/Runtime/ObjcDelegateProxy.m b/Sources/Runtime/ObjcDelegateProxy.m
@@ -10,18 +10,23 @@
 #import "include/ObjcDelegateProxy.h"
 #import <objc/runtime.h>
 
-static NSSet <NSValue *> *selectors;
+#define OBJECT_VALUE(object) [NSValue valueWithNonretainedObject:(object)]
+
+static NSMutableDictionary<NSValue *, NSSet<NSValue *> *> *allSelectors;
 
 @implementation ObjcDelegateProxy
 
 - (NSSet *)selectors {
-    return selectors;
+    return allSelectors[OBJECT_VALUE(self.class)];
 }
 
 + (void)initialize
 {
     @synchronized (ObjcDelegateProxy.class) {
-        selectors = [self selectorsOfClass:self
+        if (!allSelectors) {
+            allSelectors = [NSMutableDictionary new];
+        }
+        allSelectors[OBJECT_VALUE(self)] = [self selectorsOfClass:self
                      withEncodedReturnType:[NSString stringWithFormat:@"%s", @encode(void)]];
     }
 }
@@ -31,7 +36,7 @@ - (BOOL)respondsToSelector:(SEL _Nonnull)aSelector {
 }
 
 - (BOOL)canRespondToSelector:(SEL _Nonnull)selector {
-    for (id current in selectors) {
+    for (id current in allSelectors[OBJECT_VALUE(self.class)]) {
         if (selector == (SEL) [current pointerValue]) {
             return true;
         }

Original file line number	Diff line number	Diff line change
`@@ -10,18 +10,23 @@`
`10`	`10`	`#import "include/ObjcDelegateProxy.h"`
`11`	`11`	`#import <objc/runtime.h>`
`12`	`12`
`13`		`-static NSSet <NSValue > selectors;`
	`13`	`+#define OBJECT_VALUE(object) [NSValue valueWithNonretainedObject:(object)]`
	`14`	`+`
	`15`	`+static NSMutableDictionary<NSValue , NSSet<NSValue > > allSelectors;`
`14`	`16`
`15`	`17`	`@implementation ObjcDelegateProxy`
`16`	`18`
`17`	`19`	`- (NSSet *)selectors {`
`18`		`- return selectors;`
	`20`	`+ return allSelectors[OBJECT_VALUE(self.class)];`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`+ (void)initialize`
`22`	`24`	`{`
`23`	`25`	`@synchronized (ObjcDelegateProxy.class) {`
`24`		`- selectors = [self selectorsOfClass:self`
	`26`	`+ if (!allSelectors) {`
	`27`	`+ allSelectors = [NSMutableDictionary new];`
	`28`	`+ }`
	`29`	`+ allSelectors[OBJECT_VALUE(self)] = [self selectorsOfClass:self`
`25`	`30`	`withEncodedReturnType:[NSString stringWithFormat:@"%s", @encode(void)]];`
`26`	`31`	`}`
`27`	`32`	`}`
`@@ -31,7 +36,7 @@ - (BOOL)respondsToSelector:(SEL _Nonnull)aSelector {`
`31`	`36`	`}`
`32`	`37`
`33`	`38`	`- (BOOL)canRespondToSelector:(SEL _Nonnull)selector {`
`34`		`- for (id current in selectors) {`
	`39`	`+ for (id current in allSelectors[OBJECT_VALUE(self.class)]) {`
`35`	`40`	`if (selector == (SEL) [current pointerValue]) {`
`36`	`41`	`return true;`
`37`	`42`	`}`