summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/feature-4877_disable-akm-import1
-rw-r--r--src/leap/bitmask/gui/advanced_key_management.py16
2 files changed, 11 insertions, 6 deletions
diff --git a/changes/feature-4877_disable-akm-import b/changes/feature-4877_disable-akm-import
new file mode 100644
index 00000000..eeb70e19
--- /dev/null
+++ b/changes/feature-4877_disable-akm-import
@@ -0,0 +1 @@
+- Disable Advanced Key Manager import feature since it's experimental and may cause data loss. Closes #4877.
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