From 2f6c0077c163ce7120282f0fa1209499d6a86b40 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Wed, 21 Jan 2026 14:44:14 -0800
Subject: [PATCH] More cleanups

---
 src/documents/admin.py                           |   1 -
 src/documents/conditionals.py                    |   2 +-
 src/documents/consumer.py                        |   5 +----
 .../management/commands/document_exporter.py     |   1 -
 .../samples/documents/thumbnails/0000004.webp    | Bin 0 -> 2624 bytes
 .../documents/thumbnails/0000004.webp.gpg        | Bin 2712 -> 0 bytes
 src/paperless/settings.py                        |  13 -------------
 7 files changed, 2 insertions(+), 20 deletions(-)
 create mode 100644 src/documents/tests/samples/documents/thumbnails/0000004.webp
 delete mode 100644 src/documents/tests/samples/documents/thumbnails/0000004.webp.gpg

diff --git a/src/documents/admin.py b/src/documents/admin.py
index c6f179e2a..1ebbdc9ce 100644
--- a/src/documents/admin.py
+++ b/src/documents/admin.py
@@ -60,7 +60,6 @@ class DocumentAdmin(GuardedModelAdmin):
         "added",
         "modified",
         "mime_type",
-        "storage_type",
         "filename",
         "checksum",
         "archive_filename",
diff --git a/src/documents/conditionals.py b/src/documents/conditionals.py
index 47d9bfe4b..b93cabf62 100644
--- a/src/documents/conditionals.py
+++ b/src/documents/conditionals.py
@@ -128,7 +128,7 @@ def thumbnail_last_modified(request, pk: int) -> datetime | None:
     Cache should be (slightly?) faster than filesystem
     """
     try:
-        doc = Document.objects.only("storage_type").get(pk=pk)
+        doc = Document.objects.only("pk").get(pk=pk)
         if not doc.thumbnail_path.exists():
             return None
         doc_key = get_thumbnail_modified_key(pk)
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 98a998cdf..4c8c4dd28 100644
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -497,7 +497,6 @@ class ConsumerPlugin(
                     create_source_path_directory(document.source_path)
 
                     self._write(
-                        document.storage_type,
                         self.unmodified_original
                         if self.unmodified_original is not None
                         else self.working_copy,
@@ -505,7 +504,6 @@ class ConsumerPlugin(
                     )
 
                     self._write(
-                        document.storage_type,
                         thumbnail,
                         document.thumbnail_path,
                     )
@@ -517,7 +515,6 @@ class ConsumerPlugin(
                         )
                         create_source_path_directory(document.archive_path)
                         self._write(
-                            document.storage_type,
                             archive_path,
                             document.archive_path,
                         )
@@ -733,7 +730,7 @@ class ConsumerPlugin(
                 }
                 CustomFieldInstance.objects.create(**args)  # adds to document
 
-    def _write(self, storage_type, source, target):
+    def _write(self, source, target):
         with (
             Path(source).open("rb") as read_file,
             Path(target).open("wb") as write_file,
diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py
index 1d8feffbe..77b3b6416 100644
--- a/src/documents/management/commands/document_exporter.py
+++ b/src/documents/management/commands/document_exporter.py
@@ -418,7 +418,6 @@ class Command(CryptMixin, BaseCommand):
                 base_name = generate_filename(
                     document,
                     counter=filename_counter,
-                    append_gpg=False,
                 )
             else:
                 base_name = document.get_public_filename(counter=filename_counter)
diff --git a/src/documents/tests/samples/documents/thumbnails/0000004.webp b/src/documents/tests/samples/documents/thumbnails/0000004.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a7ff623b24a24c1490dec1742efb28ce7da545d1
GIT binary patch
literal 2624
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

literal 0
HcmV?d00001

diff --git a/src/documents/tests/samples/documents/thumbnails/0000004.webp.gpg b/src/documents/tests/samples/documents/thumbnails/0000004.webp.gpg
deleted file mode 100644
index 3abc69d360a4c61dba6b12e6c833bdf6b441d8f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2712
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
S|3^~Dece>pl*7~{#c}PaRZyY;

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 024c7f076..30ee213d1 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -1203,19 +1203,6 @@ EMAIL_PARSE_DEFAULT_LAYOUT = __get_int(
     1,  # MailRule.PdfLayout.TEXT_HTML but that can't be imported here
 )
 
-# Pre-2.x versions of Paperless stored your documents locally with GPG
-# encryption, but that is no longer the default.  This behaviour is still
-# available, but it must be explicitly enabled by setting
-# `PAPERLESS_PASSPHRASE` in your environment or config file.  The default is to
-# store these files unencrypted.
-#
-# Translation:
-# * If you're a new user, you can safely ignore this setting.
-# * If you're upgrading from 1.x, this must be set, OR you can run
-#   `./manage.py change_storage_type gpg unencrypted` to decrypt your files,
-#   after which you can unset this value.
-PASSPHRASE = os.getenv("PAPERLESS_PASSPHRASE")
-
 # Trigger a script after every successful document consumption?
 PRE_CONSUME_SCRIPT = os.getenv("PAPERLESS_PRE_CONSUME_SCRIPT")
 POST_CONSUME_SCRIPT = os.getenv("PAPERLESS_POST_CONSUME_SCRIPT")