Commit Graph

2318 Commits

Author SHA1 Message Date
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
Michael Kirk
f74c3a0e87 remove unused code
// FREEBIE
2017-06-07 10:29:45 -04:00
Michael Kirk
c8d547a08f Only allow callback for identities that were not previously verified
// FREEBIE
2017-06-07 10:29:45 -04:00
Michael Kirk
1127553041 restore "confirm and callback" functionality
// FREEBIE
2017-06-07 10:29:01 -04:00
Michael Kirk
146031e4d5 update copy / remove some unused "unseen" tracking
// FREEBIE
2017-06-07 10:19:09 -04:00
Michael Kirk
41a34e572b Update Safety Number alerts to work with verification
// FREEBIE
2017-06-07 10:18:16 -04:00
Matthew Chen
c7c243cfed Clean up ahead of PR.
// FREEBIE
2017-06-07 10:18:16 -04:00
Matthew Chen
b6ddea9eae Sketch out OWSIdentityManager.
// FREEBIE
2017-06-07 10:18:16 -04:00
Matthew Chen
ceb210748e Sketch out OWSIdentityManager.
// FREEBIE
2017-06-07 10:18:16 -04:00
Matthew Chen
847f9e50bb Merge branch 'charlesmchen/censorshipCircumventionIndicator' 2017-06-06 16:03:06 -04:00
Matthew Chen
1dffdb5ca0 Indicate if censorship circumvention is active in the main app settings view.
// FREEBIE
2017-06-06 16:03:00 -04:00
Matthew Chen
320dfd89e3 Merge branch 'charlesmchen/moreSystemMessages' 2017-06-06 16:00:33 -04:00
Matthew Chen
15074cdb8f Clean up system message cells, make them tappable, etc.
// FREEBIE
2017-06-06 10:26:06 -04:00
Matthew Chen
6a6d71db6c Merge branch 'charlesmchen/reworkSystemMessages' 2017-06-06 10:16:06 -04:00
Matthew Chen
2d76f2beb9 Respond to CR.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
301c8c51a1 Clean up ahead of PR.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
eb53958aeb Clean up ahead of PR.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
efa40dbdb7 Rework icons in conversation settings view.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
b3c42f0c3e Rework and unify the system messages.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
a013a7206e Rework and unify the system messages.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
459c6c6ed4 Rework and unify the system messages.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
9cdf907e20 Rework and unify the system messages.
// FREEBIE
2017-06-06 10:15:56 -04:00
Matthew Chen
2cbf1e1d05 Rework and unify the system messages.
// FREEBIE
2017-06-06 10:15:56 -04:00
Michael Kirk
f5caf37042 Merge branch 'mkirk/fix-migration' 2017-06-06 10:06:08 -04:00
Michael Kirk
177800c641 only run migration once
// FREEBIE
2017-06-06 10:05:53 -04:00
Matthew Chen
e80a00a6b2 [SSK] Format fail messages.
// FREEBIE
2017-06-06 09:58:53 -04:00
Matthew Chen
58f360b620 [SSK] Rework and unify the system messages.
// FREEBIE
2017-06-06 09:50:29 -04:00
Matthew Chen
ca527951fd Merge branch 'charlesmchen/unreadIndicatorAppearance2' 2017-06-05 17:16:16 -04:00