Merge pull request #67 from italia/bugfixing

Added log collection and cleaning features together with the option to hide or show the CIE ID tutorial at launch.

CIE ID/AppDelegate.m

@@ -18,6 +18,19 @@
 #include "../cie-pkcs11/Crypto/CryptoUtil.h"
 #include "../cie-pkcs11/Util/UUCProperties.h"
 
+USING_NAMESPACE(CryptoPP);
+#import "PreferencesManager.h"
+#import "MainViewController.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>    //strlen
+#include <sys/socket.h>
+#include <arpa/inet.h>    //inet_addr
+#include <unistd.h>    //write
+#include "../cie-pkcs11/Crypto/CryptoUtil.h"
+#include "../cie-pkcs11/Util/UUCProperties.h"
+
 USING_NAMESPACE(CryptoPP);
 
 @interface AppDelegate ()
@@ -26,6 +39,7 @@ @interface AppDelegate ()
 @property NSPopover* popover;
 @property NSTextField* messageLabel;
 @property PreferencesManager* prefManager;
+@property (strong, nonatomic) MainViewController *mainViewController;
 @end
 
 @implementation AppDelegate
@@ -49,8 +63,8 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
 - (BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {
     if ([[_prefManager getConfigKeyValue:@"RUN_IN_BACKGROUND"] isEqual: @"YES"]) {
-        if (!([NSApp activationPolicy] == NSApplicationActivationPolicyAccessory))
-            [self switchToBackgroundMode];
+        if (([NSApp activationPolicy] == NSApplicationActivationPolicyRegular))
+            [NSApp unhide: NSApplication.sharedApplication];
         return NO;
     } else {
         return YES;
@@ -68,8 +82,12 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     _prefManager = [[PreferencesManager alloc] init];
     _closeAppFromStatusBar = NO;
 
+    _prefManager = [[PreferencesManager alloc] init];
+    _closeAppFromStatusBar = NO;
+
     if ([NSRunningApplication runningApplicationsWithBundleIdentifier: NSBundle.mainBundle.bundleIdentifier].count > 1)
     {
+        _closeAppFromStatusBar = YES;
         _closeAppFromStatusBar = YES;
         [NSApplication.sharedApplication terminate:self];
     }
@@ -99,7 +117,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
 - (IBAction)openCIEID:(id)sender {
     [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
-    [NSApp unhide: NSApplication.sharedApplication];
+    [[NSApplication sharedApplication] unhide:nil];
 }
 
 - (IBAction)killCIEID:(id)sender {

CIE ID/AppLogger.m

@@ -76,8 +76,8 @@ - (void)log:(NSString *)message withMessageLevel:(AppLogLevel)messageLevel {
 - (void)writeToLogFile:(NSString *)message {
     NSDate *date;
     NSDateFormatter *dateFormatter;
-    NSFileManager *fileManager;
     NSString *currentDate;
+    NSString *logFolder;
     NSString *logFilePath;
     NSString *timestamp;
     NSString *timestampedMessage;
@@ -88,12 +88,15 @@ - (void)writeToLogFile:(NSString *)message {
     currentDate = [dateFormatter stringFromDate:date];
     [dateFormatter setDateFormat:@"YYYY-MM-dd HH:mm:ss"];
     timestamp = [dateFormatter stringFromDate:date];
-    logFilePath = [NSString stringWithFormat:@"%@/.CIEPKI/CIEID_%@.log",
-                                                        NSHomeDirectory(),
+    logFolder = [[[[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.it.ipzs.SoftwareCIE"] path] stringByAppendingString:@"/Library/Caches/CIEPKI/"];
+    logFilePath = [NSString stringWithFormat:@"%@CIEID_%@.log",
+                                                        logFolder,
                                                         currentDate];
 
+
     timestampedMessage = [NSString stringWithFormat:@"%@    %@", timestamp, message];
     NSLog(@"writeToLogFile:    logFilePath:%@    message:%@", logFilePath, timestampedMessage);
+    NSLog(@"writeToLogFile:    logFilePath:%@    message:%@", logFilePath, timestampedMessage);
     @try {
         // [timestampedMessage writeToFile:logFilePath atomically:YES encoding:NSUTF8StringEncoding error:nil];
         FILE *fp = fopen([logFilePath UTF8String], "a+");

CIE ID/Info.plist

@@ -39,6 +39,8 @@
 	<string>Copyright © 2018-2019 IPZS. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
+	<key>LSUIElement</key>
+	<true/>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>

CIE ID/IntroViewController.m

@@ -7,9 +7,11 @@
 //
 
 #import "IntroViewController.h"
+#import "PreferencesManager.h"
 
-@interface IntroViewController ()
 
+@interface IntroViewController ()
+@property PreferencesManager *prefManager;
 @end
 
 @implementation IntroViewController
@@ -19,7 +21,7 @@ - (void)viewDidLoad {
     // Do view setup here.
 
     //NSUserDefaults.standardUserDefaults
-
+    _prefManager = PreferencesManager.sharedInstance;
     self.preferredContentSize = self.view.frame.size;
 
     self.view.window.delegate = self;
@@ -42,8 +44,7 @@ - (IBAction)start:(id)sender
 {
     if(_checkDontShowAnymore.state == NSOnState)
     {
-        [NSUserDefaults.standardUserDefaults setObject:@"OK" forKey:@"dontShowIntro"];
-        [NSUserDefaults.standardUserDefaults synchronize];
+        [_prefManager setConfigKeyValue:@"SHOW_TUTORIAL": @"NO"];
     }
 
     [self dismissViewController:self];

CIE ID/MainViewController.h

@@ -83,6 +83,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak) IBOutlet NSButton *rbLoggingLibInfo;
 @property (weak) IBOutlet NSButton *rbLoggingLibDebug;
 @property (weak) IBOutlet NSButton *cbShouldRunInBackground;
+@property (weak) IBOutlet NSButton *cbShowTutorial;
+@property (weak) IBOutlet NSButton *collectLogButton;
+@property (weak) IBOutlet NSButton *deleteLogButton;
 
 @property AppLogLevel logLevelApp;
 @property AppLogLevel logLevelLib;