fix for #662

fixed bug in rule exportation
objective-see · Dec 19, 2024 · d3f69ac · d3f69ac
1 parent b748482
commit d3f69ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/LuLu/App/AppDelegate.m b/LuLu/App/AppDelegate.m
@@ -426,15 +426,6 @@ -(void)makeActive:(NSWindowController*)windowController
     //make foreground
     [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
 
-    //center
-    [windowController.window center];
-
-    //show it
-    [windowController showWindow:self];
-
-    //make it key window
-    [[windowController window] makeKeyAndOrderFront:self];
-
     //activate
     if(@available(macOS 14.0, *)) {
         [NSApp activate];
@@ -444,6 +435,15 @@ -(void)makeActive:(NSWindowController*)windowController
         [NSApp activateIgnoringOtherApps:YES];
     }
 
+    //make it key window
+    [windowController.window makeKeyAndOrderFront:self];
+
+    //center
+    [windowController.window center];
+
+    //show it
+    [windowController showWindow:self];
+
     return;
 }
 

diff --git a/LuLu/Shared/Rule.m b/LuLu/Shared/Rule.m
@@ -469,13 +469,13 @@ -(NSMutableString*)toJSON
     //creation
     if(nil != self.creation)
     {
-        [json appendFormat:@"\"%@\" : %@,", NSStringFromSelector(@selector(creation)), [dateFormatter stringFromDate:self.creation]];
+        [json appendFormat:@"\"%@\" : \"%@\",", NSStringFromSelector(@selector(creation)), [dateFormatter stringFromDate:self.creation]];
     }
 
     //expiration
     if(nil != self.expiration)
     {
-        [json appendFormat:@"\"%@\" : %@,", NSStringFromSelector(@selector(creation)), [dateFormatter stringFromDate:self.expiration]];
+        [json appendFormat:@"\"%@\" : \"%@\",", NSStringFromSelector(@selector(creation)), [dateFormatter stringFromDate:self.expiration]];
     }
 
     [json appendFormat:@"\"%@\" : \"%@\",", NSStringFromSelector(@selector(endpointPort)), self.endpointPort];