Commit Graph

1570 Commits

Author SHA1 Message Date
Matthew Chen
372d6b9bfd Don’t let user block themselves.
// FREEBIE
2017-04-07 13:02:30 -04:00
Matthew Chen
df58a01330 Revert "Fix i18n key."
This reverts commit 0ba81588ed.
2017-04-07 12:09:08 -04:00
Matthew Chen
e3fb0c5987 Merge branch 'charlesmchen/multipleItemsInPasteboard' 2017-04-07 12:04:10 -04:00
Matthew Chen
1ab4417687 Fix paste when pasteboard has multiple items.
// FREEBIE
2017-04-07 12:04:04 -04:00
Matthew Chen
d3bcc4e4da Merge branch 'charlesmchen/roundAvatarIcons' 2017-04-07 11:58:24 -04:00
Matthew Chen
27aeb425e4 Round avatar icons.
// FREEBIE
2017-04-07 11:58:15 -04:00
Matthew Chen
7fb795491c Merge branch 'charlesmchen/fingerprintViewVsKeyboard' 2017-04-07 11:54:51 -04:00
Matthew Chen
3ac1e75b5f Ensure keyboard doesn't hide "safety numbers changed" interaction.
// FREEBIE
2017-04-07 11:54:42 -04:00
Matthew Chen
0bc8a0f373 Merge branch 'charlesmchen/reformatPhoneNumberVsCountryCodeChange' 2017-04-07 11:52:30 -04:00
Matthew Chen
5feca42821 Reformat phone number if user changes country code.
// FREEBIE
2017-04-07 11:52:21 -04:00
Michael Kirk
df381cf4b9 Merge branch 'mkirk/session-cleanup' 2017-04-07 11:23:49 -04:00
Michael Kirk
6ba5e5cc6b Clean up session-reset logging
// FREEBIE
2017-04-07 10:19:40 -04:00
Matthew Chen
0ba81588ed Fix i18n key.
// FREEBIE
2017-04-06 22:09:23 -04:00
Michael Kirk
8c5ceffe17 sync translations
// FREEBIE
2017-04-06 21:19:19 -04:00
Michael Kirk
24adac289c bump version
// FREEBIE
2017-04-06 21:11:01 -04:00
Michael Kirk
e8056fcbb2 Merge branch 'mkirk/fix-session-reset' 2017-04-06 21:10:42 -04:00
Michael Kirk
d8ae941736 Delete session *before* sending EndSession message
Typically we're sending an EndSession message because our session has
diverged from the remote party's session. So if we send an EndSession
message, but decrypt it with our old out-of-sync session, how can we
expect them to be able to decrypt it?

Instead, by deleting the existing sessions, we'll fetch a new PreKey,
and start fresh with the remote side.

// FREEBIE
2017-04-06 21:09:56 -04:00
Michael Kirk
9d0c76ca56 debug action to reset session
// FREEBIE
2017-04-06 21:09:56 -04:00
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