.buildbot/appimage/Dockerfile

@@ -7,7 +7,8 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
     build-essential libcap-dev libssl-dev \
     python-all-dev python-setuptools wget \
     git gtk-update-icon-cache \
-    binutils-multiarch crossbuild-essential-armhf crossbuild-essential-arm64
+    binutils-multiarch crossbuild-essential-armhf crossbuild-essential-arm64 \
+    python-six
 
 RUN dpkg --add-architecture armhf
 RUN dpkg --add-architecture arm64

.buildbot/tox-bionic/Dockerfile

@@ -8,7 +8,8 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
     software-properties-common build-essential libcap-dev libffi-dev \
     libssl-dev python-all-dev python-setuptools \
     python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
-    python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb
+    python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb \
+    python3-six
 
 RUN apt-get install -yq sudo
 

.buildbot/tox-focal/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
     software-properties-common build-essential libcap-dev libffi-dev \
     libssl-dev python-all-dev python-setuptools \
     python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \
-    language-pack-en qt5dxcb-plugin tor xvfb
+    language-pack-en qt5dxcb-plugin tor xvfb python3-six
 
 RUN python3.9 -m pip install --upgrade pip tox virtualenv
 

requirements.txt

@@ -4,5 +4,4 @@ pycryptodome
 PyQt5;python_version>="3.7" and platform_machine=="x86_64"
 mock;python_version<="2.7"
 python_prctl;platform_system=="Linux"
-six
 xvfbwrapper;platform_system=="Linux"

src/bitmessagekivy/main.kv

@@ -141,14 +141,14 @@
                     text: app.tr._('Draft')
                     icon: 'message-draw'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'draft'
+                    on_release: app.set_screen('draft')
                     on_release: root.parent.set_state()
                 NavigationItem:
                     id: trash_cnt
                     text: app.tr._('Trash')
                     icon: 'delete'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'trash'
+                    on_release: app.set_screen('trash')
                     on_press: root.parent.set_state()
                     on_press: app.load_screen(self)
                 NavigationItem:
@@ -156,7 +156,7 @@
                     text: app.tr._('All Mails')
                     icon: 'mailbox'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'allmails'
+                    on_release: app.set_screen('allmails')
                     on_release: root.parent.set_state()
                     on_press: app.load_screen(self)
                 NavigationDrawerDivider:
@@ -167,7 +167,7 @@
                     text: app.tr._('Chat')
                     icon: 'chat'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'chat'
+                    on_release: app.set_screen('chat')
                     on_release: root.parent.set_state()
                 NavigationDrawerDivider:
                 NavigationDrawerSubheader:
@@ -176,38 +176,38 @@
                     text: app.tr._('Address Book')
                     icon: 'book-multiple'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'addressbook'
+                    on_release: app.set_screen('addressbook')
                     on_release: root.parent.set_state()
                 NavigationItem:
                     text: app.tr._('Settings')
                     icon: 'application-settings'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'set'
+                    on_release: app.set_screen('set')
                     on_release: root.parent.set_state()
                 NavigationItem:
                     text: app.tr._('Payment plan')
                     icon: 'shopping'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'payment'
+                    on_release: app.set_screen('payment')
                     on_release: root.parent.set_state()
                 NavigationItem:
                     text: app.tr._('New address')
                     icon: 'account-plus'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'login'
+                    on_release: app.set_screen('login')
                     on_release: root.parent.set_state()
                     on_press: app.reset_login_screen()
                 NavigationItem:
                     text: app.tr._('Network status')
                     icon: 'server-network'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'networkstat'
+                    on_release: app.set_screen('networkstat')
                     on_release: root.parent.set_state()
                 NavigationItem:
                     text: app.tr._('My addresses')
                     icon: 'account-multiple'
                     divider: None
-                    on_release: app.root.ids.scr_mngr.current = 'myaddress'
+                    on_release: app.set_screen('myaddress')
                     on_release: root.parent.set_state()
 
 MDNavigationLayout:

src/bitmessagekivy/mpybit.py

@@ -16,6 +16,7 @@ from kivy.clock import Clock
 from kivy.lang import Builder
 from kivy.core.window import Window
 from kivy.uix.boxlayout import BoxLayout
+from kivy.core.clipboard import Clipboard
 
 from kivymd.app import MDApp
 from kivymd.uix.label import MDLabel
@@ -480,6 +481,10 @@ class NavigateApp(MDApp):
         """initiate_purchase module"""
         logger.debug("Purchasing %s through %s", self.product_id, method_name)
 
+    def copy_composer_text(self, text):
+        """Copy text to clipboard"""
+        Clipboard.copy(text)
+
 
 class PaymentMethodLayout(BoxLayout):
     """PaymentMethodLayout class for kivy Ui"""

src/mockbm/helper_startup.py

@@ -4,7 +4,10 @@ from pybitmessage.bmconfigparser import config
 
 def loadConfig():
     """Loading mock test data"""
+    try:
         config.read(os.path.join(os.environ['BITMESSAGE_HOME'], 'keys.dat'))
+    except KeyError:
+        pass
 
 
 def total_encrypted_messages_per_month():