Commit Graph

1602 Commits

Author SHA1 Message Date
Michael Kirk 033591aeca Remove unused code
// FREEBIE
2017-04-06 21:09:56 -04:00
Michael Kirk acad91ebc1 Merge branch 'mkirk/session-corruption' 2017-04-06 21:07:26 -04:00
Michael Kirk 87845525b6 [SSK] serialize all read/write to sessionStore
Attempt to avoid session corruption happening due to an inconsistent
view of the session store by ensuring all access to the session store
happens on a serialized queue

// FREEBIE
2017-04-06 21:07:11 -04:00
Michael Kirk caabae0024 Add new debug method to delete session
// FREEBIE
2017-04-06 21:06:13 -04:00
Michael Kirk 398ee22f50 [SSK] rename cipher queue to sessionStoreQueue
// FREEBIE
2017-04-06 21:06:13 -04:00
Michael Kirk a951d11d97 [SSK] move iOSVersion to SSK
// FREEBIE
2017-04-06 21:06:13 -04:00
Michael Kirk 80696e2574 Merge branch 'charlesmchen/newConversationScrollVsKeyboard' 2017-04-06 21:01:04 -04:00
Matthew Chen 554125aeeb Dismiss keyboard if user scrolls in “new 1:1 conversation” view.
// FREEBIE
2017-04-06 21:00:59 -04:00
Michael Kirk dc174ad6f0 Merge branch 'charlesmchen/blocking10' 2017-04-06 20:59:14 -04:00
Michael Kirk cc16b9c893 CR nit: add assert
// FREEBIE
2017-04-06 20:59:07 -04:00
Matthew Chen 19d8f6cf01 Improvements around contact cells.
* Improve handling of accessory views/types.
* Use contact cell in “new/edit group” view.
* Don’t hide blocked contacts and group members in “new/edit group” view.
* Let users “unblock-to-add” blocked contacts in “new/edit group” view.

// FREEBIE
2017-04-06 20:59:07 -04:00
Matthew Chen ff6f383469 Merge branch 'charlesmchen/fixTableAssert' 2017-04-06 15:30:29 -04:00
Matthew Chen 74820d9ba9 Respond to CR.
// FREEBIE
2017-04-06 15:30:21 -04:00
Matthew Chen a1bd2f66f8 Fix invalid assert in the OWS table views.
// FREEBIE
2017-04-06 12:07:51 -04:00
Matthew Chen c597bacdca Merge branch 'charlesmchen/blocking9' 2017-04-06 11:57:19 -04:00
Matthew Chen fd86495e26 Respond to CR.
// FREEBIE
2017-04-06 11:57:08 -04:00
Matthew Chen 8823b2884a Refine the “block list” view.
// FREEBIE
2017-04-05 21:58:51 -04:00
Matthew Chen b5562fa126 Update “new 1:1 conversation” view.
* Don’t hide blocked users.  If selected, user needs to unblock to start conversation.
* Add “you have no contacts” indicator.
* Activate “block state indicator” in contact cell.

