Skip to content
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.

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

Jump to bottom

Fix OpenPgpApi extra type confusion #960

Merged
merged 2 commits into from Jul 23, 2020
Merged

Fix OpenPgpApi extra type confusion #960

merged 2 commits into from Jul 23, 2020

Conversation

fmeum
Copy link
Member

@fmeum fmeum commented Jul 23, 2020

📢 Type of change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates

📜 Description

Array<Long> and LongArray are distinct types and the former is being passed to Java as a Serializable rather than a Long[]. With this change, encrypting to fingerprints and long key IDs of master keys now works.

Note that providing the key ID of an encryption subkey does not seem to be supported by OpenKeychain.

💡 Motivation and Context

💚 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

@msfjarvis
Merge branch 'develop' into fix_key_id_parsing
3535ced 
* develop:
  Fix a crash when parsing long key IDs (#959)
  Allow Autofill on custom views with Autofill hints (#946)
  Migrate to Gradle Kotlin DSL (#936)
  build: upgrade all dependencies (#953)
  github: create release as draft
@fmeum fmeum mentioned this pull request Jul 23, 2020
Closed
msfjarvis
msfjarvis approved these changes Jul 23, 2020
View changes
Copy link
Member

@msfjarvis msfjarvis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Allow me a moment while I tear my hair out at this idiocy.

@msfjarvis msfjarvis merged commit da16759 into develop Jul 23, 2020
@msfjarvis msfjarvis deleted the fix_key_id_parsing branch July 23, 2020 13:59
msfjarvis added a commit to msfjarvis/Android-Password-Store that referenced this pull request Jul 23, 2020
@msfjarvis
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>
@msfjarvis msfjarvis modified the milestones: 1.11.0, 1.10.1 Jul 23, 2020
@fmeum fmeum mentioned this pull request Jul 23, 2020
Merged
8 tasks
msfjarvis pushed a commit to msfjarvis/Android-Password-Store that referenced this pull request Jul 23, 2020
@FabianHenneke @msfjarvis
Fix OpenPgpApi extra type confusion (android-password-store#960)
859da9d 
(cherry picked from commit da16759)
msfjarvis added a commit to msfjarvis/Android-Password-Store that referenced this pull request Jul 23, 2020
@msfjarvis
Merge remote-tracking branch 'origin/release' into develop
f803376 
* 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>
msfjarvis added a commit to msfjarvis/Android-Password-Store that referenced this pull request Jul 23, 2020
@msfjarvis
Merge remote-tracking branch 'origin/release' into develop
f256d5f 
* 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>
msfjarvis added a commit to msfjarvis/Android-Password-Store that referenced this pull request Jul 26, 2020
@msfjarvis
Merge branch 'develop' into custom-font
206b0ac 
* 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>
msfjarvis added a commit that referenced this pull request Jul 26, 2020
@msfjarvis
Merge branch 'develop' into api_30_support
ce29cdd 
* 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>
msfjarvis added a commit that referenced this pull request Jul 27, 2020
@msfjarvis
Merge branch 'develop' into enhancement/short_key_id_warning
77b4867 
* 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msfjarvis msfjarvis msfjarvis approved these changes

@Skrilltrax Skrilltrax

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.10.1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@fmeum @msfjarvis