Fixes in bitmessageqt

Author: shekhar-cis

src/api.py

@@ -286,7 +286,7 @@ def __new__(mcs, name, bases, namespace):
         # pylint: disable=protected-access
         result = super(CommandHandler, mcs).__new__(
             mcs, name, bases, namespace)
-        result.config = BMConfigParser()
+        result.config = config
         result._handlers = {}
         apivariant = result.config.safeGet('bitmessagesettings', 'apivariant')
         for func in namespace.values():

src/bitmessageqt/__init__.py

@@ -2415,7 +2415,7 @@ def displayNewInboxMessage(
             if acct.feedback != GatewayAccount.ALL_OK:
                 if acct.feedback == GatewayAccount.REGISTRATION_DENIED:
                     dialogs.EmailGatewayDialog(
-                        self, BMConfigParser(), acct).exec_()
+                        self, config, acct).exec_()
                 # possible other branches?
         except AttributeError:
             pass
@@ -2497,7 +2497,7 @@ def click_pushButtonAddSubscription(self):
                 ))
 
     def click_pushButtonStatusIcon(self):
-        dialogs.IconGlossaryDialog(self, config=BMConfigParser()).exec_()
+        dialogs.IconGlossaryDialog(self, config=config).exec_()
 
     def click_actionHelp(self):
         dialogs.HelpDialog(self).exec_()
@@ -2524,10 +2524,10 @@ def on_action_Send(self):
 
     def on_action_SpecialAddressBehaviorDialog(self):
         """Show SpecialAddressBehaviorDialog"""
-        dialogs.SpecialAddressBehaviorDialog(self, BMConfigParser())
+        dialogs.SpecialAddressBehaviorDialog(self, config)
 
     def on_action_EmailGatewayDialog(self):
-        dialog = dialogs.EmailGatewayDialog(self, config=BMConfigParser())
+        dialog = dialogs.EmailGatewayDialog(self, config=config)
         # For Modal dialogs
         dialog.exec_()
         try:
@@ -3058,7 +3058,8 @@ def on_action_InboxAddSenderToBlackList(self):
         queryreturn = sqlQuery('''select * from blacklist where address=?''',
                                addressAtCurrentInboxRow)
         if queryreturn == []:
-            label = "\"" + tableWidget.item(currentInboxRow, 2).subject + "\" in " + config.get(recipientAddress, "label")
+            label = "\"" + tableWidget.item(currentInboxRow, 2).subject + "\" in " + config.get(
+                recipientAddress, "label")
             sqlExecute('''INSERT INTO blacklist VALUES (?,?, ?)''',
                        label,
                        addressAtCurrentInboxRow, True)

src/bitmessageqt/settings.py

@@ -45,7 +45,7 @@ def __init__(self, parent=None, firstrun=False):
 
         self.parent = parent
         self.firstrun = firstrun
-        self.config = BMConfigParser()
+        self.config = config
         self.net_restart_needed = False
         self.timer = QtCore.QTimer()
 

src/bitmessageqt/support.py

@@ -145,7 +145,7 @@ def createSupportMessage(myapp):
         config.safeGet('bitmessagesettings', 'opencl')
     ) if openclEnabled() else "None"
     locale = getTranslationLanguage()
-    socks = getSOCKSProxyType(BMConfigParser()) or "N/A"
+    socks = getSOCKSProxyType(config) or "N/A"
     upnp = config.safeGet('bitmessagesettings', 'upnp', "N/A")
     connectedhosts = len(network.stats.connectedHostsList())
 

src/helper_startup.py

@@ -355,6 +355,7 @@ def start_proxyconfig():
     """Check socksproxytype and start any proxy configuration plugin"""
     if not get_plugin:
         return
+    config_ready.wait()
     proxy_type = config.safeGet('bitmessagesettings', 'socksproxytype')
     if proxy_type and proxy_type not in ('none', 'SOCKS4a', 'SOCKS5'):
         try:

src/namecoin.py

@@ -370,5 +370,4 @@ def ensureNamecoinOptions():
 
     # Set default port now, possibly to found value.
     if not hasPort:
-        config.set(configSection, "namecoinrpcport",
-                             defaults.namecoinDefaultRpcPort)
+        config.set(configSection, "namecoinrpcport", defaults.namecoinDefaultRpcPort)

src/network/knownnodes.py

@@ -165,8 +165,6 @@ def readKnownNodes():
             'Failed to read nodes from knownnodes.dat', exc_info=True)
         createDefaultKnownNodes()
 
-    config = BMConfigParser()
-
     # your own onion address, if setup
     onionhostname = config.safeGet('bitmessagesettings', 'onionhostname')
     if onionhostname and ".onion" in onionhostname:

src/tests/test_config_process.py

@@ -17,7 +17,6 @@ class TestProcessConfig(TestProcessProto):
 
     def test_config_defaults(self):
         """Test settings in the generated config"""
-        config = BMConfigParser()
         self._stop_process()
         self._kill_process()
         config.read(os.path.join(self.home, 'keys.dat'))