Merge pull request #1779 from freedomofpress/export-with-json-gui

Client-side support for VeraCrypt; use QWizard for export
freedomofpress · Feb 6, 2024 · 97ce094 · 97ce094
2 parents 7aa8a6e + fe2f5cb
commit 97ce094
Show file tree

Hide file tree

Showing 38 changed files with 3,430 additions and 2,694 deletions.
diff --git a/client/securedrop_client/app.py b/client/securedrop_client/app.py
@@ -34,7 +34,7 @@
 from PyQt5.QtCore import Qt, QThread, QTimer
 from PyQt5.QtWidgets import QApplication, QMessageBox
 
-from securedrop_client import __version__, export, state
+from securedrop_client import __version__, state
 from securedrop_client.database import Database
 from securedrop_client.db import make_session_maker
 from securedrop_client.gui.main import Window
@@ -240,16 +240,11 @@ def start_app(args, qt_args) -> NoReturn:  # type: ignore[no-untyped-def]
     database = Database(session)
     app_state = state.State(database)
 
-    with threads(4) as [
-        export_service_thread,
+    with threads(3) as [
         sync_thread,
         main_queue_thread,
         file_download_queue_thread,
     ]:
-        export_service = export.getService()
-        export_service.moveToThread(export_service_thread)
-        export_service_thread.start()
-
         gui = Window(app_state)
 
         controller = Controller(