Skip to content

key selection: storing selected IDs in Long[] #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agrahn merged 1 commit into from
Feb 4, 2026
+11 −12
Merged

key selection: storing selected IDs in Long[] #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ open class BasePGPActivity : AppCompatActivity() {
if (result.resultCode == RESULT_OK) {
val data = result.data ?: return@registerForActivityResult
val selectedKeyId =
data.getStringExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
data.getLongArrayExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
?: return@registerForActivityResult

val repoRoot = PasswordRepository.getRepositoryDirectory()
Expand All @@ -123,7 +123,7 @@ open class BasePGPActivity : AppCompatActivity() {
File(repoRoot, subPath).let { if (it.isFile()) it.getParent() else it.getPath() }

File(gpgIdDir, ".gpg-id")?.let {
it.writeText(selectedKeyId + "\n")
it.writeText(selectedKeyId.joinToString("\n") + "\n")
runBlocking {
commitChange(
resources.getString(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/passwordstore/ui/dialogs/FolderCreationDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class FolderCreationDialogFragment : DialogFragment() {
if (result.resultCode == AppCompatActivity.RESULT_OK) {
val data = result.data ?: return@registerForActivityResult
val selectedKeyId =
data.getStringExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
data.getLongArrayExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
?: return@registerForActivityResult
val gpgIdentifierFile = File(newFolder, ".gpg-id")
gpgIdentifierFile.writeText(selectedKeyId + "\n")
gpgIdentifierFile.writeText(selectedKeyId.joinToString("\n") + "\n")
runBlocking {
requireActivity()
.commitChange(getString(R.string.git_commit_gpg_id, getString(R.string.app_name)))
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/passwordstore/ui/onboarding/fragments/KeySelectionFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class KeySelectionFragment : Fragment(R.layout.fragment_key_selection) {
if (result.resultCode == AppCompatActivity.RESULT_OK) {
val data = result.data ?: return@registerForActivityResult
val selectedKeyId =
data.getStringExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
data.getLongArrayExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
?: return@registerForActivityResult
lifecycleScope.launch {
val gpgIdentifierFile = File(PasswordRepository.getRepositoryDirectory(), ".gpg-id")
gpgIdentifierFile.writeText(selectedKeyId + "\n")
gpgIdentifierFile.writeText(selectedKeyId.joinToString("\n") + "\n")
settings.edit { putBoolean(PreferenceKeys.REPOSITORY_INITIALIZED, true) }
requireActivity()
.commitChange(getString(R.string.git_commit_gpg_id, getString(R.string.app_name)))
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ class PasswordStore : BaseGitActivity() {
if (result.resultCode == AppCompatActivity.RESULT_OK) {
val data = result.data ?: return@registerForActivityResult
val selectedKeyId =
data.getStringExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
data.getLongArrayExtra(PGPKeyListActivity.EXTRA_SELECTED_KEY)
?: return@registerForActivityResult
val gpgIdentifierFile = File(currentDir.absolutePath, ".gpg-id")
gpgIdentifierFile.writeText(selectedKeyId + "\n")
gpgIdentifierFile.writeText(selectedKeyId.joinToString("\n") + "\n")
runBlocking {
commitChange(getString(R.string.git_commit_gpg_id, getString(R.string.app_name)))
}
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/app/passwordstore/ui/pgp/PGPKeyListActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class PGPKeyListActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)

val isSelectingKeys = intent.extras?.getBoolean(EXTRA_KEY_SELECTION) ?: false
val selectedKeyIds = mutableSetOf<String>()
val selectedKeyIds = mutableSetOf<Long>()

supportFragmentManager.setFragmentResultListener(PGP_KEY_ADD_REQUEST_KEY, this) { _, bundle ->
when (bundle.getString(ACTION_KEY)) {
Expand All @@ -119,7 +119,7 @@ class PGPKeyListActivity : AppCompatActivity() {
onNavigationIconClick = {
if (isSelectingKeys && selectedKeyIds.isNotEmpty()) {
val result = Intent()
result.putExtra(EXTRA_SELECTED_KEY, selectedKeyIds.joinToString(separator = "\n"))
result.putExtra(EXTRA_SELECTED_KEY, selectedKeyIds.toTypedArray())
val gpgIdDest = intent.getStringExtra("SUB_PATH")
gpgIdDest?.let { result.putExtra("SUB_PATH", it) }
setResult(RESULT_OK, result)
Expand Down Expand Up @@ -159,8 +159,7 @@ class PGPKeyListActivity : AppCompatActivity() {
val key = pgpKeyManager.getKeyById(identifier).getOrThrow()
KeyUtils.tryGetKeyId(key) ?: throw NullPointerException()
}
if (isSelected) selectedKeyIds.add(keyId.toString())
else selectedKeyIds.remove(keyId.toString())
if (isSelected) selectedKeyIds.add(keyId.id) else selectedKeyIds.remove(keyId.id)
}
} else null,
)
Expand Down
Loading