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

8212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kirk
d04bb86258 sync translations 2018-07-23 16:10:33 -06:00
Matthew Chen
48fb652d83 Merge branch 'charlesmchen/unknownObjectVsNPE' 2018-07-23 16:05:56 -06:00
Matthew Chen
76f0a6b8b4 Merge branch 'charlesmchen/unknownObjectVsNPE' 2018-07-23 17:13:52 -04:00
Matthew Chen
5530b8d701 Respond to CR. 2018-07-23 17:13:01 -04:00
Matthew Chen
7a898f5e99 Fix NPE using mock for unknown database objects. 2018-07-23 16:53:02 -04:00
Matthew Chen
2c973782c4 Fix NPE using mock for unknown database objects. 2018-07-23 16:52:00 -04:00
Matthew Chen
723691400f Fix NPE using mock for unknown database objects. 2018-07-23 16:50:12 -04:00
Matthew Chen
708ef6f7dd Fix NPE using mock for unknown database objects. 2018-07-23 16:42:11 -04:00
Matthew Chen
060e0fd062 Fix NPE using mock for unknown database objects. 2018-07-23 16:40:01 -04:00
Matthew Chen
79dcbf8a79 Update cocoapods. 2018-07-23 15:58:08 -04:00
Matthew Chen
28ad8d065b Revert Pods update. 2018-07-23 15:57:08 -04:00
Michael Kirk
fd9125ce1a Merge branch 'mkirk/remove-swipe-for-info' into release/2.28.0 2018-07-23 13:08:53 -06:00
Michael Kirk
2d4eb7d057 remove interactive 'swipe for info' 2018-07-23 13:08:41 -06:00
Michael Kirk
57c4d97093 Merge branch 'mkirk/speed-up-message-action-presentation' into release/2.28.0 2018-07-23 13:08:07 -06:00
Michael Kirk
aba358e894 faster message actions presentation 2018-07-23 13:07:51 -06:00
Michael Kirk
f31c6a22f0 Merge branch 'mkirk/cds-feedback' 2018-07-23 13:07:12 -06:00
Michael Kirk
558b3bd245 Report contact discovery feedback 2018-07-23 13:06:40 -06:00
Michael Kirk
0721000251 Merge branch 'mkirk/contact-discovery' 2018-07-23 13:05:56 -06:00
Michael Kirk
8c5d6ba9bb Respond to code review. 2018-07-23 12:21:54 -06:00
Michael Kirk
b42f528713 Integrate with new contact discovery endpoint 
Also:
* use system cookie parsing
* add AESGCM additional authenticated data parameter

// FREEBIE
 2018-07-23 12:21:54 -06:00
Michael Kirk
a611625691 fixup lookup threading 2018-07-23 12:20:35 -06:00
Michael Kirk
dedfea78da callback handlers for remote attestation 2018-07-23 12:20:35 -06:00