Commit graph

1908 commits

Author SHA1 Message Date
Michael Kirk fbcda40400 rename class, extract color
per code review

// FREEBIE
2017-05-08 11:15:45 -04:00
Michael Kirk a58a71f8f4 no contacts banner -> system settings 2017-05-08 11:15:45 -04:00
Matthew Chen f76bb8397f Merge branch 'charlesmchen/searchVsNonSignalContacts' 2017-05-08 09:17:04 -04:00
Matthew Chen 9f4b8d3b0f Slightly reduce the non-contact cell heights in “new 1:1 conversation” view.
// FREEBIE
2017-05-05 21:18:21 -04:00
Matthew Chen d0e26a58c3 Show “invite by SMS” offer for matching non-Signal contacts when searching in “new 1:1: conversation” view.
// FREEBIE
2017-05-05 21:18:21 -04:00
Matthew Chen 791b0d78a8 Merge branch 'charlesmchen/conversationSettingsAssert' 2017-05-05 21:13:11 -04:00
Matthew Chen 1e6fd385b5 Fix assert in conversation settings view.
// FREEBIE
2017-05-05 21:12:36 -04:00
Matthew Chen c7d25a66ad Merge branch 'charlesmchen/contactParsingPerf' 2017-05-05 21:10:05 -04:00
Matthew Chen 3f7d23e043 Fix two hotspots in contact parsing and contact syncing.
// FREEBIE
2017-05-05 21:09:06 -04:00
Matthew Chen bbf099894c [SSK] Fix a hotspot in the phone number parsing logic.
// FREEBIE
2017-05-05 21:07:32 -04:00
Matthew Chen 3671b3aeb5 Merge branch 'charlesmchen/multipleAccounts' 2017-05-05 21:02:54 -04:00
Matthew Chen 057bb76e66 [SSK] Rework handling of phone number names.
// FREEBIE
2017-05-05 21:01:51 -04:00
Matthew Chen 535fc566a5 Rework handling of phone number names.
// FREEBIE
2017-05-05 21:00:41 -04:00
Matthew Chen 4032f40a3f Merge branch 'charlesmchen/contactsSync' 2017-05-05 20:57:55 -04:00
Matthew Chen 0c4351a908 Use SignalAccount class to sync contacts.
// FREEBIE
2017-05-05 20:57:35 -04:00
Michael Kirk dd95b13d37 Merge branch 'mkirk/compiler-warnings' 2017-05-05 14:28:37 -04:00
Michael Kirk 835ab3dd93 [SSK] fix some compiler warnings
// FREEBIE
2017-05-05 14:28:24 -04:00
Michael Kirk d7c7fff679 Fix some compiler warnings
* explicit optional usage in strings
* remove some unused StringUtil code
* swiftlint affected files
* more concise optional casting (and avoid a `!`)

Compiler warnings: 343 -> 318

(Actually most of these are in external libs, but 115 remain in Signal/SSK)

// FREEBIE
2017-05-05 14:26:29 -04:00
Michael Kirk ce2ee759f8 Update to latest recommended xcode.proj settings
// FREEBIE
2017-05-05 14:26:29 -04:00
Matthew Chen fb4ee8ffb8 Merge branch 'charlesmchen/newConversationView' 2017-05-05 10:45:18 -04:00
Matthew Chen 45ae8fb067 Respond to CR.
// FREEBIE
2017-05-05 10:42:42 -04:00
Matthew Chen 2bc1d44cd2 Respond to CR.
// FREEBIE
2017-05-05 10:42:42 -04:00
Matthew Chen 1b99671e0e Clean up ahead of PR.
// FREEBIE
2017-05-05 10:42:42 -04:00
Matthew Chen 325134c6e8 Clean up ahead of PR.
// FREEBIE
2017-05-05 10:42:42 -04:00
Matthew Chen 363d84fd2d Update “new conversation” view to use OWSTableView, contacts view helper, etc.
// FREEBIE
2017-05-05 10:42:42 -04:00
Matthew Chen 4b9ee2dcfe Merge branch 'charlesmchen/orderedWebRTCDataChannel' 2017-05-05 10:41:09 -04:00
Matthew Chen dcdfcb0a6f Insist upon an "ordered" TCP data channel for delivery reliability.
// FREEBIE
2017-05-05 10:41:00 -04:00
Matthew Chen 1444cfc630 Merge remote-tracking branch 'origin/hotfix/2.11.2' 2017-05-04 10:45:12 -04:00
Michael Kirk 83a089f429 [SSK] better sender logs
// FREEBIE
2017-05-04 09:48:45 -04:00
Michael Kirk a794fe8358 Merge branch 'mkirk/delay-contact-access' 2017-05-04 09:47:46 -04:00
Michael Kirk a056c1e052 Check for signalContact vs. AB setup.
Same intent as previous check but more to the point, and doesn't
require tracking additional state.

