From 55d1a4f4e1687d8f44852cc7665ddeeee726daa9 Mon Sep 17 00:00:00 2001
From: navjot <navjot.g@cisinlabs.com>
Date: Wed, 18 Dec 2019 16:48:23 +0530
Subject: [PATCH] fixed draft or trash screen update issue

---
 src/bitmessagekivy/main.kv   |  8 +-------
 src/bitmessagekivy/mpybit.py | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv
index 6b6cde88..c4352cfe 100644
--- a/src/bitmessagekivy/main.kv
+++ b/src/bitmessagekivy/main.kv
@@ -552,12 +552,6 @@ NavigationLayout:
                             color: (1,1,1,1)
                             halign: 'center'
 
-<AddressSuccessful>:
-    name: 'add_sucess'
-    Label:
-        text: 'Successfully created a new bit address'
-        color: 0,0,0,1
-
 <Setting>:
     name: 'set'
     ScrollView:
@@ -665,7 +659,7 @@ NavigationLayout:
         do_scroll_x: False
         BoxLayout:
             orientation: 'vertical'
-            padding: [dp(app.window_size[0]/16 if app.window_size[0] <= 720 else app.window_size[0]/4*1.1 if app.window_size[0] <= 800 else app.window_size[0]/18), dp(10)] 
+            padding: [dp(app.window_size[0]/16 if app.window_size[0] <= 720 else app.window_size[0]/6 if app.window_size[0] <= 800 else app.window_size[0]/18), dp(10)]
             spacing: 12
             size_hint_y: None
             height: self.minimum_height + dp(app.window_size[1]) if app.window_size[1] > app.window_size[0] else dp(app.window_size[0])
diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index b5a11667..a0a03f9d 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -409,11 +409,9 @@ class MyAddress(Screen):
     @staticmethod
     def filter_address(address):
         """Method will filter the my address list data"""
-        # if filter(lambda x: (state.searcing_text).lower() in x, [
-        #         BMConfigParser().get(
-        #             address, 'label').lower(), address.lower()]):
-        if [x for x in [BMConfigParser().get(
-                address, 'label').lower(), address.lower()]]:
+        if filter(lambda x: (state.searcing_text).lower() in x, [
+                BMConfigParser().get(
+                    address, 'label').lower(), address.lower()]):
             return True
         return False
 
@@ -608,8 +606,6 @@ class DropDownWidget(BoxLayout):
                             str(state.send_draft_mail))
                         self.parent.parent.screens[15].clear_widgets()
                         self.parent.parent.screens[15].add_widget(Draft())
-                        state.detailPageType = ''
-                        state.send_draft_mail = None
                     else:
                         toAddress = addBMIfNotPresent(toAddress)
                         statusIconColor = 'red'
@@ -648,6 +644,12 @@ class DropDownWidget(BoxLayout):
                     state.check_sent_acc = fromAddress
                     state.msg_counter_objs = self.parent.parent.parent.parent\
                         .parent.parent.children[2].children[0].ids
+                    if state.detailPageType == 'draft' \
+                            and state.send_draft_mail:
+                        state.draft_count = str(int(state.draft_count) - 1)
+                        state.msg_counter_objs.draft_cnt.badge_text = state.draft_count
+                        state.detailPageType = ''
+                        state.send_draft_mail = None
                     # self.parent.parent.screens[0].ids.ml.clear_widgets()
                     # self.parent.parent.screens[0].loadMessagelist(state.association)
                     self.parent.parent.screens[3].update_sent_messagelist()
@@ -884,16 +886,12 @@ class Sent(Screen):
 
     def init_ui(self, dt=0):
         """Clock Schdule for method sent accounts"""
-        self.sentaccounts()
-        print dt
-
-    def sentaccounts(self):
-        """Load sent accounts."""
-        self.account = state.association
         self.loadSent()
+        print dt
 
     def loadSent(self, where="", what=""):
         """Load Sent list for Sent messages."""
+        self.account = state.association
         if state.searcing_text:
             self.ids.scroll_y.scroll_y = 1.0
             where = ['subject', 'message']
@@ -1987,8 +1985,8 @@ class MailDetail(Screen):
                 int(state.all_count) - 1)
             state.trash_count = str(int(state.trash_count) + 1)
             state.all_count = str(int(state.all_count) - 1)
-            self.parent.screens[4].ids.ml.clear_widgets()
-            self.parent.screens[4].init_ui(dt=0)
+            self.parent.screens[4].clear_widgets()
+            self.parent.screens[4].add_widget(Trash())
             self.parent.screens[16].ids.ml.clear_widgets()
             self.parent.screens[16].init_ui(dt=0)
         Clock.schedule_once(self.callback_for_delete, 4)
@@ -2288,7 +2286,8 @@ class Draft(Screen):
             data_index))
         try:
             msg_count_objs = (
-                self.parent.parent.parent.parent.children[2].children[0].ids)
+                self.parent.parent.parent.parent.parent.parent.children[
+                2].children[0].ids)
         except Exception:
             msg_count_objs = self.parent.parent.parent.parent.parent.children[
                 2].children[0].ids