Test & Improve UI

4 files changed, 13 insertions, 11 deletions

diff --git a/src/gpg/function/GpgKeyManager.cpp b/src/gpg/function/GpgKeyManager.cpp
index 9e24b3d6..998c27a7 100644
--- a/src/gpg/function/GpgKeyManager.cpp
+++ b/src/gpg/function/GpgKeyManager.cpp
@@ -33,7 +33,7 @@
 bool GpgFrontend::GpgKeyManager::signKey(
     const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys,
     const std::string& uid,
-    const std::unique_ptr<boost::gregorian::date>& expires) {
+    const std::unique_ptr<boost::posix_time::ptime>& expires) {
   using namespace boost::posix_time;
 
   BasicOperator::GetInstance().SetSigners(keys);
@@ -44,7 +44,7 @@ bool GpgFrontend::GpgKeyManager::signKey(
   if (expires == nullptr)
     flags |= GPGME_KEYSIGN_NOEXPIRE;
   else
-    expires_time_t = to_time_t(ptime(*expires));
+    expires_time_t = to_time_t(*expires);
 
   auto err = check_gpg_error(gpgme_op_keysign(
       ctx, gpgme_key_t(target), uid.c_str(), expires_time_t, flags));
@@ -70,7 +70,7 @@ bool GpgFrontend::GpgKeyManager::revSign(
 
 bool GpgFrontend::GpgKeyManager::setExpire(
     const GpgFrontend::GpgKey& key, std::unique_ptr<GpgSubKey>& subkey,
-    std::unique_ptr<boost::gregorian::date>& expires) {
+    std::unique_ptr<boost::posix_time::ptime>& expires) {
   using namespace boost::posix_time;
 
   unsigned long expires_time = 0;
diff --git a/src/gpg/function/GpgKeyManager.h b/src/gpg/function/GpgKeyManager.h
index 2b07425c..01254962 100644
--- a/src/gpg/function/GpgKeyManager.h
+++ b/src/gpg/function/GpgKeyManager.h
@@ -41,13 +41,13 @@ class GpgKeyManager : public SingletonFunctionObject<GpgKeyManager> {
    * @return if successful
    */
   bool signKey(const GpgKey& target, KeyArgsList& keys, const std::string& uid,
-               const std::unique_ptr<boost::gregorian::date>& expires);
+               const std::unique_ptr<boost::posix_time::ptime>& expires);
 
   bool revSign(const GpgFrontend::GpgKey& key,
                const GpgFrontend::SignIdArgsListPtr& signature_id);
 
   bool setExpire(const GpgKey& key, std::unique_ptr<GpgSubKey>& subkey,
-                 std::unique_ptr<boost::gregorian::date>& expires);
+                 std::unique_ptr<boost::posix_time::ptime>& expires);
 
  private:
   GpgContext& ctx = GpgContext::GetInstance();
diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/gpg/function/GpgKeyOpera.cpp
index d0172a31..cdf5ab24 100644
--- a/src/gpg/function/GpgKeyOpera.cpp
+++ b/src/gpg/function/GpgKeyOpera.cpp
@@ -63,17 +63,19 @@ void GpgFrontend::GpgKeyOpera::DeleteKeys(
  */
 GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire(
     const GpgKey& key, const SubkeyId& subkey_fpr,
-    std::unique_ptr<boost::gregorian::date>& expires) {
+    std::unique_ptr<boost::posix_time::ptime>& expires) {
   unsigned long expires_time = 0;
+
+  LOG(INFO) << "expires" << *expires;
+
   if (expires != nullptr) {
     using namespace boost::posix_time;
     using namespace std::chrono;
-    expires_time = to_time_t(ptime(*expires)) -
-                   system_clock::to_time_t(system_clock::now());
+    expires_time =
+        to_time_t(*expires) - system_clock::to_time_t(system_clock::now());
   }
 
-  LOG(INFO) << "GpgFrontend::GpgKeyOpera::SetExpire" << key.id() << subkey_fpr
-            << expires_time;
+  LOG(INFO) << key.id() << subkey_fpr << expires_time;
 
   GpgError err;
   if (subkey_fpr.empty())
diff --git a/src/gpg/function/GpgKeyOpera.h b/src/gpg/function/GpgKeyOpera.h
index 568a125d..7decfd79 100644
--- a/src/gpg/function/GpgKeyOpera.h
+++ b/src/gpg/function/GpgKeyOpera.h
@@ -36,7 +36,7 @@ class GpgKeyOpera : public SingletonFunctionObject<GpgKeyOpera> {
   void DeleteKeys(KeyIdArgsListPtr key_ids);
 
   GpgError SetExpire(const GpgKey& key, const SubkeyId& subkey_fpr,
-                     std::unique_ptr<boost::gregorian::date>& expires);
+                     std::unique_ptr<boost::posix_time::ptime>& expires);
 
   static void GenerateRevokeCert(const GpgKey& key,
                                  const std::string& output_file_name);