Commit graph

8384 commits

Author SHA1 Message Date
Matthew Chen
8d1011a1fc Verify certificate subject. 2018-07-26 14:48:27 -04:00
Matthew Chen
c65b38ad64 Revert "Revert "Revert temporary changes.""
This reverts commit 62fa34d77373cbf530f8d63a0de3504097771df8.
2018-07-26 14:48:27 -04:00
Matthew Chen
aef881cad3 Verify certificate subject. 2018-07-26 14:48:27 -04:00
Matthew Chen
54d025e110 Revert "Revert temporary changes."
This reverts commit 97eb405a9e.
2018-07-26 14:48:27 -04:00
Michael Kirk
594c9aacfe Merge branch 'mkirk/update-auth-params' 2018-07-26 11:58:36 -06:00
Michael Kirk
5e2dc18931 rename token -> password 2018-07-26 11:58:26 -06:00
Michael Kirk
1ce277a95b Merge branch 'mkirk/parser-fixup' 2018-07-26 11:56:31 -06:00
Michael Kirk
ac461ca2d1 Fixup parser: Robust to servers various "empty" types
For base64Encoded data, sometimes the server sends "null" sometimes the server
sends an empty string.
2018-07-26 11:56:22 -06:00
Michael Kirk
4a37b0e79d Merge branch 'mkirk/unbatch-legacy-contact' 2018-07-26 11:55:26 -06:00
Michael Kirk
6d46ed0e3f No change in behavior: move class down 2018-07-26 11:55:00 -06:00
Michael Kirk
2e38fa145c Unbatch legacy contact requests
// FREEBIE
2018-07-26 11:55:00 -06:00
Matthew Chen
e602cf55a0 Merge branch 'charlesmchen/refineTheme' 2018-07-26 11:10:01 -04:00
Matthew Chen
baf432f1ee Respond to CR. 2018-07-26 11:05:29 -04:00
Matthew Chen
fa8a07abf1 Respond to CR. 2018-07-26 10:54:45 -04:00
Matthew Chen
581347a7fb Refine theme. 2018-07-26 09:42:48 -04:00
Matthew Chen
7759c9ca0f Refine theme. 2018-07-26 09:42:48 -04:00
Matthew Chen
f795b12a86 Refine theme. 2018-07-26 09:42:48 -04:00
Matthew Chen
594eeea19f Merge branch 'charlesmchen/cleanupAttachment' 2018-07-26 09:25:48 -04:00
Matthew Chen
9334143f5e Organize attachments. 2018-07-26 09:25:24 -04:00
Matthew Chen
e194959c13 Merge branch 'charlesmchen/recipientDevices' 2018-07-26 09:22:47 -04:00
Matthew Chen
b0a516c36f Refine recipient device updates. 2018-07-26 09:22:40 -04:00
Matthew Chen
0518b335d8 Refine recipient device updates. 2018-07-26 09:22:40 -04:00
Michael Kirk
2c8a64a48f Merge branch 'mkirk/dry-up-param-parsing' 2018-07-25 15:36:39 -06:00
Michael Kirk
bae2e8649d Dry up Parameter parsing logic 2018-07-25 15:35:30 -06:00
Michael Kirk
c2ed507d66 Merge tag '2.28.0.13' 2018-07-25 15:24:08 -06:00
Michael Kirk
0081a877ef Merge branch 'mkirk/validated-protos' 2018-07-25 15:22:21 -06:00
Michael Kirk
7f8dc83330 Update Pods 2018-07-25 15:22:07 -06:00
Michael Kirk
d39906f606 CR: test malformed protos 2018-07-25 15:20:07 -06:00
Michael Kirk
e5856b2ac5 CR: Add back deprecated constructor to debug list 2018-07-25 15:19:40 -06:00
Michael Kirk
1824d7dcef "Bump build to 2.28.0.13." 2018-07-25 14:17:01 -06:00
Michael Kirk
778a8aa079 sync translations 2018-07-25 14:16:53 -06:00
Michael Kirk
4a84404d11 Update WebRTC 2018-07-25 14:14:57 -06:00
Michael Kirk
abcd0a1d29 CR: revert logging change 2018-07-25 14:00:25 -06:00
Michael Kirk
06bbe907b9 builder pattern for proto construction 2018-07-25 13:55:06 -06:00
Michael Kirk
9299c5e573 CR: tweak proto class name, include yet-to-be-used protos
// FREEBIE
2018-07-25 13:48:52 -06:00
Michael Kirk
b860dce7f9 Swift protos for Envelope 2018-07-25 13:04:26 -06:00
Michael Kirk
e77b798aa7 Merge branch 'mkirk/webrtc-m68' 2018-07-25 13:02:00 -06:00
Michael Kirk
19ece45c8d Update WebRTC to M68 2018-07-25 13:01:51 -06:00
Michael Kirk
d5ebd5a60f UBSan fixup 2018-07-25 13:01:51 -06:00
Matthew Chen
73012d4699 Merge branch 'jsq/xcode-file-templates' 2018-07-25 11:55:45 -04:00
Jesse Squires
868a35ce4c Add IDE template macro for consistent headers
Xcode has undesirable default header comments, and now you can customize them.
This adds an `IDETemplateMacros.plist` file to the `xcworkspace` so that new files created
in the workspace have the same, consistent default header comments automatically added:

```
//
//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
```

This will prevent contributors from either (1) committing Xcode's default, or
(2) having to manually copy-pasta the standard comment headers for every new file added.

[See here for more details](https://oleb.net/blog/2017/07/xcode-9-text-macros/)
2018-07-25 11:55:27 -04:00
Michael Kirk
3126db4316 Merge branch 'jsq/building-update' 2018-07-24 18:31:47 -06:00
Jesse Squires
196b2fb1fa
[Build] Update clone instructions
Per discussion [here](https://community.signalusers.org/t/not-able-to-build-in-xcode-9-3-9-4/3498/12).

Using `--recurse-submodules` will init and update all submodules, so you can do everything at once. I find this a bit nicer.
(Also, it seems like it might be more reliable with GitHub forks?)

I realize `make dependencies` runs `git submodule update --init`. It will just be a no-op if you clone this way.
2018-07-24 16:50:12 -07:00
Michael Kirk
2298d50d12 Merge branch 'mkirk/cds-retry' 2018-07-24 10:14:00 -06:00
Michael Kirk
f002f89f2c Update retryable
Per Jeff, don't handle CDS requests yet.
2018-07-24 10:13:37 -06:00
Michael Kirk
0598733fc6 Merge branch 'mkirk/cds-feedback-2' 2018-07-24 10:03:58 -06:00
Michael Kirk
3507367a90 Don't report feedback for HTTP errors.
// FREEBIE
2018-07-24 10:03:47 -06:00
Michael Kirk
11db859e6b adapt to changes since RI 2018-07-23 16:19:23 -06:00
Michael Kirk
6e1c1a681b Merge tag '2.28.0.12' 2018-07-23 16:12:46 -06:00
Michael Kirk
6518aa24a3 "Bump build to 2.28.0.12." 2018-07-23 16:10:38 -06:00