// FREEBIE
2017-05-04 09:47:04 -04:00
Michael Kirk 364f416a69 Block editing contact if user has denied contact permissions
// FREEBIE
2017-05-04 09:47:04 -04:00
Michael Kirk b24cf29189 don't request contacts until necessary
Most commonly this will be after hitting the "compose" button

But also we'll do it in the SignalViewController once you've received a
message.

- get rid blocking contacts nag
- use Contacts framework simplifies logic
- remove dead AB code

// FREEBIE
2017-05-04 09:47:04 -04:00
Matthew Chen 931b6b4200 [SSK] Minor cleanup.
// FREEBIE
2017-05-03 18:02:59 -04:00
Matthew Chen 563ccf671e [SSK] Temporary change to improve read receipt logging.
// FREEBIE
2017-05-03 18:01:09 -04:00
Matthew Chen b801b2cfe6 Merge branch 'charlesmchen/audioPlayer3' 2017-05-03 17:08:32 -04:00
Matthew Chen 33415eaa0f Respond to CR.
// FREEBIE
2017-05-03 17:05:27 -04:00
Matthew Chen ae7934c117 Update appearance of audio and generic attachment adapters.
// FREEBIE
2017-05-03 17:05:27 -04:00
Matthew Chen c2cdeb3bcd Remove SCWaveformView.
// FREEBIE
2017-05-03 17:05:27 -04:00
Matthew Chen 800715a5e0 Remove waveform from audio message bubbles.
// FREEBIE
2017-05-03 17:05:27 -04:00
Michael Kirk 61523a14a1 Merge branch 'mkirk/contact-fixups' 2017-05-03 16:50:58 -04:00
Michael Kirk 93801e8d29 only show count when there is more than 1 of the same type
// FREEBIE
2017-05-03 16:50:49 -04:00
Michael Kirk 4b6bfa4c4c "home", "other" and "work" instead of "Unknown" phone label
// FREEBIE
2017-05-03 16:50:49 -04:00
Michael Kirk fb7a9e39ab bump build
// FREEBIE
2017-05-03 10:27:45 -04:00
Michael Kirk ee7adca039 Merge branch 'hotfix/display-text-crash' into hotfix/2.11.2 2017-05-03 10:27:18 -04:00
Michael Kirk 2f05dcc2c5 fix crash when viewing undisplayable text
(can't init attributed string with nil)

// FREEBIE
2017-05-03 10:22:53 -04:00
Michael Kirk 572c1e3d80 pull latest translations
// FREEBIE
2017-05-03 10:05:50 -04:00
Michael Kirk b5b4eb4564 bump build
// FREEBIE
2017-05-03 10:03:09 -04:00
Michael Kirk 836f6bb678 Merge pull request #2061 from WhisperSystems/charlesmchen/speakerPhoneVsWebRTC
Fix speakerphone vs. WebRTC AND Fix CallService edge cases.
2017-05-03 10:02:32 -04:00
Matthew Chen 0f85284b82 Fix speakerphone vs. WebRTC AND Fix CallService edge cases.
// FREEBIE
2017-05-03 09:34:39 -04:00