From 62fad0497438f1a1681b2ff866dd6bfd94eae46b Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Thu, 17 Sep 2020 16:46:11 +0100
Subject: [PATCH] komrade update!

---
 bin/komrade-reset               | 4 ++--
 komrade/backend/crypt.py        | 8 ++++++++
 komrade/backend/keymaker.py     | 5 +++--
 komrade/backend/the_operator.py | 9 ++++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/bin/komrade-reset b/bin/komrade-reset
index 315b565..8535690 100755
--- a/bin/komrade-reset
+++ b/bin/komrade-reset
@@ -12,6 +12,6 @@ if [ ! "$y_n" = "y" ]; then
     echo "Cancelling"
 else
     rm -r $path
-    echo "Reregistering..."
-    komrade-cli /register
+    #echo "Reregistering..."
+    #komrade-cli /register
 fi
\ No newline at end of file
diff --git a/komrade/backend/crypt.py b/komrade/backend/crypt.py
index 846991b..e725564 100644
--- a/komrade/backend/crypt.py
+++ b/komrade/backend/crypt.py
@@ -166,6 +166,14 @@ class CryptList(Crypt):  # like inbox
         self.prefix=prefix
         self.encryptor_func=encryptor_func
         self.decryptor_func=decryptor_func
+
+    def __repr__(self):
+        return f"""
+(CryptList)
+val_b_encr = {self.val_b_encr}
+val_b = {self.val_b}
+values = {self.values}
+        """
     
     @property
     def val_b_encr(self):
diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py
index e14e7cb..8f5b6a1 100644
--- a/komrade/backend/keymaker.py
+++ b/komrade/backend/keymaker.py
@@ -228,9 +228,10 @@ KEYMAKER_DEFAULT_KEY_TYPES = {
 
 def get_key_obj(keyname,data,key_types=KEYMAKER_DEFAULT_KEY_TYPES):
     if keyname.endswith('_decr'):
+        # print('get_key_obj',keyname,data)#,key_types)
         try:
             data_s = data.decode()
-            if data_s == KEY_TYPE_SYMMETRIC_WITH_PASSPHRASE:
+            if data_s in {KEY_TYPE_SYMMETRIC_WITH_PASSPHRASE,KomradeSymmetricKeyWithPassphrase.__name__}:
                 return KomradeSymmetricKeyWithPassphrase()
         except UnicodeDecodeError:
             return KomradeSymmetricKeyWithoutPassphrase(data)
@@ -505,7 +506,7 @@ class Keymaker(Logger):
                     encr_key = decr_key.encrypt(unencr_key.data)
                     keychain[encr_key_name] = get_key_obj(encr_key_name,encr_key)
             except ThemisError as e:
-                exit('Incorrect password.')
+                #exit('Incorrect password.')
                 #self.log('error!!',e,decrypt,decr_key,encr_key,decr_key_name,encr_key_name)
                 pass
 
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index df0b94c..c0ee513 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -519,7 +519,14 @@ class TheOperator(Operator):
 
         # (1) get inbox
         self.log('uri??',uri,msg_to_op.msg_d)
-        res_inbox=self.get_inbox(uri)
+        # res_inbox=self.get_inbox(uri)
+        inbox=self.get_inbox_crypt(
+            uri=inbox_uri,
+        )
+        self.log('<-- inbox crypt',inbox)
+        self.log('<-- inbox crypt values',inbox.values)
+
+        
         self.log('res_inbox<--',res_inbox)
         if not res_inbox.get('success'): return res_inbox
         inbox=res_inbox.get('inbox',[])