Commit graph

2345 commits

Author SHA1 Message Date
Matthew Chen a7269a9a5d Clean up ahead of PR.
// FREEBIE
2017-06-09 11:56:37 -04:00
Matthew Chen 128e147c1b Show verification state in fingerprint view and let user change that state.
// FREEBIE
2017-06-09 11:48:06 -04:00
Matthew Chen 10f3f7fe13 Add “learn link”. Move “scan” button into QR code.
// FREEBIE
2017-06-09 11:48:06 -04:00
Matthew Chen 8b9a1e41b4 DRY up safety number success and failure handling.
* Add “mark as verified” option to success case.

// FREEBIE
2017-06-09 11:48:06 -04:00
Matthew Chen cc5e810211 [SSK] Add a default description for verification state messages.
// FREEBIE
2017-06-09 11:43:13 -04:00
Matthew Chen 2dbf305a7d Merge branch 'charlesmchen/fingerprintView2' 2017-06-09 07:48:54 -04:00
Matthew Chen 051b005582 Move QR code scanning to a separate view.
// FREEBIE
2017-06-09 07:48:48 -04:00
Matthew Chen 5264602106 Move QR code scanning to a separate view.
// FREEBIE
2017-06-09 07:48:48 -04:00
Matthew Chen 5a867e3f6c Respond to CR.
// FREEBIE
2017-06-09 07:48:48 -04:00
Matthew Chen 58ebebc97f Move QR code scanning to a separate view.
// FREEBIE
2017-06-09 07:48:48 -04:00
Michael Kirk bc95d4e9e5 Merge branch 'mkirk/archive-not-delete' 2017-06-08 17:57:15 -04:00
Michael Kirk 0a55b965b6 [SSK][SPK] Archive sessions when fetching profile
// FREEBIE
2017-06-08 17:56:44 -04:00
Michael Kirk 6d3d06bd1a CR: continue to delete sessions for EndSession
// FREEBIE
2017-06-08 16:20:23 -04:00
Michael Kirk 6715e76c99 Prefer archiving, to deleting old sessions for better handling of out of
order decryption.

// FREEBIE
2017-06-08 16:19:31 -04:00
Michael Kirk c51b762ec2 Merge branch 'mkirk/fix-build' 2017-06-08 16:10:20 -04:00
Michael Kirk a139bd73e6 Remove deprecated info message from debug UI
// FREEBIE
2017-06-08 16:04:36 -04:00
Matthew Chen 03d35884d2 Merge branch 'charlesmchen/fingerprintView1' 2017-06-08 15:45:29 -04:00
Matthew Chen fe0ddb53d2 Clean up ahead of PR.
// FREEBIE
2017-06-08 15:34:54 -04:00
Matthew Chen 93a587c896 Convert FingerprintViewController to programmatic layout.
// FREEBIE
2017-06-08 15:12:03 -04:00
Matthew Chen 3508feaec3 Convert FingerprintViewController to programmatic layout.
// FREEBIE
2017-06-08 14:55:26 -04:00
Matthew Chen 1ed0b16045 Merge branch 'charlesmchen/verificationStateChangeMessages' 2017-06-08 10:45:59 -04:00
Matthew Chen 869cdfd12c Add verification state change messages.
// FREEBIE
2017-06-08 10:44:23 -04:00
Matthew Chen bc63a72c25 Add verification state change messages.
// FREEBIE
2017-06-08 10:44:23 -04:00
Michael Kirk 7335fc4d01 Merge branch 'mkirk/redundant-sn-changes' 2017-06-08 10:34:57 -04:00
Michael Kirk 64efa2b3c6 [SSK] remove redundant SN changes when sending to new identity
// FREEBIE
2017-06-08 10:34:45 -04:00
Michael Kirk 75bab75dc8 Show no redundant error when failing to send due to changed identity
The old "blocking" style SN alerts are deprecated. We maintain the
functionality to decrypt incoming messages from legacy SN alerts so that
users have time to recover their undecrypted messages.

