dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed default expiration not using sum of date and made mail ui show inbox after closing message draft dialog

master
Kevin Froman 2019-04-13 17:18:38 -05:00
parent 96219c81ab
commit 9ee31684f6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
onionr/onionrutils.py
View File

@ -157,6 +157,7 @@ class OnionrUtils:
''' '''
Read metadata from a block and cache it to the block database Read metadata from a block and cache it to the block database
''' '''
curTime = self.getRoundedEpoch(roundS=60)
myBlock = Block(blockHash, self._core) myBlock = Block(blockHash, self._core)
if myBlock.isEncrypted: if myBlock.isEncrypted:
myBlock.decrypt() myBlock.decrypt()
@ -179,7 +180,7 @@ class OnionrUtils:
expireTime = myBlock.getHeader('expire') expireTime = myBlock.getHeader('expire')
assert len(str(int(expireTime))) < 20 # test that expire time is an integer of sane length (for epoch) assert len(str(int(expireTime))) < 20 # test that expire time is an integer of sane length (for epoch)
except (AssertionError, ValueError, TypeError) as e: except (AssertionError, ValueError, TypeError) as e:
expireTime = onionrvalues.OnionrValues().default_expire expireTime = onionrvalues.OnionrValues().default_expire + curTime
finally: finally:
self._core.updateBlockInfo(blockHash, 'expire', expireTime) self._core.updateBlockInfo(blockHash, 'expire', expireTime)
if not blockType is None: if not blockType is None:

1
onionr/static-data/www/mail/mail.js
View File

@ -89,6 +89,7 @@ function setActiveTab(tabName){
break break
case 'send message': case 'send message':
overlay('sendMessage') overlay('sendMessage')
setActiveTab('inbox')
break break
} }
} }