Merge branch 'develop' into debian/experimental

6 files changed, 13 insertions, 12 deletions

diff --git a/pkg/next-version b/pkg/next-version
index 3d4f0a85..29a0f215 100644
--- a/pkg/next-version
+++ b/pkg/next-version
@@ -1 +1 @@
-0.9.2.rc1
+0.9.2.rc2
diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk
index 3c514a02..664f13ec 100644
--- a/pkg/pyinst/pyinst-build.mk
+++ b/pkg/pyinst/pyinst-build.mk
@@ -22,7 +22,6 @@ reset-ver:
 
 pyinst-hacks-linux:
 	# XXX this should be taken care of by pyinstaller data collector
-	#cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)
 	cp ../leap_common/src/leap/common/cacert.pem $(DIST)
 	mkdir -p $(DIST)pysqlcipher
 	mkdir -p $(DIST)pixelated
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 3192e1c4..ba64fd65 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -994,14 +994,14 @@ class Keymanager(object):
         d.addCallback(export)
         d.addErrback(log_error)
 
+    @defer.inlineCallbacks
     def list_keys(self):
         """
         List all the keys stored in the local DB.
         """
-        d = self._keymanager_proxy.get_all_keys()
-        d.addCallback(
-            lambda keys:
-            self._signaler.signal(self._signaler.keymanager_keys_list, keys))
+        keys = yield self._keymanager_proxy.get_all_keys()
+        keydicts = [dict(key) for key in keys]
+        self._signaler.signal(self._signaler.keymanager_keys_list, keydicts)
 
     def get_key_details(self, username):
         """
@@ -1009,7 +1009,7 @@ class Keymanager(object):
         """
         def signal_details(public_key):
             self._signaler.signal(self._signaler.keymanager_key_details,
-                                  public_key.get_dict())
+                                  dict(public_key))
 
         d = self._keymanager_proxy.get_key(username,
                                            openpgp.OpenPGPKey)
diff --git a/src/leap/bitmask/gui/preferences_email_page.py b/src/leap/bitmask/gui/preferences_email_page.py
index f6d6f036..7186450d 100644
--- a/src/leap/bitmask/gui/preferences_email_page.py
+++ b/src/leap/bitmask/gui/preferences_email_page.py
@@ -90,6 +90,8 @@ class PreferencesEmailPage(PreferencesPage):
         connect signals
         """
         self.app.signaler.keymanager_key_details.connect(self._key_details)
+        self.app.signaler.keymanager_keys_list.connect(
+            self._keymanager_keys_list)
         self.app.signaler.keymanager_export_ok.connect(
             self._keymanager_export_ok)
         self.app.signaler.keymanager_export_error.connect(
@@ -218,9 +220,9 @@ class PreferencesEmailPage(PreferencesPage):
             row = self.ui.keys_table.rowCount()
             self.ui.keys_table.insertRow(row)
             self.ui.keys_table.setItem(
-                row, 0, QtGui.QTableWidgetItem(key.address))
+                row, 0, QtGui.QTableWidgetItem(" ".join(key["uids"])))
             self.ui.keys_table.setItem(
-                row, 1, QtGui.QTableWidgetItem(key.fingerprint))
+                row, 1, QtGui.QTableWidgetItem(key["fingerprint"]))
 
     def _toggle_webmail(self, state):
         value = True if state == QtCore.Qt.Checked else False
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 976c0c0a..0dd0b891 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -373,7 +373,7 @@
   </action>
   <action name="action_pixelated_mail">
    <property name="text">
-    <string>Bitmask Webmail</string>
+    <string>Bitmask Mail</string>
    </property>
   </action>
   <action name="action_advanced_key_management">
diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui
index 87e7121d..e4a72951 100644
--- a/src/leap/bitmask/gui/ui/preferences_email_page.ui
+++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui
@@ -39,7 +39,7 @@
        <item>
         <widget class="QGroupBox" name="webmail_box">
          <property name="title">
-          <string>Bitmask Mail Configuration</string>
+          <string>Bitmask Mail</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
@@ -581,7 +581,7 @@
          </column>
          <column>
           <property name="text">
-           <string>Key ID</string>
+           <string>Fingerprint</string>
           </property>
          </column>
         </widget>