diff --git a/content/assets/img/add-contact-options-cropped.png b/content/assets/img/add-contact-options-cropped.png new file mode 100644 index 0000000000000000000000000000000000000000..7fd50dade039844f28be1c7862d79a9f345421f0 Binary files /dev/null and b/content/assets/img/add-contact-options-cropped.png differ diff --git a/content/assets/img/add-contact-options.png b/content/assets/img/add-contact-options.png new file mode 100644 index 0000000000000000000000000000000000000000..6e4faf9fed6723fadaeecaef87edec00bac981f9 Binary files /dev/null and b/content/assets/img/add-contact-options.png differ diff --git a/content/assets/img/add-contact-pending-cropped.png b/content/assets/img/add-contact-pending-cropped.png new file mode 100644 index 0000000000000000000000000000000000000000..70fa1b366a39df15ba38ffbe2b96f640e09e1af6 Binary files /dev/null and b/content/assets/img/add-contact-pending-cropped.png differ diff --git a/content/assets/img/add-contact-pending.png b/content/assets/img/add-contact-pending.png new file mode 100644 index 0000000000000000000000000000000000000000..8273ee47f05a0fe1473662800d8dfbdc71a64d17 Binary files /dev/null and b/content/assets/img/add-contact-pending.png differ diff --git a/content/assets/img/add-contact-remotely.png b/content/assets/img/add-contact-remotely.png new file mode 100644 index 0000000000000000000000000000000000000000..08a6ad199b6bcb5f9b68b01533003a5ef4359afc Binary files /dev/null and b/content/assets/img/add-contact-remotely.png differ diff --git a/content/assets/img/contact-list-cropped.png b/content/assets/img/contact-list-cropped.png deleted file mode 100644 index a5df259c4f832e2c7ea7e69d269560f675bda13d..0000000000000000000000000000000000000000 Binary files a/content/assets/img/contact-list-cropped.png and /dev/null differ diff --git a/content/assets/img/contact-list.png b/content/assets/img/contact-list.png deleted file mode 100644 index f2a430eb510ddcdd070be32d8bee170bccdead6c..0000000000000000000000000000000000000000 Binary files a/content/assets/img/contact-list.png and /dev/null differ diff --git a/content/manual.md b/content/manual.md index 7f3e9219a76da7aa257c6a974df75bcfcb75f99d..f4db443ac09bece2fb69dbc6bd9f8c19109cd6ca 100644 --- a/content/manual.md +++ b/content/manual.md @@ -26,15 +26,44 @@ Tap "Create Account". When your account has been created you'll be taken to the ## Adding Contacts ## -<img src="assets/img/contact-list-cropped.png" alt="The contact list"> +<img src="assets/img/add-contact-options-cropped.png" alt="Options for adding a contact"> -To add a contact, tap the plus icon at the top of the contact list. +To add a contact, tap the plus icon at the bottom right of the contact list. + +Choose one of the two options that appear. + +<div style="clear:both"></div> + +### Add contact at a distance + +<img src="assets/img/add-contact-remotely.png" alt="Adding a contact at a distance"> + +Copy the <code>briar://</code> link and send it to the person you want to add. +You can also use the "Share" button to choose an app for sending the link. + +Paste the link that you receive from the person you want to add into the text field below. +Click "Continue" and choose a nickname for the new contact. + +Next you will see a "Pending Contact Requests" screen +that informs you about the state of each pending contact. +Briar will try to connect to your contact regularly to add them. + +Once a connection succeeds, you'll be added to each other's contact lists. +Congratulations! You're ready to communicate securely. + +If Briar can't connect to your contact after 48 hours, the pending contact list will show the message "Adding contact has failed". Both of you should delete the pending contact from the list and add each other's links again. <div style="clear:both"></div> +<img src="assets/img/add-contact-pending-cropped.png" alt="Pending Contacts"> + +<div style="clear:both"></div> + +### Add contact nearby + <img src="assets/img/add-contact-1.png" alt="Adding a contact, step 1"> -You must meet up with the person you want to add as a contact. Each of you will scan a QR code from the other person's screen. This ensures you're connecting to the right person, so nobody else can impersonate you or read your messages. +Another way to add a contact is to meet up with the person you want to add. Each of you will scan a QR code from the other person's screen. This ensures you're connecting to the right person, so nobody else can impersonate you or read your messages. Tap "Continue" when you're ready to start. diff --git a/crop-screenshots.py b/crop-screenshots.py index 44a38a0d3bf66bc2ea5097f610e88beb061230f2..f333a23623ab2eb50a0d765813c4a608cb79604c 100755 --- a/crop-screenshots.py +++ b/crop-screenshots.py @@ -9,6 +9,8 @@ POSTFIX = '-cropped' def main(): + crop('add-contact-options.png', 93, 65) + crop('add-contact-pending.png', 22, 4) crop('manual_messaging.png', 50) crop('introduction-5.png', 77, 47) crop('manage-rss-feeds-2.png', 35)