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
3800 commits 5 branches 133 tags 218 MiB
Commit graph

3800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Kirk 9fdc3202af White listing must happen on main thread 
followup to: ee613e4889

Again, this solves a crash, but we'll want to revisit the perf
implications.

// FREEBIE
 2017-08-11 09:11:55 -04:00
Michael Kirk 69b75942fd Merge commit '2.15.3.2' 2017-08-11 07:55:09 -04:00
Michael Kirk d29dd5c2b3 Bumping build. 
Failed to bump build before tagging 2.15.3.1, so the 2.15.3.1 tag will
not be submitted, and we'll skip right to 2.15.3.2.

// FREEBIE
 2017-08-11 07:53:51 -04:00
Michael Kirk 1ee27996e4 Merge branch 'hotfix/2.15.3.1' 2017-08-11 07:42:00 -04:00
Michael Kirk 8da3108b53 Drop stale EndCall/BusyCall messages 
// FREEBIE
 2017-08-11 07:35:48 -04:00
Michael Kirk 370ce5ba01 Merge branch 'hotfix/2.15.3' 2017-08-10 13:22:21 -04:00
Michael Kirk 4cf860cfe9 pull latest translations 
// FREEBIE
 2017-08-10 12:20:35 -04:00
Michael Kirk 46e5240f81 bump version 
// FREEBIE
 2017-08-10 12:19:06 -04:00
Michael Kirk 93d2baa096 [JSQMVC] Fix scrolling crashes 
- First occurs when the "Load More Messages" is shown, while scrolling and
  receiving new messages
- Second occurs when scrolling while popping/dismissing the keyboard
  (Not sure if receiving messages was a precondition for this crash)

// FREEBIE
 2017-08-10 12:17:42 -04:00
Michael Kirk 0e241299d2 Discard GroupInfoRequest from unknown group 
// FREEBIE
 2017-08-10 12:17:42 -04:00
Michael Kirk 4f6d91ce6f Merge branch 'mkirk/fixup-tests' 2017-08-09 12:18:18 -04:00
Michael Kirk 40b99a15ed Fix up some tests 
Included plausible test implementation for an in-memory profile manager.

