oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity
1737 commits 5 branches 133 tags 218 MiB
Commit graph

1737 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kirk b54508bb28 when generating strings verify that SSK is on master 
Otherwise it's really easy to generate strings from the wrong branch

// FREEBIE
 2017-04-18 12:59:00 -04:00
Matthew Chen 20ea6b8d31 Merge branch 'charlesmchen/justOnceContactStore' 2017-04-18 12:33:27 -04:00
Matthew Chen 3ccee7ffda Don’t load contact store twice. 
// FREEBIE
 2017-04-18 12:33:19 -04:00
Matthew Chen 5713a0e306 Merge branch 'charlesmchen/fixCalling' 2017-04-18 12:32:55 -04:00
Matthew Chen 1fa037527c Fix calling by using actual session descriptions. 
// FREEBIE
 2017-04-18 12:32:45 -04:00
Matthew Chen f0727b541e Merge branch 'charlesmchen/outgoingMessageState' 2017-04-17 18:07:52 -04:00
Matthew Chen dd807f676c [SSK] Rework outgoing message state & refine error handling for outgoing group messages. 
// FREEBIE
 2017-04-17 18:07:37 -04:00
Matthew Chen d614073795 Respond to CR. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen e025b86e75 Rework outgoing message state. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen cc766bcc53 Rework outgoing message state. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen 66d1a37859 Rework outgoing message state. 
// FREEBIE
 2017-04-17 18:05:47 -04:00
Matthew Chen 2c46220ebf Merge branch 'charlesmchen/notificationsVsConcurrency' 2017-04-17 16:49:22 -04:00
Matthew Chen 3e53605009 Improve thread safety in PushManager and NotificationsManager. 
// FREEBIE
 2017-04-17 16:49:09 -04:00
Matthew Chen dca3fa5001 Merge branch 'charlesmchen/lostMessages' 2017-04-17 16:08:39 -04:00
Matthew Chen f41762c316 [SSK] Avoid lost messages. 
// FREEBIE
 2017-04-17 16:08:25 -04:00
Matthew Chen 1558d8c6c5 Avoid lost messages by acknowledges message receipt after the message is processed. 
// FREEBIE
 2017-04-17 16:07:03 -04:00
Matthew Chen f9b51c01f4 [SSK] De-bounce the prekey checks. 
// FREEBIE
 2017-04-14 14:35:32 -04:00
Michael Kirk fa5bb7ad9d Make it easier to track local users registration ID in debug log 
// FREEBIE
 2017-04-14 11:08:06 -04:00
Michael Kirk 0743722782 [SSK] ensure accepted SPKs are marked 
// FREEBIE
 2017-04-14 10:58:15 -04:00
Michael Kirk d911b6a995 Merge branch 'call-permissions' 2017-04-14 10:47:04 -04:00
Michael Kirk da8596c1ba Check microphone permissions: Clean up 
* copy tweaks
* use "settings" instead of "privacy settings" for button text
* include comments in NSLocalizedString param so they can be extracted with genstrings
* style dismiss action as "cancel"

// FREEBIE
 2017-04-14 10:46:40 -04:00
Christoph Hagen 70efb5e9ec Check microphone permissions before starting a call 2017-04-14 10:46:18 -04:00
Matthew Chen 528b7296d2 Merge branch 'charlesmchen/hardwareRingerVsPlayback' 2017-04-13 16:24:58 -04:00
Matthew Chen 5c20a85974 Respond to CR. 
// FREEBIE
 2017-04-13 16:24:48 -04:00
Matthew Chen bf9ae552a3 Ignore hardware mute switch during video playback in attachment approval view. 
// FREEBIE
 2017-04-13 16:17:35 -04:00
Matthew Chen d9ef27d802 Ignore hardware mute switch during video playback in messages view. 
// FREEBIE
 2017-04-13 16:17:35 -04:00
Matthew Chen 1cf45a26d0 Merge remote-tracking branch 'origin/hotfix/2.10.1' 2017-04-13 16:13:35 -04:00
Matthew Chen 3e7ecf335c Merge branch 'charlesmchen/honorAttachmentFilenames' 2017-04-13 16:10:00 -04:00
Matthew Chen 9c6f76253a [SSK] Honor attachment filenames. 
// FREEBIE
 2017-04-13 16:09:51 -04:00
Matthew Chen 193d9421ce Respond to CR. 
// FREEBIE
 2017-04-13 16:06:23 -04:00
Matthew Chen 0018d0040b Honor attachment filenames. 
// FREEBIE
 2017-04-13 15:41:28 -04:00
Matthew Chen dd3250a9e8 Honor attachment filenames. 
// FREEBIE
 2017-04-13 15:41:28 -04:00
Matthew Chen aab897abb8 Merge branch 'feature/contactsIntersectionAudit' 2017-04-13 15:38:43 -04:00
Matthew Chen dc3a382c23 Respond to CR. 
// FREEBIE
 2017-04-13 15:38:32 -04:00
Matthew Chen 2e653afff9 Reduce usage of contacts intersection endpoint. 
// FREEBIE
 2017-04-13 15:28:39 -04:00
Matthew Chen 2ede3f3345 Reduce usage of contacts intersection endpoint. 
// FREEBIE
 2017-04-13 15:28:39 -04:00
Matthew Chen 5b4e3a2422 Reduce usage of contacts intersection endpoint. 
// FREEBIE
 2017-04-13 15:28:39 -04:00
Matthew Chen f38f3d8887 [SSK] Update SignalAttachment to allow arbitrary attachments. 
// FREEBIE
 2017-04-13 15:27:55 -04:00
Matthew Chen c1f2ae61b6 Merge branch 'charlesmchen/arbitraryAttachments' 2017-04-13 14:59:11 -04:00
Matthew Chen 70ac0acc68 Respond to CR. 
// FREEBIE
 2017-04-13 14:58:14 -04:00
Matthew Chen 54d2d85ebb Update SignalAttachment to allow arbitrary attachments. 
// FREEBIE
 2017-04-13 14:55:53 -04:00
Matthew Chen 72eb632874 Merge branch 'charlesmchen/sendOversizeTextMessages' 2017-04-13 14:42:19 -04:00
Matthew Chen da13506db1 Respond to CR. 
// FREEBIE
 2017-04-13 14:42:05 -04:00
Matthew Chen db7cb8d388 Send oversize text messages as attachments. 
// FREEBIE
 2017-04-13 14:36:58 -04:00
Matthew Chen 9882eeea93 Merge branch 'charlesmchen/improveAttachmentApprovalView' 2017-04-13 13:50:14 -04:00
Matthew Chen ebde769161 Respond to CR. 
// FREEBIE
 2017-04-13 13:49:46 -04:00
Matthew Chen 7f5847d2d5 Improve file size formatting in attachment approval dialog. 
// FREEBIE
 2017-04-12 16:53:28 -04:00
Matthew Chen de735dcf33 Add stubs for audio preview to attachment approval dialog. 
// FREEBIE
 2017-04-12 16:48:28 -04:00
Matthew Chen fc33b00830 Add animated image preview to attachment approval dialog. 
// FREEBIE
 2017-04-12 16:37:37 -04:00
Matthew Chen 5d79f43970 Add video preview to attachment approval dialog. 
// FREEBIE
 2017-04-12 16:30:25 -04:00