Update variable association to selected_address

Author: shekhar-cis

src/bitmessagekivy/baseclass/maildetail.py

@@ -152,15 +152,15 @@ def delete_mail(self):
             msg_count_objs.send_cnt.ids.badge_txt.text = str(int(self.kivy_state.sent_count) - 1)
             self.kivy_state.sent_count = str(int(self.kivy_state.sent_count) - 1)
             self.parent.screens[2].ids.ml.clear_widgets()
-            self.parent.screens[2].loadSent(self.kivy_state.association)
+            self.parent.screens[2].loadSent(self.kivy_state.selected_address)
         elif self.kivy_state.detail_page_type == 'inbox':
             App.get_running_app().root.ids.sc1.ids.inbox_search.ids.search_field.text = ''
             trash(self.kivy_state.mail_id)
             msg_count_objs.inbox_cnt.ids.badge_txt.text = str(
                 int(self.kivy_state.inbox_count) - 1)
             self.kivy_state.inbox_count = str(int(self.kivy_state.inbox_count) - 1)
             self.parent.screens[0].ids.ml.clear_widgets()
-            self.parent.screens[0].loadMessagelist(self.kivy_state.association)
+            self.parent.screens[0].loadMessagelist(self.kivy_state.selected_address)
 
         elif self.kivy_state.detail_page_type == 'draft':
             delete(self.kivy_state.mail_id)

src/bitmessagekivy/baseclass/myaddress.py

@@ -131,7 +131,7 @@ def set_address_to_widget(self, item):
 
     def set_address_status(self, item, meny, is_enable):
         """Setting the identity status enable/disable on UI"""
-        if self.kivy_state.association == item['secondary_text'] and is_enable:
+        if self.kivy_state.selected_address == item['secondary_text'] and is_enable:
             meny.add_widget(self.is_active_badge())
         else:
             meny.add_widget(ToggleBtn(active=True if is_enable else False))

src/bitmessagekivy/kivy_state.py

@@ -13,7 +13,7 @@ class KivyStateVariables(object):
     """This Class hold all the kivy state variables"""
 
     def __init__(self):
-        self.association = ''
+        self.selected_address = ''
         self.navinstance = None
         self.mail_id = 0
         self.my_address_obj = None

src/bitmessagekivy/mpybit.py

@@ -253,15 +253,15 @@ def select_path(self, path):
                 if not os.path.exists(os.path.join(android_path, 'default_identicon')):
                     os.makedirs(os.path.join(android_path, 'default_identicon'))
                 newImg.save(os.path.join(android_path, 'default_identicon', '{}.png'.format(
-                    self.kivy_state_obj.association))
+                    self.kivy_state_obj.selected_address))
                 )
             else:
                 if not os.path.exists(os.path.join(self.image_dir, 'default_identicon')):
                     os.makedirs(os.path.join(self.image_dir, 'default_identicon'))
                 newImg.save(os.path.join(self.image_dir, 'default_identicon', '{0}.png'.format(
-                    self.kivy_state_obj.association))
+                    self.kivy_state_obj.selected_address))
                 )
-            self.load_selected_Image(self.kivy_state_obj.association)
+            self.load_selected_Image(self.kivy_state_obj.selected_address)
             toast('Image changed')
         except Exception:
             toast('Exit')
@@ -282,9 +282,9 @@ def load_selected_Image(self, curerentAddr):
 
     def rest_default_avatar_img(self):
         """set default avatar generated image"""
-        self.set_identicon(self.kivy_state_obj.association)
+        self.set_identicon(self.kivy_state_obj.selected_address)
         img_path = os.path.join(
-            self.image_dir, 'default_identicon', '{}.png'.format(self.kivy_state_obj.association)
+            self.image_dir, 'default_identicon', '{}.png'.format(self.kivy_state_obj.selected_address)
         )
         try:
             if os.path.exists(img_path):