// FREEBIE
2017-04-05 21:39:15 -04:00
Matthew Chen 8867b2882e Tweak appearance of contact cell.
// FREEBIE
2017-04-05 21:37:26 -04:00
Matthew Chen b6f944f3d3 Tweak appearance of “add to block list” view.
// FREEBIE
2017-04-05 21:37:07 -04:00
Michael Kirk 42b6ac6715 bump build
// FREEBIE
2017-04-05 18:10:55 -04:00
Michael Kirk 300251171c Sync translations
// FREEBIE
2017-04-05 18:10:35 -04:00
Michael Kirk c36bb72033 Merge branch 'mkirk/copy-updates' 2017-04-05 17:59:32 -04:00
Michael Kirk 4494a95a62 Block list is two words. Update code/comments/constants
// FREEBIE
2017-04-05 17:37:08 -04:00
Michael Kirk e94cc18263 Merge branch 'mkirk/blocking8' 2017-04-05 17:23:28 -04:00
Michael Kirk 78705d3ac1 right align blocked indicator
// FREEBIE
2017-04-05 17:23:23 -04:00
Michael Kirk 1a73b439d8 Merge remote-tracking branch 'origin/charlesmchen/blocking8' 2017-04-05 17:22:46 -04:00
Matthew Chen e0c7457eca Refine appearance of “add to block list” view.
// FREEBIE
2017-04-05 13:47:56 -04:00
Matthew Chen b3d6a82c4f Show blocked users in “add to block list” view.
// FREEBIE
2017-04-05 13:27:29 -04:00
Matthew Chen 4349f00cdc Merge branch 'charlesmchen/blocking6' 2017-04-05 12:23:54 -04:00
Matthew Chen f56227ce26 Respond to CR.
// FREEBIE
2017-04-05 12:22:35 -04:00
Matthew Chen af6e51f83c Make local copy of contact list.
// FREEBIE
2017-04-05 12:18:44 -04:00
Matthew Chen 54e6d4400c Multiple improvements around contacts and the blocklist.
* Hide blocked users and current user in “new 1:1 conversation” view.
* Hide blocked users and current user in “new/edit group conversation” view.
* Hide blocked users and current user in “add to blocklist” view.
* Hide blocked users and current user in “blocklist” view.
* Improve thready safety around contact changes in views.

// FREEBIE
2017-04-05 12:18:44 -04:00
Matthew Chen 68d2ea2fd8 Merge branch 'charlesmchen/blocking7' 2017-04-05 12:18:08 -04:00
Matthew Chen 7273e6faa5 Respond to CR.
// FREEBIE
2017-04-05 12:18:01 -04:00
Matthew Chen 99a1b4e9f4 Revert unintended l10n changes.
// FREEBIE
2017-04-05 12:18:01 -04:00
Matthew Chen 7f21a1bf62 Dismiss “block state indicator” if user scrolls message view.
// FREEBIE
2017-04-05 12:18:01 -04:00
Matthew Chen c500e7890f Improve completion handling of block actions.
// FREEBIE
2017-04-05 12:18:01 -04:00
Matthew Chen 9c9060203e Block actions in message view for blocked group conversations.
* Add block status indicator view.

// FREEBIE
2017-04-05 12:18:01 -04:00
Matthew Chen 8c347699bb Block actions in message view for blocked contact conversations.
// FREEBIE
2017-04-05 12:18:01 -04:00
Michael Kirk f46080519e [SSK] Don't retry terminal sending failures
* Causing prekey request rate-limit when sending to someone who's
  reregistered.
* Unnecessarily printing "unregistered user" multiple times.
* etc.

// FREEBIE
2017-04-05 11:36:43 -04:00
Matthew Chen 3537518268 [SSK] Don’t block outgoing group messages.
// FREEBIE
2017-04-05 11:20:57 -04:00
Matthew Chen d640aaa9d7 Merge branch 'charlesmchen/blocking5' 2017-04-05 09:31:51 -04:00
Matthew Chen 71007cc3d1 Respond to CR.
// FREEBIE
2017-04-05 09:09:14 -04:00
Matthew Chen 253776d65c Respond to CR.
// FREEBIE
2017-04-05 09:09:14 -04:00
Matthew Chen dcb7eef3fc Respond to CR.
// FREEBIE
2017-04-05 09:09:13 -04:00
Matthew Chen 54cd8cfa3c Add blacklist controls to 1:1 conversation view.
// FREEBIE
2017-04-05 09:09:13 -04:00
Michael Kirk 80ddc1a2c3 sync translations
// FREEBIE
2017-04-04 20:08:14 -04:00
Michael Kirk 127e7f7386 bump release target
// FREEBIE
2017-04-04 20:00:25 -04:00
Matthew Chen d001a5b519 Merge branch 'charlesmchen/blocking3' 2017-04-04 09:32:50 -04:00