Note two tests remain failing (they've been failing for a while)

// FREEBIE
 2017-08-09 12:17:03 -04:00
Michael Kirk 620550a462 Merge branch 'mkirk/upload-profile-avatar' 2017-08-09 11:51:19 -04:00
Michael Kirk a3ae22c84f Upload profile avatar to service 
WIP, this currently lacks crypto pending further discussion.

// FREEBIE
 2017-08-09 11:44:34 -04:00
Michael Kirk 45a1f534ba Rename method to make way for new method. 
No behavioral changes.

// FREEBIE
 2017-08-08 15:03:48 -04:00
Michael Kirk 388b778a06 Merge branch 'mkirk/unknown-group-info-request' 2017-08-08 12:18:14 -04:00
Michael Kirk 72b3f3779b Discard GroupInfoRequest from unknown group 
// FREEBIE
 2017-08-08 12:17:26 -04:00
Michael Kirk a8bfa45f1a Merge branch 'mkirk/use-profile-data' 2017-08-07 16:57:02 -04:00
Michael Kirk 16c646a939 Use profile name/image when available. 
Refactored the ContactAvatarBuilder to clarify intent of the two
methods. One is only used for non-signal contacts in the Invite flow.
The other should be used for any signal contacts so we have a single
consistent way of generating the avatar initials.

// FREEBIE
 2017-08-07 16:50:55 -04:00
Michael Kirk 8f54df0ff9 Merge branch 'mkirk/whitelist-on-main' 2017-08-07 16:49:12 -04:00
Michael Kirk ee613e4889 Can only set whitelist on main thread 
As written solves a crash, but we'll probalby want to revisit the perf
implications.

// FREEBIE
 2017-08-07 16:48:12 -04:00
Michael Kirk e07ed50170 define avatar form URL 
// FREEBIE
 2017-08-07 15:17:34 -04:00
Michael Kirk 71be024fd9 [SPK] more asserts/logging 
// FREEBIE
 2017-08-07 12:08:56 -04:00
Matthew Chen 98e6685304 Merge branch 'charlesmchen/profile10a' 2017-08-04 17:54:23 -04:00
Matthew Chen e01fbc247e Refine profile logic. 
// FREEBIE
 2017-08-04 17:35:22 -04:00
Matthew Chen 09e65a674b Incomplete work to upload avatars. 
// FREEBIE
 2017-08-04 17:35:16 -04:00
Matthew Chen f6668d24c1 Download profile avatars. 
// FREEBIE
 2017-08-04 17:35:02 -04:00
Matthew Chen 9266c3a4f9 Clear profile state when a user’s profile key changes. 
// FREEBIE
 2017-08-04 17:34:27 -04:00
Matthew Chen 8b9749202d Load local user profile avatar if necessary. 
// FREEBIE
 2017-08-04 17:34:27 -04:00
Matthew Chen 21304c18a6 Once we've shared our profile key with a user (perhaps due to being a member of a whitelisted group), make sure they're whitelisted. 
// FREEBIE
 2017-08-04 17:34:27 -04:00
Matthew Chen fa1678f945 Merge branch 'charlesmchen/profiles9a' 2017-08-04 17:33:25 -04:00
Matthew Chen 98def41782 Respond to CR. 
// FREEBIE
 2017-08-04 17:33:16 -04:00
Matthew Chen 823927685d Update profile on service. 
// FREEBIE
 2017-08-04 15:25:17 -04:00
Matthew Chen 83d01eed76 Don’t encrypt/decrypt avatar URL or digest. 
// FREEBIE
 2017-08-04 15:25:10 -04:00
Matthew Chen cc789c7df5 Merge branch 'charlesmchen/profiles8' 2017-08-04 15:23:29 -04:00
Matthew Chen f6bcff5427 Fix rebase breakage. 
// FREEBIE
 2017-08-04 15:23:17 -04:00
Matthew Chen 83e2fbe28c Rework where profile key is attached in photos. 
// FREEBIE
 2017-08-04 15:23:17 -04:00
Matthew Chen b5fdc05b91 Move profile key to data, call, sync and null protos. 
// FREEBIE
 2017-08-04 15:23:02 -04:00
Matthew Chen 37ce388eb6 Add “add to profile whitelist” offer. 
// FREEBIE
 2017-08-04 15:23:02 -04:00
Michael Kirk 9f6ca3d848 Merge branch 'mkirk/precache-localnumber' 2017-08-04 15:19:34 -04:00
Michael Kirk ed4de7e8af Simplify code / pre-cache localNumber 
Now that localNumber is read from a dedicated dbConnection we don't have
to worry about it blocking.

// FREEBIE
 2017-08-04 15:19:26 -04:00
Michael Kirk f99d4e9df9 Merge branch 'hotfix/2.15.2' 2017-08-04 13:11:53 -04:00
Michael Kirk 7836867780 pull latest translations 
// FREEBIE
 2017-08-04 12:38:55 -04:00
Michael Kirk b29d87cb3e bump build 
// FREEBIE
 2017-08-04 12:33:55 -04:00
Michael Kirk df94337a01 Merge branch 'mkirk/improve-asserts' into hotfix/2.15.2 2017-08-04 12:33:34 -04:00
Michael Kirk 3856f3dfb1 Improve asserts/logging 
// FREEBIE
 2017-08-04 12:14:43 -04:00
Michael Kirk 2195808275 Merge branch 'mkirk/fix-tests' 2017-08-04 11:34:05 -04:00
Michael Kirk 52bd682565 fix some recently broken tests 
// FREEBIE
 2017-08-04 11:33:51 -04:00
Matthew Chen b18f3bc08a Merge branch 'charlesmchen/unregisterVsProfileCache' 2017-08-04 10:32:10 -04:00
Matthew Chen 03774216a0 Respond to CR. 
// FREEBIE
 2017-08-04 10:32:00 -04:00