Bitmessage/PyBitmessage-2024-12-09
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge pull request #72 from navjotcis/newwork

Browse Source 
fixed search issue in myaddress
This commit is contained in:
navjotcis 2020-01-13 17:16:11 +05:30 committed by GitHub
commit b24d34f153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bitmessagekivy/mpybit.py
View File

@ -1574,6 +1574,7 @@ class NavigateApp(App): # pylint: disable=too-many-public-methods
def closeSearchScreen(self): def closeSearchScreen(self):
"""Function for close search screen""" """Function for close search screen"""
self.set_common_header() self.set_common_header()
if state.association:
address_label = self.current_address_label( address_label = self.current_address_label(
BMConfigParser().get( BMConfigParser().get(
state.association, 'label'), state.association) state.association, 'label'), state.association)
@ -1662,8 +1663,12 @@ class NavigateApp(App): # pylint: disable=too-many-public-methods
self.root.ids.sc1.loadMessagelist(state.association) self.root.ids.sc1.loadMessagelist(state.association)
self.root.ids.sc1.children[1].active = False self.root.ids.sc1.children[1].active = False
elif instance.text == 'All Mails': elif instance.text == 'All Mails':
if len(self.root.ids.sc17.ids.ml.children) <= 2:
self.root.ids.sc17.clear_widgets() self.root.ids.sc17.clear_widgets()
self.root.ids.sc17.add_widget(Allmails()) self.root.ids.sc17.add_widget(Allmails())
else:
self.root.ids.sc17.ids.ml.clear_widgets()
self.root.ids.sc17.loadMessagelist()
try: try:
self.root.ids.sc17.children[1].active = False self.root.ids.sc17.children[1].active = False
except Exception: except Exception:
@ -1860,10 +1865,6 @@ class MailDetail(Screen):
self.message = data[0][3] self.message = data[0][3]
if len(data[0]) == 6: if len(data[0]) == 6:
self.status = data[0][4] self.status = data[0][4]
state.write_msg = {'to_addr': self.to_addr,
'from_addr': self.from_addr,
'subject': self.subject,
'message': self.message}
def delete_mail(self): def delete_mail(self):
"""Method for mail delete""" """Method for mail delete"""
@ -1945,14 +1946,16 @@ class MailDetail(Screen):
def write_msg(self, navApp): def write_msg(self, navApp):
"""Write on draft mail""" """Write on draft mail"""
state.send_draft_mail = state.mail_id state.send_draft_mail = state.mail_id
data = sqlQuery(
"select toaddress, fromaddress, subject, message from sent where"
" ackdata = ?;", str(state.mail_id))
composer_ids = ( composer_ids = (
self.parent.parent.parent.parent.parent.ids.sc3.children[1].ids) self.parent.parent.parent.parent.parent.ids.sc3.children[1].ids)
composer_ids.ti.text = state.write_msg['from_addr'] composer_ids.ti.text = data[0][1]
composer_ids.btn.text = state.write_msg['from_addr'] composer_ids.btn.text = data[0][1]
composer_ids.txt_input.text = state.write_msg['to_addr'] composer_ids.txt_input.text = data[0][0]
composer_ids.subject.text = state.write_msg[ composer_ids.subject.text = data[0][2] if data[0][2] != '(no subject)' else ''
'subject'] if state.write_msg['subject'] != '(no subject)' else '' composer_ids.body.text = data[0][3]
composer_ids.body.text = state.write_msg['message']
self.parent.current = 'create' self.parent.current = 'create'
navApp.set_navbar_for_composer() navApp.set_navbar_for_composer()

2
src/state.py
View File

@ -118,8 +118,6 @@ is_allmail = False
in_composer = False in_composer = False
write_msg = {}
availabe_credit = 0 availabe_credit = 0
in_sent_method = False in_sent_method = False