Skip to content

Resolve android pubky parity issues from #902#905

Merged
ben-kaufman merged 21 commits intomasterfrom
codex-pubky-902-android
Apr 28, 2026
Merged

Resolve android pubky parity issues from #902#905
ben-kaufman merged 21 commits intomasterfrom
codex-pubky-902-android

Conversation

@ben-kaufman
Copy link
Copy Markdown
Contributor

resolves #902

Description

  • restore pubky sessions from wallet backups and reinitialize pubky after wallet restore
  • align Android profile and contacts flows with the iOS parity work where applicable
  • improve pubky routing from clipboard and scanner input
  • polish profile/contact edit flows, delete flows, and related copy
  • add unit coverage for pubky restore, delete recovery, and contact import routing

Preview

  • N/A

QA Notes

  • ./gradlew compileDevDebugKotlin
  • ./gradlew testDevDebugUnitTest
  • ./gradlew detekt
  • installed and launched to.bitkit.dev on connected device 2409BRN2CA

@ben-kaufman ben-kaufman marked this pull request as ready for review April 23, 2026 12:58
@ben-kaufman ben-kaufman changed the title [codex] resolve android pubky parity issues from #902 Resolve android pubky parity issues from #902 Apr 23, 2026
@ben-kaufman ben-kaufman requested a review from piotr-iohk April 23, 2026 12:58
Comment thread app/src/main/java/to/bitkit/repositories/BackupRepo.kt Outdated
Comment thread app/src/main/res/values/strings.xml Outdated
Comment thread app/src/main/res/values/strings.xml Outdated
Comment thread app/src/main/res/values/strings.xml Outdated
@piotr-iohk

This comment was marked as resolved.

ben-kaufman and others added 4 commits April 23, 2026 10:06
Co-authored-by: piotr-iohk <42900201+piotr-iohk@users.noreply.github.com>
Co-authored-by: piotr-iohk <42900201+piotr-iohk@users.noreply.github.com>
Co-authored-by: piotr-iohk <42900201+piotr-iohk@users.noreply.github.com>
Comment thread app/src/main/java/to/bitkit/ui/components/Tag.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/components/ProfileEditForm.kt Outdated
Comment thread app/src/test/java/to/bitkit/ui/WalletViewModelTest.kt Outdated
Comment thread app/src/test/java/to/bitkit/ui/screens/contacts/ContactImportFlowTest.kt Outdated
Comment thread CHANGELOG.md Outdated
Comment thread app/src/main/java/to/bitkit/repositories/BackupRepo.kt Outdated
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt
Comment thread app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/screens/profile/EditProfileViewModel.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/screens/contacts/ContactsScreen.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/screens/contacts/ContactsScreen.kt Outdated
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/screens/contacts/AddContactScreen.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/screens/contacts/AddContactScreen.kt Outdated
Comment thread app/src/test/java/to/bitkit/repositories/PubkyRepoTest.kt Outdated
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt Outdated
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt
Comment thread app/src/main/java/to/bitkit/ui/screens/contacts/AddContactScreen.kt Outdated
Comment thread app/src/test/java/to/bitkit/repositories/PubkyRepoTest.kt Outdated
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt Outdated
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt
Comment thread app/src/main/java/to/bitkit/repositories/PubkyRepo.kt
Comment thread app/src/main/java/to/bitkit/viewmodels/PubkyRouteResolver.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/components/ProfileEditForm.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/components/ProfileEditForm.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/components/ProfileEditForm.kt Outdated
@claude

This comment has been minimized.

@ben-kaufman
Copy link
Copy Markdown
Contributor Author

@jvsena42 everything should be resolved now, please recheck

@piotr-iohk
Copy link
Copy Markdown
Collaborator

There's few things around contacts addition (I guess could be addressed later, but did not mention it in any tickets)

  • duplicate contacts addition seems there's no validation on adding contact that already exists. (Could be the same as in case of invalid pubky, or self add)
Screen.Recording.2026-04-25.at.17.06.22.mov
  • retry button does nothing on adding contact on qr code scan
Screen.Recording.2026-04-25.at.17.05.12.mov

Copy link
Copy Markdown
Member

@jvsena42 jvsena42 left a comment

Choose a reason for hiding this comment

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

Add contact from Contacts screen is not validating if a contact was already added

Screen_recording_20260427_082659.webm

@claude
Copy link
Copy Markdown
Contributor

claude Bot commented Apr 27, 2026

Code review

No issues found. Checked for bugs and CLAUDE.md compliance.

Copy link
Copy Markdown
Collaborator

@piotr-iohk piotr-iohk left a comment

Choose a reason for hiding this comment

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

LGTM, to merge this.

Outstanding inconsistencies around contact addition/validation can be addressed separately, added to the ticket: #909 (comment)

Copy link
Copy Markdown
Member

@jvsena42 jvsena42 left a comment

Choose a reason for hiding this comment

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

Still see a divergence when trying to add an existent contact from home and from contacts

Screen_recording_20260428_070658.webm

@piotr-iohk
Copy link
Copy Markdown
Collaborator

Still see a divergence when trying to add an existent contact from home and from contacts

@jvsena42 @ben-kaufman documented those in #909 (comment). I was thinking it could be handled in separate PR not to bloat this one - along with some other add/delete contact flow stuff (see: #909), but might as well be handled here. 👍

@jvsena42
Copy link
Copy Markdown
Member

Still see a divergence when trying to add an existent contact from home and from contacts

@jvsena42 @ben-kaufman documented those in #909 (comment). I was thinking it could be handled in separate PR not to bloat this one - along with some other add/delete contact flow stuff (see: #909), but might as well be handled here. 👍

Agreed, this one has 31 modified files already. I'll keep testing

Copy link
Copy Markdown
Member

@jvsena42 jvsena42 left a comment

Choose a reason for hiding this comment

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

Tested:

  • Login with pubky-ring
  • Add contact from home scanner
  • Try to add self key -> blocked
  • Reset -> restore -> profile restored
  • Add contact from home
  • Add contact from contact screen

Some points to fix in the next PR: #909

@ben-kaufman ben-kaufman merged commit 93b36b5 into master Apr 28, 2026
20 checks passed
@ben-kaufman ben-kaufman deleted the codex-pubky-902-android branch April 28, 2026 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Pubky profile & contacts — outstanding work (Android + iOS)

3 participants