signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity
22,799 Commits 1 Branch 2,246 Tags 1.8 GiB
5bf94de2a6
Commit Graph

22799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4f9e053248 Merge branch 'mkirk/consistent-copy' 2017-04-05 17:35:36 -04:00
Michael Kirk
fcf271f08b Block list is two words 
// FREEBIE
 2017-04-05 17:34:47 -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
Michael Kirk
694088ee98 Merge branch 'mkirk/terminal-sending-failures' 2017-04-05 11:30:55 -04:00
Michael Kirk
fa9e289892 Don't retry some failures 
Motivation:

When we introduced the MessageSendingOperation, we included a new
"retry" loop. However, this had some unintended consequences when
retrying terminal failures.

Some of these are pretty benign and invisible to the user, but some,
like messaging someone who's safety number has changed, results in a
situation where we get rate-limited by the pre-key request.

Description:

This commit includes the machinery to distinguish between retryable and
terminal failures. Upon reporting a terminal failure, the MessageSender
stops retrying to send.

// FREEBIE
 2017-04-05 11:30:41 -04:00
Matthew Chen
3537518268 [SSK] Don’t block outgoing group messages. 
// FREEBIE
 2017-04-05 11:20:57 -04:00
Matthew Chen
bb1a749c49 Merge branch 'charlesmchen/dontBlockOutgoingGroupMessages' 2017-04-05 11:16:03 -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
Matthew Chen
5fa1a3630f Respond to CR. 
// FREEBIE
 2017-04-04 09:32:26 -04:00
Matthew Chen
8dadc3ba22 Don’t update contacts in the blacklist views. 
// FREEBIE
 2017-04-04 09:12:11 -04:00
Matthew Chen
6c1d46c4d7 Use contact names where possible in the block list view. 
// FREEBIE
 2017-04-04 09:12:11 -04:00
Matthew Chen
a7296db1fe Add contacts list to “add blocked number” view. 
// FREEBIE
 2017-04-04 09:12:11 -04:00
Matthew Chen
d84f052b28 Merge branch 'charlesmchen/blocking4' 2017-04-03 19:08:37 -04:00
Matthew Chen
5a234e34d9 Filter incoming and outgoing messages using the blacklist. 
// FREEBIE
 2017-04-03 18:05:05 -04:00
Matthew Chen
06ad8733b2 Merge branch 'charlesmchen/blocking2' 2017-04-03 17:50:42 -04:00
Matthew Chen
2e0c95c379 Respond to CR. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Matthew Chen
db31454320 Respond to CR. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Matthew Chen
89e244ee0a Update to reflect changes to SSK. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Matthew Chen
8578390ee9 Clean up blocklist views. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Matthew Chen
922d48904f Refine BlockListViewController and AddToBlockListViewController. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Matthew Chen
271cc6f07e Sketch out BlockListViewController and AddToBlockListViewController. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Matthew Chen
a155df161f Pull out OWSTableViewController. 
// FREEBIE
 2017-04-03 17:49:06 -04:00
Michael Kirk
176c1f8724 Merge branch 'hotfix/2.9.2' 2017-04-03 17:11:30 -04:00
Matthew Chen
eb68746b6d Merge branch 'charlesmchen/singletonAssert' 2017-04-03 14:53:55 -04:00