Signal/Registration-and-Provisioning-via-signal-cli.md

@@ -53,15 +53,57 @@ _Wait until additional software has been installed successfully_
 5. Start a shell with torsocks by executing: `torsocks --shell`
 6. Now you can run any `signal-cli-jre` command, refer to [man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli.1.adoc) for help
 
-## Registration
+**Replace $PHONE_NR with your phone number using the international format (e. g. +15758941234 for a number registered in Truth or consequences, New Mexico)**
+
+## Registration and registration lock pin
 1. Follow steps 1 through 5 at section [General use of signal-cli on Tails](#General-use-of-signal-cli-on-Tails)
 2. Follow the steps on https://github.com/AsamK/signal-cli/wiki/Registration-with-captcha
+3. You should set a registration lock pin, to prevent others from registering this number:
+~~~
+signal-cli -a $PHONE_NR setPin "verysafepassword"
+~~~
+Tip: Use [KeepassXC preinstalled on tails](https://tails.boum.org/doc/encryption_and_privacy/manage_passwords/) for generating and storing safe passwords.
+
 ### Additional Tips:
 - If you want to register a number which is only able to receive phone calls, add the `--voice` parameter to the register command:
 ~~~
-signal-cli -u $PHONE_NR register --voice --captcha "signalcaptcha://signal-recaptcha-v2.someshortercode.registration.someverylongcode"
+signal-cli -a $PHONE_NR register --voice --captcha "signalcaptcha://signal-recaptcha-v2.someshortercode.registration.someverylongcode"
 ~~~
 - If the number was registered before and locked with a pin, use the `--pin` parameter during `verify` command:
 ~~~
 signal-cli -a $PHONE_NR verify --pin "yourPIN" 123456
 ~~~
+
+## Provisioning Signal-Desktop
+1. Start your Tails unlocking your persistent storage
+1.  _Wait until additional software has been installed successfully_
+2. Choose Applications ▸ System Tools ▸ Terminal
+3. In order to read the qrcode, we need the package `zbar-tools`, execute: `sudo apt update && sudo apt install zbar-tools'
+4. 5. Make the installation persistent (*Install every time*) following step 3. at https://tails.boum.org/doc/persistent_storage/additional_software/#index4h2
+3. Run Signal Desktop: `Persistent/signal-desktop.sh`
+6. [Make a screenshot](https://tails.boum.org/doc/sensitive_documents/screenshot_and_screencast/index.en.html) capturing the Signal Desktop window showing the qr-code and safe the picture in `/home/amnesia/Pictures/qr.jpg`
+4. Open a new Terminal tab (top left + icon) or window (top right burger menu)
+4. Get the qr-code link executing `zbarimg /home/amnesia/Pictures/qr.jpg`
+6. Copy the qr decoded link (`sgnl://…`) to the clipboard.
+5. Follow steps 1 through 5 at section [General use of signal-cli on Tails](#General-use-of-signal-cli-on-Tails)
+7. Add your Signal Desktop to signal-cli executing 'signal-cli -a $PHONE_NR addDevice --uri "PasteTheQrCodeLinkHere"'
+8. Signal-Desktop should ask you to name the device (internal designation)
+9. If everything was successful, Signal Desktop should be ready to use. You can obtain a list of devices using your registered signal no. executing: `signal-cli -a $PHONE_NR listDevices`. It should list your Signal Desktop with the name you set in step 13. among the master (signal-cli).  
+10. Use Settings to enable/disable features such as link preview, incoming calls etc. Recommended settings in terms of privacy are:
+- Grant access to microphone only if using voice messages or voice calling.
+- Grant access to camera only if using video calling.
+- Disable link preview.
+- Activate incoming calls only if you want to make Signal calls.
+- Set calls to indirect.
+- Disable read receipts.
+- Disable typing indicators
+- Set a value for default disappearing messages 
+
+## Every now and then: Receiving messages with signal-cli
+Every now and then you should also receive events with your signal-cli, so in case something needs to be done via signal-cli, it doesn't take ages to sync last 300 days or so of events:
+## Provisioning Signal-Desktop
+1. Start your Tails unlocking your persistent storage
+1.  _Wait until additional software has been installed successfully_
+2. Choose Applications ▸ System Tools ▸ Terminal
+3. Follow steps 1 through 5 at section [General use of signal-cli on Tails](#General-use-of-signal-cli-on-Tails)
+4. Receive events executing: `signal-cli -a $PHONE_NR receive`
\ No newline at end of file