From 039a9255974990e6fe9cf7792553f2f809389d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Wed, 23 Oct 2024 16:04:18 +0200
Subject: [PATCH] Fix code style

---
 .github/pull_request_template.md              |  2 +-
 .../openpgp/util/OpenPgpIntentStarter.kt      | 37 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2a7da388ea8..fdb98398539 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,7 +3,7 @@ Please ensure that your pull request meets the following requirements - thanks!
 - Does not contain merge commits. Rebase instead.
 - Contains commits with descriptive titles.
 - New code is written in Kotlin whenever possible.
-- Follows our existing codestyle (`gradlew spotlessCheck` to check and `gradlew spotlessFormat` to format your source code; will be checked by CI).
+- Follows our existing codestyle (`gradlew spotlessCheck` to check and `gradlew spotlessApply` to format your source code; will be checked by CI).
 - Does not break any unit tests (`gradlew testDebugUnitTest`; will be checked by CI).
 - Uses a descriptive title; don't put issue numbers in there.
 - Contains a reference to the issue that it fixes (e.g. _Closes #XXX_ or _Fixes #XXX_) in the body text.
diff --git a/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpIntentStarter.kt b/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpIntentStarter.kt
index 36dd123545f..d9d22baa531 100644
--- a/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpIntentStarter.kt
+++ b/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpIntentStarter.kt
@@ -6,7 +6,6 @@ import android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
 import android.content.IntentSender
 import android.os.Build
 import android.os.Bundle
-import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
 
 /**
@@ -21,10 +20,14 @@ object OpenPgpIntentStarter {
 
         activity.startIntentSender(
             intentSender,
-            /* fillInIntent = */ null,
-            /* flagsMask = */ 0,
-            /* flagsValues = */ 0,
-            /* extraFlags = */ 0,
+            /* fillInIntent = */
+            null,
+            /* flagsMask = */
+            0,
+            /* flagsValues = */
+            0,
+            /* extraFlags = */
+            0,
             options,
         )
     }
@@ -37,10 +40,14 @@ object OpenPgpIntentStarter {
         activity.startIntentSenderForResult(
             intentSender,
             requestCode,
-            /* fillInIntent = */ null,
-            /* flagsMask = */ 0,
-            /* flagsValues = */ 0,
-            /* extraFlags = */ 0,
+            /* fillInIntent = */
+            null,
+            /* flagsMask = */
+            0,
+            /* flagsValues = */
+            0,
+            /* extraFlags = */
+            0,
             options,
         )
     }
@@ -54,10 +61,14 @@ object OpenPgpIntentStarter {
         fragment.startIntentSenderForResult(
             intentSender,
             requestCode,
-            /* fillInIntent = */ null,
-            /* flagsMask = */ 0,
-            /* flagsValues = */ 0,
-            /* extraFlags = */ 0,
+            /* fillInIntent = */
+            null,
+            /* flagsMask = */
+            0,
+            /* flagsValues = */
+            0,
+            /* extraFlags = */
+            0,
             options,
         )
     }