// FREEBIE
2017-06-08 10:34:45 -04:00
Matthew Chen 894893ceb8 Merge branch 'charlesmchen/syncVerificationState' 2017-06-08 10:25:38 -04:00
Matthew Chen 1ef9ba0659 Clea up usage of fail macro.
// FREEBIE
2017-06-08 10:25:28 -04:00
Matthew Chen 4d370130b2 Merge branch 'charlesmchen/pasteTextFragments' 2017-06-08 10:22:49 -04:00
Matthew Chen c3edbd9aa4 Fix paste of text fragments.
// FREEBIE
2017-06-08 10:22:39 -04:00
Michael Kirk 640b210f1e Merge branch 'mkirk/block-file-sharing' 2017-06-07 22:34:42 -04:00
Michael Kirk 842baa3072 CR: use weak self
// FREEBIE
2017-06-07 22:33:29 -04:00
Michael Kirk f7468acad2 Properly dismiss file view after proceeding with share to no-longer
verified identity

// FREEBIE
2017-06-07 22:31:52 -04:00
Michael Kirk 4e995b76f3 Don't try to share file to untrusted identity
There's a problem with this approach - specifically we need to dismiss
the external file share view controller eventually.

But more generally, because SN can present a view controller, it's kind
success/retry handling is contextual to it's presenting view controller.

So, probably the thing to do is duplicate this logic at it's various
presentation contexts.

// FREEBIE
2017-06-07 22:31:52 -04:00
Matthew Chen a1d3e360df [SSK] Sync verification state.
// FREEBIE
2017-06-07 17:51:27 -04:00
Michael Kirk 3531dda2de Merge branch 'mkirk/create-missed-call-notification-in-thread' 2017-06-07 15:04:29 -04:00
Michael Kirk 9ec6ec5e4e [SSK] create missed call notification in threads
// FREEBIE
2017-06-07 15:04:23 -04:00
Michael Kirk 1a3204bf46 create interaction in thread when missing call due to changed identity
// FREEBIE
2017-06-07 15:04:21 -04:00
Michael Kirk c8a444d931 Merge branch 'mkirk/debug-toggle-verification' 2017-06-07 15:00:32 -04:00
Michael Kirk 022292e2e5 CR: extract method for readability
// FREEBIE
2017-06-07 14:51:52 -04:00
Michael Kirk 5b2428c8a5 debug toggle verification state
// FREEBIE
2017-06-07 14:51:52 -04:00
Michael Kirk 32d05bbe08 [SSK] avoid deadlock on unknown session
// FREEBIE
2017-06-07 14:51:32 -04:00
Michael Kirk 1e6098a9d0 Merge branch 'mkirk/debug-sn-numbers' 2017-06-07 11:20:37 -04:00
Michael Kirk 4000908f43 clarify assert per code review
// FREEBIE
2017-06-07 11:20:12 -04:00
Michael Kirk bae91d97d6 clearer code style
// FREEBIE
2017-06-07 11:02:07 -04:00
Michael Kirk d77addc01e extract session state debug utils into section
// FREEBIE
2017-06-07 10:56:23 -04:00
Michael Kirk 54865e43ed debug item to locally simulate a SN change
...because constantly reinstalling a secondary device takes too long

You can toggle twice to switch it back, but most of the time you'll
simply pull the latest (real) key when the message view regains focus.

// FREEBIE
2017-06-07 10:44:24 -04:00
Michael Kirk 34f59d661a Merge branch 'mkirk/identityManager' 2017-06-07 10:36:42 -04:00
Michael Kirk 2692977168 [SSK] New identity manager
// FREEBIE
2017-06-07 10:36:19 -04:00
Michael Kirk 8c592a373a log error on assertion failure
// FREEBIE
2017-06-07 10:30:08 -04:00