Mobile: Support accepting Joplin shares #10300
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| }, [invitation]); | ||
|
|
||
| const sharer = invitation.share.user; | ||
| if (!sharer) return <Text>Error: Share missing user</Text>; // Should not happen |
There was a problem hiding this comment.
Suggested change
| if (!sharer) return <Text>Error: Share missing user</Text>; // Should not happen |
This check might not be necessary. It was added because invitation.share.user is marked as optional in the type StateShare.
| @@ -379,6 +380,7 @@ async function setupDatabase(id: number = null, options: any = null) { | |||
| await clearSettingFile(id); | |||
| await loadKeychainServiceAndSettings(options.keychainEnabled ? KeychainServiceDriver : KeychainServiceDriverDummy); | |||
|
|
|||
| reg.setDb(databases_[id]); | |||
There was a problem hiding this comment.
Without this change, reg.scheduleSync logs a warning related to a missing database during tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This pull request does two things:
ScreenHeadercomponent, which is a connected Redux component. To allow testing this, a small amount of refactoring was required.ShareServicewas moved out ofShareService.test.tsxand intopackages/lib/testing/share/mockShareService.tsto allow using it for tests for the new mobile UI.Note
A large part of the changes made in this pull request are only related to tests. These changes are made in 0c702e7 and can be moved to a separate pull request or discarded on request.
Screenshots
iOS:
Android:
Testing plan
This pull request has automated tests, but they don't cover all cases. As such, this pull request has also been tested manually by:
self@localhostandself2@localhost)self2@localhosttoself@localhostself@localhostThis has been tested successfully on an Android 7 device. (More limited testing was done on iOS).