From dd4a9896063e856ae8ced051d2f6c3755c6acb6c Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 10 Feb 2025 12:44:33 +0100
Subject: [PATCH] WIP: Migrate away from static methods

---
 .../src/main/kotlin/org/pgpainless/PGPainless.kt  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
index 863a10da..a7edcf5c 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
@@ -10,7 +10,9 @@ import org.bouncycastle.openpgp.PGPKeyRing
 import org.bouncycastle.openpgp.PGPPublicKeyRing
 import org.bouncycastle.openpgp.PGPSecretKeyRing
 import org.bouncycastle.openpgp.PGPSignature
+import org.bouncycastle.openpgp.api.OpenPGPApi
 import org.bouncycastle.openpgp.api.OpenPGPImplementation
+import org.bouncycastle.openpgp.api.bc.BcOpenPGPApi
 import org.pgpainless.algorithm.OpenPGPKeyVersion
 import org.pgpainless.bouncycastle.PolicyAdapter
 import org.pgpainless.decryption_verification.DecryptionBuilder
@@ -30,11 +32,17 @@ class PGPainless(
     val algorithmPolicy: Policy = Policy.getInstance()
 ) {
 
+    private var api: OpenPGPApi
+
     init {
         implementation.setPolicy(
             PolicyAdapter(algorithmPolicy)) // adapt PGPainless' Policy to BCs OpenPGPPolicy
+        api = BcOpenPGPApi(implementation)
     }
 
+    fun generateKey(version: OpenPGPKeyVersion = OpenPGPKeyVersion.v4): KeyRingTemplates =
+        KeyRingTemplates(version)
+
     companion object {
 
         @Volatile private var instance: PGPainless? = null
@@ -43,6 +51,11 @@ class PGPainless(
         fun getInstance() =
             instance ?: synchronized(this) { instance ?: PGPainless().also { instance = it } }
 
+        @JvmStatic
+        fun setInstance(pgpainless: PGPainless) {
+            instance = pgpainless
+        }
+
         /**
          * Generate a fresh OpenPGP key ring from predefined templates.
          *
@@ -51,7 +64,7 @@ class PGPainless(
         @JvmStatic
         @JvmOverloads
         fun generateKeyRing(version: OpenPGPKeyVersion = OpenPGPKeyVersion.v4) =
-            KeyRingTemplates(version)
+            getInstance().generateKey(version)
 
         /**
          * Build a custom OpenPGP key ring.