Wire in fallback key selection flow #958

msfjarvis · 2020-07-23T11:02:54Z

📢 Type of change

📜 Description

Brings back GetKeyIdsActivity and uses that to let users select a key in case we are unable to find one.

💡 Motivation and Context

Should reasonably fix #955

💚 How did you test it?

📝 Checklist

I formatted the code with the IDE's reformat action (Ctrl + Shift + L/Cmd + Shift + L)
I reviewed submitted code
I added a CHANGELOG entry if applicable

🔮 Next steps

📸 Screenshots / GIFs

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

app/src/main/java/com/zeapo/pwdstore/crypto/GetKeyIdsActivity.kt

app/src/main/java/com/zeapo/pwdstore/crypto/PasswordCreationActivity.kt

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

…-id-fallbacks * origin/fix_key_id_parsing: Fix a crash when parsing long key IDs

* develop: Fix a crash when parsing long key IDs (android-password-store#959) Allow Autofill on custom views with Autofill hints (android-password-store#946)

* develop: Fix a crash when parsing long key IDs (android-password-store#959) Allow Autofill on custom views with Autofill hints (android-password-store#946) Migrate to Gradle Kotlin DSL (android-password-store#936) build: upgrade all dependencies (android-password-store#953) github: create release as draft

* fix_key_id_parsing: Fix OpenPgpApi extra type confusion Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* develop: Fix OpenPgpApi extra type confusion (android-password-store#960) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

fmeum · 2020-07-23T14:15:35Z

Could you test this again and verify that my refactoring in 05f68da didn't break anything?

msfjarvis · 2020-07-23T14:22:42Z

Could you test this again and verify that my refactoring in 05f68da didn't break anything?

It does work, but we need to get committing in order. The flow from empty .gpg-id -> key selection -> write file -> encrypt password generates two commits for me. The first contains the newly encrypted password and the addition of a hex key ID into .gpg-id, and the next one is empty. Ideally we'd commit the .gpg-id update separately, and the password creation separately.

msfjarvis · 2020-07-23T14:24:51Z

Oh, and this also needs changelog entries.

fmeum · 2020-07-23T14:50:43Z

Supporting all identities in .gpg-id and all selected ones instead of just the first line/selected key ID does not require additional effort, so I changed that. I will now look into the commit order.

app/src/main/res/values/strings.xml

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

fmeum · 2020-07-23T15:07:53Z

@msfjarvis Could you check whether the changes are now committed separately?

msfjarvis · 2020-07-23T15:16:09Z

@msfjarvis Could you check whether the changes are now committed separately?

They are. However my previous, albeit unlikely, test case of having a .gpg-id file that is nothing but an empty line doesn't work anymore.

msfjarvis · 2020-07-23T15:36:56Z

@FabianHenneke we can merge this and then I can start off the 1.10.1 release process.

fmeum · 2020-07-23T15:39:38Z

@msfjarvis Could you check whether the changes are now committed separately?

They are. However my previous, albeit unlikely, test case of having a .gpg-id file that is nothing but an empty line doesn't work anymore.

This should show an error snackbar, but maybe it doesn't since this is parsed as an empty user ID. What does happen for you?

msfjarvis · 2020-07-23T15:41:25Z

@msfjarvis Could you check whether the changes are now committed separately?

They are. However my previous, albeit unlikely, test case of having a .gpg-id file that is nothing but an empty line doesn't work anymore.

This should show an error snackbar, but maybe it doesn't since this is parsed as an empty user ID. What does happen for you?

It does show an error snackbar. Earlier, it'd prompt me to select a key.

fmeum · 2020-07-23T15:43:10Z

@msfjarvis Could you check whether the changes are now committed separately?

They are. However my previous, albeit unlikely, test case of having a .gpg-id file that is nothing but an empty line doesn't work anymore.

This should show an error snackbar, but maybe it doesn't since this is parsed as an empty user ID. What does happen for you?

It does show an error snackbar. Earlier, it'd prompt me to select a key.

The last commit I made should fix that, I'm simply ignoring blank lines now.

I agree that this should be good to go. Do you want to add a changelog entry to this PR or a separate one?

msfjarvis · 2020-07-23T15:47:37Z

@msfjarvis Could you check whether the changes are now committed separately?

They are. However my previous, albeit unlikely, test case of having a .gpg-id file that is nothing but an empty line doesn't work anymore.

This should show an error snackbar, but maybe it doesn't since this is parsed as an empty user ID. What does happen for you?

It does show an error snackbar. Earlier, it'd prompt me to select a key.

The last commit I made should fix that, I'm simply ignoring blank lines now.

I agree that this should be good to go. Do you want to add a changelog entry to this PR or a separate one?

Add it to this one, let's get everything sorted.

Co-authored-by: Fabian Henneke <fabian@henneke.me> (cherry picked from commit 084b833)

* origin/release: build: prepare next development version build: bump version Prepare release 1.10.1 Add CHANGELOG entries for 1.10.1 (android-password-store#961) Wire in fallback key selection flow (android-password-store#958) Fix OpenPgpApi extra type confusion (android-password-store#960) Fix a crash when parsing long key IDs (android-password-store#959) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* develop: Properly handle files without passwords (android-password-store#969) Expand OTP and PasswordEntry tests (android-password-store#968) README: clarify build types (android-password-store#966) build: prepare next development version build: bump version Prepare release 1.10.1 Add CHANGELOG entries for 1.10.1 (android-password-store#961) Wire in fallback key selection flow (android-password-store#958) Fix OpenPgpApi extra type confusion (android-password-store#960) Fix a crash when parsing long key IDs (android-password-store#959) Add CHANGELOG entries for 1.10.1 (android-password-store#961) Wire in fallback key selection flow (android-password-store#958) Fix OpenPgpApi extra type confusion (android-password-store#960) Fix a crash when parsing long key IDs (android-password-store#959) Allow Autofill on custom views with Autofill hints (android-password-store#946) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* develop: (28 commits) Allow creating nested directories CHANGELOG: update Show parent path on all types github: upload test reports on failure build: update APK cruft exclusion list Properly handle files without passwords (#969) Expand OTP and PasswordEntry tests (#968) README: clarify build types (#966) build: prepare next development version build: bump version Prepare release 1.10.1 Add CHANGELOG entries for 1.10.1 (#961) Wire in fallback key selection flow (#958) Fix OpenPgpApi extra type confusion (#960) Fix a crash when parsing long key IDs (#959) Add CHANGELOG entries for 1.10.1 (#961) Wire in fallback key selection flow (#958) Fix OpenPgpApi extra type confusion (#960) Fix a crash when parsing long key IDs (#959) Allow Autofill on custom views with Autofill hints (#946) ... Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* develop: Allow creating nested directories CHANGELOG: update Show parent path on all types github: upload test reports on failure build: update APK cruft exclusion list Properly handle files without passwords (#969) Expand OTP and PasswordEntry tests (#968) build: prepare next development version build: bump version Prepare release 1.10.1 Add CHANGELOG entries for 1.10.1 (#961) Wire in fallback key selection flow (#958) Fix OpenPgpApi extra type confusion (#960) Fix a crash when parsing long key IDs (#959)

fmeum and others added 2 commits July 23, 2020 12:43

Fix a crash when parsing long key IDs

3ca9793

Wire in fallback key selection flow

2852100

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

msfjarvis added this to the 1.11.0 milestone Jul 23, 2020

msfjarvis added backport labels Jul 23, 2020

msfjarvis commented Jul 23, 2020

View changes

msfjarvis and others added 6 commits July 23, 2020 16:46

Revert unneeded hunk

fd9d0a7

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Merge remote-tracking branch 'origin/fix_key_id_parsing' into bug/gpg…

68752c0

…-id-fallbacks * origin/fix_key_id_parsing: Fix a crash when parsing long key IDs

Merge branch 'develop' into bug/gpg-id-fallbacks

5a75cdc

* develop: Fix a crash when parsing long key IDs (android-password-store#959) Allow Autofill on custom views with Autofill hints (android-password-store#946)

Fix OpenPgpApi extra type confusion

8a96644

Merge branch 'fix_key_id_parsing' into bug/gpg-id-fallbacks

77f1e73

* fix_key_id_parsing: Fix OpenPgpApi extra type confusion Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

msfjarvis marked this pull request as ready for review July 23, 2020 13:43

msfjarvis requested a review from Skrilltrax as a code owner July 23, 2020 13:43

msfjarvis requested a review from fmeum July 23, 2020 13:43

msfjarvis mentioned this pull request Jul 23, 2020

[BUG]Can not create passwords #955

Closed

msfjarvis and others added 2 commits July 23, 2020 19:30

Merge branch 'develop' into bug/gpg-id-fallbacks

a6c46e3

* develop: Fix OpenPgpApi extra type confusion (android-password-store#960) Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Refactor and remove unused preferences

05f68da

Simplify intent creation

2825ebb

fmeum previously approved these changes Jul 23, 2020

View changes

Use all identities in .gpg-id

6f0f761

fmeum dismissed their stale review via 6f0f761 July 23, 2020 14:49

msfjarvis commented Jul 23, 2020

View changes

app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved

fmeum and others added 2 commits July 23, 2020 17:06

Commit .gpg-id separately

daea0e0

Update app/src/main/res/values/strings.xml

b742071

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

Remove debug logging

905888c

Ignore empty lines in .gpg-id

0cf2623

fmeum approved these changes Jul 23, 2020

View changes

msfjarvis merged commit 084b833 into android-password-store:develop Jul 23, 2020

msfjarvis deleted the bug/gpg-id-fallbacks branch July 23, 2020 15:59

msfjarvis modified the milestones: 1.11.0, 1.10.1 Jul 23, 2020

fmeum mentioned this pull request Jul 23, 2020

Add CHANGELOG entries for 1.10.1 #961

Merged

8 tasks

msfjarvis added a commit to msfjarvis/Android-Password-Store that referenced this pull request Jul 23, 2020

Wire in fallback key selection flow (android-password-store#958)

1546f86

Co-authored-by: Fabian Henneke <fabian@henneke.me> (cherry picked from commit 084b833)

Wire in fallback key selection flow #958

Wire in fallback key selection flow #958

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

Wire in fallback key selection flow #958

Wire in fallback key selection flow #958

Conversation

msfjarvis commented Jul 23, 2020

📢 Type of change

📜 Description

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

🔮 Next steps

📸 Screenshots / GIFs

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020

fmeum commented Jul 23, 2020

msfjarvis commented Jul 23, 2020