From 862c6f2ea491bf13d77caf04c0b73f266d7ff92c Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@mailbox.org>
Date: Tue, 25 Feb 2020 20:30:04 -0600
Subject: [PATCH] work on mail settings

---
 src/communicatorutils/downloadblocks/__init__.py | 3 +--
 src/onionrutils/blockmetadata/process.py         | 8 ++++----
 static-data/default-plugins/pms/main.py          | 3 +++
 static-data/default_config.json                  | 4 ++--
 tests/runtime-result.txt                         | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/communicatorutils/downloadblocks/__init__.py b/src/communicatorutils/downloadblocks/__init__.py
index 7324c846..cfb280dc 100755
--- a/src/communicatorutils/downloadblocks/__init__.py
+++ b/src/communicatorutils/downloadblocks/__init__.py
@@ -117,6 +117,7 @@ def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"):
                             removeFromQueue = False
                         else:
                             blockmetadb.add_to_block_DB(blockHash, dataSaved=True) # add block to meta db
+                            blockmetadata.process_block_metadata(blockHash) # caches block metadata values to block database
                             spawn(
                                 local_command,
                                 f'/daemon-event/upload_event',
@@ -124,8 +125,6 @@ def download_blocks_from_communicator(comm_inst: "OnionrCommunicatorDaemon"):
                                 is_json=True,
                                 postData={'block': blockHash}
                             )
-
-                            blockmetadata.process_block_metadata(blockHash) # caches block metadata values to block database
                     else:
                         logger.warn('POW failed for block %s.' % (blockHash,))
                 else:
diff --git a/src/onionrutils/blockmetadata/process.py b/src/onionrutils/blockmetadata/process.py
index a144e5b9..2290fac1 100644
--- a/src/onionrutils/blockmetadata/process.py
+++ b/src/onionrutils/blockmetadata/process.py
@@ -31,14 +31,14 @@ from onionrutils import updater
 def process_block_metadata(blockHash: str):
     '''
         Read metadata from a block and cache it to the block database
-        
+
         blockHash -> sha3_256 hex formatted hash of Onionr block
     '''
     curTime = epoch.get_rounded_epoch(roundS=60)
     myBlock = onionrblockapi.Block(blockHash)
     if myBlock.isEncrypted:
-        myBlock.decrypt()
-    if (myBlock.isEncrypted and myBlock.decrypted) or (not myBlock.isEncrypted):
+        print(myBlock.hash, myBlock.decrypt())
+    if myBlock.decrypted or not myBlock.isEncrypted:
         blockType = myBlock.getMetadata('type') # we would use myBlock.getType() here, but it is bugged with encrypted blocks
 
         signer = bytesconverter.bytes_to_str(myBlock.signer)
@@ -49,7 +49,7 @@ def process_block_metadata(blockHash: str):
                     onionrusers.OnionrUser(signer).addForwardKey(myBlock.getMetadata('newFSKey'))
                 except onionrexceptions.InvalidPubkey:
                     logger.warn('%s has invalid forward secrecy key to add: %s' % (signer, myBlock.getMetadata('newFSKey')))
-            
+
         try:
             if len(blockType) <= onionrvalues.MAX_BLOCK_TYPE_LENGTH:
                 blockmetadb.update_block_info(blockHash, 'dataType', blockType)
diff --git a/static-data/default-plugins/pms/main.py b/static-data/default-plugins/pms/main.py
index da2e0b2e..73e15fd5 100755
--- a/static-data/default-plugins/pms/main.py
+++ b/static-data/default-plugins/pms/main.py
@@ -59,6 +59,7 @@ def on_insertblock(api, data={}):
 
 
 def on_processblocks(api, data=None):
+    print('mail got block', data)
     if data['type'] != 'pm':
         return
     data['block'].decrypt()
@@ -72,6 +73,8 @@ def on_processblocks(api, data=None):
     else:
         signer = signer[:5]
 
+    print('detected mail', data['block'].hash)
     if data['block'].decrypted:
+        config.reload()
         if config.get('mail.notificationSetting', True):
             notifier.notification_with_sound(title="Onionr Mail - New Message", message="From: %s\n\nSubject: %s" % (signer, metadata['subject']))
diff --git a/static-data/default_config.json b/static-data/default_config.json
index 38d09d2b..c2925182 100755
--- a/static-data/default_config.json
+++ b/static-data/default_config.json
@@ -19,7 +19,7 @@
         "minimum_send_pow": 4,
         "public_key": "",
         "random_bind_ip": false,
-        "security_level": 0,
+        "security_level": 1,
         "show_notifications": true,
         "socket_servers": false,
         "store_plaintext_blocks": true,
@@ -72,4 +72,4 @@
     "ui": {
         "theme": "dark"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/runtime-result.txt b/tests/runtime-result.txt
index d38cab30..5ef70e2d 100644
--- a/tests/runtime-result.txt
+++ b/tests/runtime-result.txt
@@ -1 +1 @@
-1582370175
\ No newline at end of file
+1582445602
\ No newline at end of file