Commit Graph

2536 Commits

Author SHA1 Message Date
Matthew Chen
ff89cbabcc Bump build number to 2.13.0.12.
// FREEBIE
2017-06-22 15:40:36 -04:00
Matthew Chen
84d8fb0853 Update l10n strings.
// FREEBIE
2017-06-22 15:40:15 -04:00
Michael Kirk
55bc6868f9 Merge branch 'mkirk/verification-sync' 2017-06-22 15:24:07 -04:00
Michael Kirk
140625b2a0 [SSK] verification sync
// FREEBIE
2017-06-22 15:23:52 -04:00
Michael Kirk
a933fbf215 sync verifications with contact syncing
// FREEBIE
2017-06-22 15:21:25 -04:00
Michael Kirk
37b7bf18e9 clarify code and clean up code formatting
I think we hit some pathological cases in clang format, but this is
clearer anyway IMO

// FREEBIE
2017-06-22 15:20:34 -04:00
Matthew Chen
b7307ecfa0 Merge branch 'charlesmchen/crashManualCircumvention' 2017-06-22 15:10:24 -04:00
Matthew Chen
e814ae129d Fix crash in manual censorship circumvention logic on iOS 9.
// FREEBIE
2017-06-22 15:10:14 -04:00
Matthew Chen
d00928902f Merge branch 'charlesmchen/moreScrollDownButton' 2017-06-22 15:08:48 -04:00
Matthew Chen
f7c81bae9d Show the “scroll down” button if user scrolls up, even if there are no unread messages.
// FREEBIE
2017-06-22 15:08:35 -04:00
Matthew Chen
89c252a420 Merge branch 'charlesmchen/logOverflow' 2017-06-22 14:30:11 -04:00
Matthew Chen
e6aacf0bca [SSK] Reduce chattiness of logs; increase log file sizes.
// FREEBIE
2017-06-22 14:29:32 -04:00
Matthew Chen
eff1974eeb [SSK] Reduce chattiness of logs; increase log file sizes.
// FREEBIE
2017-06-22 10:10:56 -04:00
Matthew Chen
1ae7f07104 Merge branch 'charlesmchen/keychainVsRegistrationDebug' 2017-06-22 09:37:39 -04:00
Matthew Chen
15ecb03471 Respond to CR.
// FREEBIE
2017-06-22 09:37:30 -04:00
Matthew Chen
7726c68047 Persist registration values in the keychain for debug builds only.
// FREEBIE
2017-06-22 09:34:07 -04:00
Matthew Chen
06baf5128f Bump build number to 2.13.0.11.
// FREEBIE
2017-06-21 18:07:18 -04:00
Matthew Chen
c60ca915d2 Merge branch 'charlesmchen/callServiceLogging' 2017-06-21 18:06:44 -04:00
Matthew Chen
3d0811c03f Respond to CR.
// FREEBIE
2017-06-21 18:06:29 -04:00
Matthew Chen
029da7e0ce Hang up current call if we receive a call offer from the same user.
// FREEBIE
2017-06-21 17:47:42 -04:00
Matthew Chen
9fc92990f5 Improve logging in CallService.
// FREEBIE
2017-06-21 17:47:42 -04:00
Matthew Chen
12e083b4e0 [SSK] Fix OWSCFail() macro.
// FREEBIE
2017-06-21 17:46:41 -04:00
Matthew Chen
c7d9236526 [SSK] Ensure verification UI is updated to reflect incoming verification state sync messages.
// FREEBIE
2017-06-21 17:44:18 -04:00
Matthew Chen
6fa20d62ba Merge branch 'charlesmchen/groupsVsNoLongerVerified' 2017-06-21 16:20:50 -04:00
Matthew Chen
0855faabb4 Respond to CR.
// FREEBIE
2017-06-21 15:06:48 -04:00
Matthew Chen
efbda70764 Improve UX for multiple “no longer verified” members of a group.
// FREEBIE
2017-06-21 15:01:06 -04:00
Matthew Chen
afb83cfaaa Improve UX for multiple “no longer verified” members of a group.
// FREEBIE
2017-06-21 15:01:06 -04:00
Matthew Chen
f1e5be4c17 Improve UX for multiple “no longer verified” members of a group.
// FREEBIE
2017-06-21 15:01:06 -04:00
Matthew Chen
a039aac36d Improve UX for multiple “no longer verified” members of a group.
// FREEBIE
2017-06-21 15:01:06 -04:00
Matthew Chen
509d2d0aaa Merge branch 'charlesmchen/attachmentStreamUpgradePerf' 2017-06-21 10:41:39 -04:00
Matthew Chen
f3f832557f Respond to CR.
// FREEBIE
2017-06-21 10:39:45 -04:00
Matthew Chen
6a1f766657 [SSK] Improve perf of attachment stream file path upgrade.
// FREEBIE
2017-06-21 10:39:45 -04:00
Matthew Chen
ec077235ba Respond to CR.
// FREEBIE
2017-06-21 10:38:41 -04:00
Matthew Chen
6a5fe94d59 Improve perf of attachment stream file path upgrade.
// FREEBIE
2017-06-21 10:38:41 -04:00
Matthew Chen
f6f5d3d455 Merge branch 'charlesmchen/invalidateMessageAdapterCache' 2017-06-21 10:01:04 -04:00
Matthew Chen
b39c4905c3 Invalid message adapter cache when app becomes visible.
// FREEBIE
2017-06-21 10:00:56 -04:00
Matthew Chen
4f0b5838ec Bump build number to 2.13.0.10.
// FREEBIE
2017-06-20 17:51:27 -04:00
Matthew Chen
ae9a5acf69 Merge branch 'charlesmchen/upgradeLaunchScreenAndPerf' 2017-06-20 17:48:27 -04:00
Matthew Chen
0738568b94 Fix upgrade launch screen.
// FREEBIE
2017-06-20 17:48:11 -04:00
Michael Kirk
949a38c4d1 Merge branch 'mkirk/fix-dismiss-kb-after-send' 2017-06-20 17:45:48 -04:00
Michael Kirk
11fa08470d [JSQ] Fix: can't dismiss keyboard after sending
// FREEBIE
2017-06-20 17:45:28 -04:00
Michael Kirk
f305b2c307 Merge branch 'mkirk/delete-system-messages' 2017-06-20 17:44:53 -04:00
Michael Kirk
8898f4a6d4 CR: future proof view placement if we change hierarchy
// FREEBIE
2017-06-20 17:31:47 -04:00
Michael Kirk
da7dae8163 CR: rename longpress->longPress
// FREEBIE
2017-06-20 17:31:12 -04:00
Michael Kirk
c70b1e9681 Make system messages deletable
// FREEBIE
2017-06-20 17:18:19 -04:00
Michael Kirk
fbba2f5dd7 colocate CollectionViewDelegate methods
// FREEBIE
2017-06-20 17:18:19 -04:00
Michael Kirk
7a2ad91940 Merge branch 'mkirk/fix-cold-call-from-contacts' 2017-06-20 17:16:40 -04:00
Michael Kirk
39563ab8c2 present from signalsViewController so users don't get confused by being
dropped into a different thread when the call is over.

e.g. chatting with Alice, but Bob calls. When I end the call with Bob It
would be too easy to fire off a message assuming it's going to Bob.

// FREEBIE
2017-06-20 16:41:07 -04:00
Michael Kirk
982433c2bf update call screen avatar when contacts change
in particular this is a problem when initiating a call from a cold app
state. The call screen renders before the contacts have completely
loaded.

// FREEBIE
2017-06-20 16:28:35 -04:00
Michael Kirk
36c09aeb84 cleanup ahead of PR
// FREEBIE
2017-06-20 16:24:59 -04:00