summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-20 11:53:37 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-20 11:53:37 -0300
commit8a05b6fcc913a21ce7b3fa950c63a2ebda76c6f2 (patch)
tree962fc70bcd7dd34219a42a3e7b272a44ae37b2e9 /src/leap
parent9d7152f7f7e81cf1c8838ad2cbeba3ff6fac41a7 (diff)
parent01208db08da7cb48ee6239c917fceb2d6846228d (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/disable-akm-import' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/advanced_key_management.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/advanced_key_management.py b/src/leap/bitmask/gui/advanced_key_management.py
index 8f15719d..cbc8c3e3 100644
--- a/src/leap/bitmask/gui/advanced_key_management.py
+++ b/src/leap/bitmask/gui/advanced_key_management.py
@@ -48,6 +48,9 @@ class AdvancedKeyManagement(QtGui.QWidget):
self.ui = Ui_AdvancedKeyManagement()
self.ui.setupUi(self)
+ # XXX: Temporarily disable the key import.
+ self.ui.pbImportKeys.setVisible(False)
+
# if Soledad is not started yet
if sameProxiedObjects(soledad, None):
self.ui.gbMyKeyPair.setEnabled(False)
@@ -57,12 +60,13 @@ class AdvancedKeyManagement(QtGui.QWidget):
msg = msg.format(get_service_display_name(MX_SERVICE))
self.ui.lblStatus.setText(msg)
return
- else:
- msg = self.tr(
- "<span style='color:#ff0000;'>WARNING</span>:<br>"
- "This is an experimental feature, you can lose access to "
- "existing e-mails.")
- self.ui.lblStatus.setText(msg)
+ # XXX: since import is disabled this is no longer a dangerous feature.
+ # else:
+ # msg = self.tr(
+ # "<span style='color:#ff0000;'>WARNING</span>:<br>"
+ # "This is an experimental feature, you can lose access to "
+ # "existing e-mails.")
+ # self.ui.lblStatus.setText(msg)
self._keymanager = keymanager
self._soledad = soledad