Commit Graph

22799 Commits

Author SHA1 Message Date
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
Michael Kirk
a92129a0ee better sending logs
// FREEBIE
2017-05-04 09:43:13 -04:00
Michael Kirk
e336e0b34a Merge branch 'mkirk/delay-contact-access' 2017-05-04 09:41:55 -04:00
Michael Kirk
4338c59356 disambiguate contact param
// FREEBIE
2017-05-04 09:41:40 -04:00
Matthew Chen
931b6b4200 [SSK] Minor cleanup.
// FREEBIE
2017-05-03 18:02:59 -04:00
Matthew Chen
d25a934039 Merge branch 'charlesmchen/cleanup' 2017-05-03 18:02:29 -04:00
Matthew Chen
9b8d6bd87d Minor cleanup.
// FREEBIE
2017-05-03 18:02:19 -04:00
Matthew Chen
563ccf671e [SSK] Temporary change to improve read receipt logging.
// FREEBIE
2017-05-03 18:01:09 -04:00
Matthew Chen
25e086c221 Merge branch 'charlesmchen/autoMarkAsRead' 2017-05-03 17:59:57 -04:00
Matthew Chen
2a64ff29e5 Temporary change to improve read receipt logging. 2017-05-03 17:26:48 -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
77833e727a Merge pull request #196 from WhisperSystems/mkirk/contact-fixup
Properly handle "work", "home", and "other" labels
2017-05-03 16:34:09 -04:00
Michael Kirk
f4dd01e300 Properly handle "work", "home", and "other" labels
// FREEBIE
2017-05-03 15:00:44 -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
Matthew Chen
c7931aa2c1 Merge branch 'charlesmchen/contactsDatabaseDeadlock' 2017-05-02 15:26:31 -04:00
Michael Kirk
1b66e0ba26 Fix crash when placing call
// FREEBIE
2017-05-02 15:15:14 -04:00
Matthew Chen
147107d76c Fix database deadlock in contacts manager.
// FREEBIE
2017-05-02 13:59:35 -04:00
Matthew Chen
5b9978b07f Merge branch 'charlesmchen/groupAvatarScaling' 2017-05-02 12:57:37 -04:00
Matthew Chen
4bc98dba58 Rework the scaling and cropping of group avatars.
// FREEBIE
2017-05-02 12:56:13 -04:00
Matthew Chen
cb293f286a [SSK] Add SignalAccount class, Extract labels for phone numbers.
// FREEBIE
2017-05-02 12:40:51 -04:00
Matthew Chen
4431fa3356 Merge branch 'charlesmchen/signalAccount' 2017-05-02 12:39:27 -04:00
Matthew Chen
97010c5909 Merge branch 'charlesmchen/groupsVsNonContacts_' 2017-05-02 12:34:56 -04:00
Matthew Chen
8eef4c634c Respond to CR.
// FREEBIE
2017-05-02 12:34:07 -04:00
Matthew Chen
26f69b0063 Respond to CR.
// FREEBIE
2017-05-02 12:30:53 -04:00
Matthew Chen
f71ec9f7cb Respond to CR.
// FREEBIE
2017-05-02 11:16:34 -04:00
Matthew Chen
2bec1db541 Respond to CR.
// FREEBIE
2017-05-02 10:54:07 -04:00
Matthew Chen
ad11c50c1b Reworking observation of Contact and SignalAccount changes.
// FREEBIE
2017-05-02 09:28:50 -04:00
Matthew Chen
994aec0d86 Add SignalAccount class.
// FREEBIE
2017-05-02 09:28:50 -04:00
Matthew Chen
6801963a1b Add SignalAccount class.
// FREEBIE
2017-05-02 09:28:50 -04:00
Matthew Chen
93700f1044 Extract labels for phone numbers.
// FREEBIE
2017-05-02 09:28:50 -04:00
Matthew Chen
42768294ee Extract labels for phone numbers.
// FREEBIE
2017-05-02 09:28:50 -04:00
Matthew Chen
cb9d96be00 Clean up ahead of PR.
// FREEBIE
2017-05-02 09:28:02 -04:00
Matthew Chen
da7dd1b128 Clean up debug scaffolding.
// FREEBIE
2017-05-02 09:28:02 -04:00
Matthew Chen
f5cd39ea35 Apply ContactsViewHelper to SelectThreadViewController.
// FREEBIE
2017-05-02 09:28:02 -04:00
Matthew Chen
61f59067b6 Improve contact-related views.
* Add support for contacts with more than one Signal account using ContactAccount class.
* Use OWSTableViewController in contact-related views.
* Let users add non-contacts to groups.
* Improve the "new group" and "edit group" views.
* Add utility methods for displaying alerts.
* Warn users before discarding unsaved changes in "edit group" view.
* Pull out "contact view helper" to de-duplicate common logic among contact-related views.
* Pull out "group view helper" to de-duplicate common logic among group-related views.
* Pull out new base class for view used to add accounts to groups or the block list.

// FREEBIE
2017-05-02 09:28:02 -04:00
Michael Kirk
8a2f1e3ee3 Merge branch 'mkirk/remove-overzealous-assert' 2017-05-01 16:41:51 -04:00
Michael Kirk
a1eef6fde5 Remove invalid assert in case of legitimately stacking unicode
This assert was being falsely triggered by legitimate unicode.

The current state of affairs (unchanged by this PR) is that all
diacriticals will be stripped from a message that also contains e.g. 3
flags in a sequence.

// FREEBIE
2017-05-01 16:41:47 -04:00