Skip to content

Commit

Permalink
db_settings: Remove dead code
Browse files Browse the repository at this point in the history 
This is code for switching the database encryption. It can't be
implemented right now due to libkeepass/pykeepass#233
  • Loading branch information
@A6GibKm
A6GibKm committed Jun 8, 2021
1 parent 8dc2c91 commit 53013c8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 152 deletions.
123 changes: 0 additions & 123 deletions data/database_settings_dialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,127 +535,4 @@
</object>
</child>
</object>
<object class="GtkBox" id="frame_box2">
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="section_label_password2">
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin_bottom">15</property>
<property name="label" translatable="yes">Encryption Algorithm</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
<child>
<object class="GtkFrame">
<child>
<object class="GtkListBox" id="enc_alg_list_box">
<child>
<object class="GtkListBoxRow">
<property name="name">chacha20</property>
<property name="width_request">200</property>
<property name="height_request">35</property>
<child>
<object class="GtkLabel">
<property name="halign">start</property>
<property name="label" translatable="yes" comments="ChaCha20 is a proper name, do not translate">ChaCha20: 256-bit</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">twofish</property>
<property name="width_request">200</property>
<property name="height_request">35</property>
<child>
<object class="GtkLabel">
<property name="halign">start</property>
<property name="label" translatable="yes" comments="Twofish is a proper name, do not translate">Twofish: 256-bit</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">aes256</property>
<property name="width_request">200</property>
<property name="height_request">35</property>
<child>
<object class="GtkLabel">
<property name="halign">start</property>
<property name="label" translatable="yes" comments="AES is a proper name, do not translate">AES: 256-bit</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkLabel" id="section_label_password6">
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin_top">30</property>
<property name="margin_bottom">15</property>
<property name="label" translatable="yes" comments="https://en.wikipedia.org/wiki/Key_derivation_function">Key Derivation Function</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
<child>
<object class="GtkFrame">
<child>
<object class="GtkListBox" id="der_alg_list_box">
<child>
<object class="GtkListBoxRow">
<property name="name">argon2</property>
<property name="width_request">200</property>
<property name="height_request">35</property>
<child>
<object class="GtkLabel">
<property name="halign">start</property>
<property name="label">Argon2 (KeePass 4)</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="name">aeskdf</property>
<property name="width_request">200</property>
<property name="height_request">35</property>
<child>
<object class="GtkLabel">
<property name="halign">start</property>
<property name="label">AES-KDF (KeePass 3.1)</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="encryption_apply_button">
<property name="label" translatable="yes">Apply Changes</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">end</property>
<property name="margin_top">30</property>
<property name="vexpand">True</property>
<style>
<class name="suggested-action"/>
</style>
</object>
</child>
</object>
</interface>
29 changes: 0 additions & 29 deletions passwordsafe/database_settings_dialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ class DatabaseSettingsDialog:
groups_number = NotImplemented
passwords_number = NotImplemented

new_encryption_algorithm = NotImplemented
new_derivation_algorithm = NotImplemented

def __init__(self, unlocked_database):
self.unlocked_database = unlocked_database
self.database_manager = unlocked_database.database_manager
Expand All @@ -36,7 +33,6 @@ def __init__(self, unlocked_database):
self.window = self.builder.get_object("database_settings_window")
self.auth_apply_button = self.builder.get_object("auth_apply_button")

self.encryption_apply_button = self.builder.get_object("encryption_apply_button")
self.select_keyfile_button = self.builder.get_object("select_keyfile_button")
self.generate_keyfile_button = self.builder.get_object("generate_keyfile_button")

Expand All @@ -49,9 +45,6 @@ def __init__(self, unlocked_database):

def __setup_signals(self) -> None:
self.auth_apply_button.connect("clicked", self.on_auth_apply_button_clicked)
self.encryption_apply_button.connect(
"clicked", self.on_encryption_apply_button_clicked
)

# Password Section
self.builder.get_object("current_password_entry").connect("changed", self.on_password_entry_changed)
Expand All @@ -68,7 +61,6 @@ def __setup_signals(self) -> None:

def __setup_widgets(self) -> None:
self.auth_apply_button.set_sensitive(False)
self.encryption_apply_button.set_sensitive(False)

if self.database_manager.keyfile_hash is NotImplemented:
self.generate_keyfile_button.set_sensitive(True)
Expand Down Expand Up @@ -320,27 +312,6 @@ def auth_save_process_finished(self):
self.auth_apply_button.set_label(_("Apply Changes"))
self.auth_apply_button.set_sensitive(False)

def on_encryption_apply_button_clicked(self, _button):
if self.new_encryption_algorithm is not NotImplemented:
self.database_manager.db.encryption_algorithm = self.new_encryption_algorithm

if self.new_derivation_algorithm is not NotImplemented:
self.database_manager.db.version = self.new_derivation_algorithm

self.encryption_apply_button.set_sensitive(False)
self.encryption_apply_button.set_label(_("Apply…"))

save_thread = threading.Thread(target=self.enc_save_thread)
save_thread.daemon = True
save_thread.start()

def enc_save_thread(self):
self.database_manager.save_database()
GLib.idle_add(self.enc_save_process_finished)

def enc_save_process_finished(self):
self.encryption_apply_button.set_label(_("Apply Changes"))

#
# General Section
#
Expand Down

0 comments on commit 53013c8

Please sign in to comment.