1

Author: loutskiy

installer/macOS/KeyChain Installer.xcodeproj/project.pbxproj

@@ -422,6 +422,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.array.Keychain-Uninstaller";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -444,6 +445,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.array.Keychain-Uninstaller";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

keychain_lib/src/keychain.cpp

@@ -48,7 +48,7 @@ keychain::keychain()
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto key_dir = bfs::path(getenv("HOME"));
-  key_dir += bfs::path("/"KEY_DEFAULT_PATH_);
+  key_dir += bfs::path("/" KEY_DEFAULT_PATH_);
 #else
   bfs::path key_dir(KEY_DEFAULT_PATH_);
 #endif
@@ -141,4 +141,4 @@ void keychain_app::secure_dlg_mod_base::connect(keychain_app::keychain_base &key
 void keychain_app::gui_mod_base::connect(keychain_app::keychain_base &keychain_) const
 {
   keychain_.select_key.connect(std::bind(&gui_mod_base::select_key, this));
-}
+}

keychain_lib/src/keychain_logger.cpp

@@ -20,7 +20,7 @@ logger_singleton::logger_singleton(std::string postfix)
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
     auto dir = bfs::path(getenv("HOME"));
-    dir += bfs::path("/"LOG_DEFAULT_PATH);
+    dir += bfs::path("/" LOG_DEFAULT_PATH);
 #else
   bfs::path dir(LOG_DEFAULT_PATH);
 #endif

keychain_lib/src/keyfile_singleton.cpp

@@ -47,7 +47,7 @@ void keyfile_singleton::keydata_load()
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto key_dir = bfs::path(getenv("HOME"));
-  key_dir += bfs::path("/"KEY_DEFAULT_PATH_);
+  key_dir += bfs::path("/" KEY_DEFAULT_PATH_);
 #else
   bfs::path key_dir(KEY_DEFAULT_PATH_);
 #endif
@@ -80,7 +80,7 @@ void keyfile_singleton::signlog_load()
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto dir = bfs::path(getenv("HOME"));
-  dir += bfs::path("/"SIGN_LOGS_DEFAULT_PATH_);
+  dir += bfs::path("/" SIGN_LOGS_DEFAULT_PATH_);
 #else
   bfs::path dir(SIGN_LOGS_DEFAULT_PATH_);
 #endif
@@ -263,7 +263,7 @@ void keyfile_singleton::flush_keyfile_impl(const value_t& keyfile_data) const
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto filepath = bfs::path(getenv("HOME"));
-  filepath += bfs::path("/"KEY_DEFAULT_PATH_"/");
+  filepath += bfs::path("/" KEY_DEFAULT_PATH_"/");
 #else
   bfs::path filepath(KEY_DEFAULT_PATH_"/");
 #endif
@@ -310,7 +310,7 @@ void keyfile_singleton::flush_all() const
 {
 #if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
   auto keyfile_dir = bfs::path(getenv("HOME"));
-  keyfile_dir += bfs::path("/"KEY_DEFAULT_PATH_);
+  keyfile_dir += bfs::path("/" KEY_DEFAULT_PATH_);
 #else
   bfs::path keyfile_dir(KEY_DEFAULT_PATH_);
 #endif

keymanager_mac/KeyManager.xcodeproj/project.pbxproj

@@ -476,6 +476,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-std=c++14",
@@ -548,6 +549,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-std=c++14",

keymanager_mac/KeyManager/CPlusPlusBridger.mm

@@ -56,6 +56,7 @@ - (void) reloadData {
 - (void) deleteKey:(NSString *)publicKey {
     auto& keyfiles = keyfile_singleton::instance();
     auto pkey = dev::Public([publicKey UTF8String]);
+//    keyfiles.remove(pkey, std::bind(&remove_unlock))
 //    keyfiles.remove(pkey, std::bind(&remove_unlock, my_unlock_functor));
 }
 
@@ -65,6 +66,7 @@ - (void) deleteKey:(NSString *)publicKey {
     NSLog(@"publicKey %@", publicKey);
     printf("%s", [publicKey UTF8String]);
     auto pkey = dev::Public([publicKey UTF8String]);
+    try {
     auto& logs = keyfiles.get_logs(pkey);
     for (NSUInteger i = 0; i < std::distance(logs.begin(), logs.end()); i++) {
         auto& log = logs[i];
@@ -96,6 +98,9 @@ - (void) deleteKey:(NSString *)publicKey {
 //        logItem.transaction = log.transaction;
         [logsArray addObject:logItem];
     }
+    } catch (fc_light::exception& e) {
+        NSLog(@"%@", [NSString stringWithUTF8String: e.to_detail_json_string().c_str()]);
+    }
     return logsArray;
 }
 

keymanager_mac/KeyManager/ViewController.swift

@@ -86,6 +86,7 @@ class ViewController: NSViewController, NSTableViewDelegate, NSTableViewDataSour
             }
         } else if tableView == self.transactionTableView {
             if selectedPublicKey != "" {
+                print("self.transactionTableView")
                 let log = CPlusPlusBridger().getTransactionLog(forPublicKey: selectedPublicKey)
             }
         }
@@ -98,6 +99,7 @@ class ViewController: NSViewController, NSTableViewDelegate, NSTableViewDataSour
             return CPlusPlusBridger().getKeyfilesCount()
         } else {
             if selectedPublicKey != "" {
+                print("numberOfRows")
                 return CPlusPlusBridger().getTransactionLog(forPublicKey: selectedPublicKey).count
             } else {
                 return 0