Append trailing newline to `.gpg-id` during creation (#1344)

3 files changed, 13 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1aed4f1..6b57588b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,17 +13,23 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
--   Autofill now works much more reliably in Chrome 89 and later, including support for saving passwords if no accessibility service is enabled.
 -   Pressing the back button in the navigation bar and the one in the toolbar behaved differently
--   Editing a password allowed accidentally overwriting an existing one
 -   App shortcuts would never update once the first 4 were set
 -   Clipboard history now attempts to flush through 35 times rather than 20 to combat increased clipboard history item count in Samsung devices
+-   .gpg-id file generated by APS did not work with pass CLI
 
 ### Changed
 
 -   Accessibility autofill has been removed completely due to being buggy, insecure and lacking in features. Upgrade to Android 8 or preferably later to gain access to our advanced Autofill implementation.
 -   The settings UI has been completely re-done to dramatically improve discoverability and navigation for users
 
+## [1.13.3] - 2021-03-06
+
+### Fixed
+
+-   Autofill now works much more reliably in Chrome 89 and later, including support for saving passwords if no accessibility service is enabled.
+-   Editing a password allowed accidentally overwriting an existing one
+
 ## [1.13.2] - 2020-12-21
 
 ### Added
@@ -427,7 +433,9 @@ All notable changes to this project will be documented in this file.
 
 -   Fix elements overlapping.
 
-[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/v1.13.2...HEAD
+[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/v1.13.3...HEAD
+
+[1.13.3]: https://github.com/android-password-store/Android-Password-Store/compare/v1.13.2...v1.13.3
 
 [1.13.2]: https://github.com/android-password-store/Android-Password-Store/compare/v1.13.1...v1.13.2
 
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
index dfde4845..17b99935 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt
@@ -105,7 +105,7 @@ class PasswordCreationActivity : BasePgpActivity(), OpenPgpServiceConnection.OnB
                 lifecycleScope.launch {
                     val gpgIdentifierFile = File(PasswordRepository.getRepositoryDirectory(), ".gpg-id")
                     withContext(Dispatchers.IO) {
-                        gpgIdentifierFile.writeText(keyIds.joinToString("\n"))
+                        gpgIdentifierFile.writeText((keyIds + "").joinToString("\n"))
                     }
                     commitChange(getString(
                         R.string.git_commit_gpg_id,
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt
index 6ba73aef..44e533cb 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt
@@ -39,7 +39,7 @@ class KeySelectionFragment : Fragment(R.layout.fragment_key_selection) {
                 lifecycleScope.launch {
                     withContext(Dispatchers.IO) {
                         val gpgIdentifierFile = File(PasswordRepository.getRepositoryDirectory(), ".gpg-id")
-                        gpgIdentifierFile.writeText(keyIds.joinToString("\n"))
+                        gpgIdentifierFile.writeText((keyIds + "").joinToString("\n"))
                     }
                     settings.edit { putBoolean(PreferenceKeys.REPOSITORY_INITIALIZED, true) }
                     requireActivity().commitChange(getString(