Commit graph

13250 commits

Author SHA1 Message Date
Niels Andriesse 3b4860cf7b
Merge pull request #186 from loki-project/threading
Fix Device Link Fetching Timeout
2020-05-06 16:33:39 +10:00
nielsandriesse dd69ef236d Fix device link fetching timeout 2020-05-06 16:31:25 +10:00
Niels Andriesse e44d721a70
Merge pull request #185 from loki-project/contact-sync-fixes
Fix closed group and contact syncing.
2020-05-06 15:30:58 +10:00
nielsandriesse 8df2f2a8b5 Minor refactoring 2020-05-06 15:30:05 +10:00
Mikunj c2e34fb36e Fix auto accept friend request condition. 2020-05-06 13:38:07 +10:00
Mikunj 9fc386b803 Fix closed group and contact syncing. 2020-05-06 13:31:52 +10:00
nielsandriesse 5060f82a68 Fix build 2020-05-06 10:35:42 +10:00
nielsandriesse 0a3b1a20cd Fix closed group session establishment issue 2020-05-06 10:20:29 +10:00
nielsandriesse 0f20c15407 Fix copy 2020-05-06 10:13:57 +10:00
nielsandriesse aa69fa8fe6 Fix background crash 2020-05-06 10:13:32 +10:00
nielsandriesse 3b35535628 Don't send AFRs to self 2020-05-05 16:49:48 +10:00
nielsandriesse d845b089e9 Fix friend request UI bug 2020-05-05 16:03:03 +10:00
Niels Andriesse 82c824a7a6
Merge pull request #184 from loki-project/friend-request-fix
Friend request fixes
2020-05-05 15:43:37 +10:00
nielsandriesse 62dbbf7d57 Clean 2020-05-05 15:43:05 +10:00
nielsandriesse b847590ecd Fix note to self 2020-05-05 15:30:12 +10:00
Mikunj 8fa7f66774 Merge branch 'dev' into friend-request-fix 2020-05-05 14:56:36 +10:00
nielsandriesse 746f3e34bd Fix display name updating issue 2020-05-05 14:09:32 +10:00
Mikunj 1786569584 Don't send sync message for our own device.
Don't send an auto generated friend request to our own device.
2020-05-05 14:02:25 +10:00
nielsandriesse 7fc9678987 Fix display name updating issue 2020-05-05 13:43:26 +10:00
Mikunj cfb3040b72 Fix test not working because of constructor. 2020-05-05 13:32:08 +10:00
nielsandriesse 2968c3d64a Fix incorrect order of operations 2020-05-05 13:29:20 +10:00
nielsandriesse f1dbac0791 Remove redundant code 2020-05-05 13:16:27 +10:00
Mikunj 177c762a2e Fix updating friend request status when sending message. 2020-05-05 12:43:31 +10:00
nielsandriesse a2d065f3e6 Debug 2020-05-05 11:49:18 +10:00
Niels Andriesse 911f5a72a5
Merge pull request #183 from loki-project/syncing
Multi Device Syncing Bug Fixes
2020-05-05 11:33:42 +10:00
nielsandriesse 415d033183 Fix multi device closed group syncing 2020-05-05 11:24:39 +10:00
nielsandriesse 3889c0af39 Fix multi device open group syncing 2020-05-05 11:24:28 +10:00
nielsandriesse 4b595575f6 Fix multi device contact syncing 2020-05-05 11:24:10 +10:00
nielsandriesse 24d70341ed Clean 2020-05-05 10:32:26 +10:00
Niels Andriesse a005865aef
Merge pull request #182 from loki-project/replace-force-hidden
Replace `isForceHidden` by Computed `isSlaveThread`
2020-05-05 10:19:03 +10:00
nielsandriesse c545efbe72 Minor refactoring 2020-05-05 10:18:24 +10:00
nielsandriesse 258d8e69ea Merge branch 'replace-force-hidden' of github.com:loki-project/loki-messenger-ios into replace-force-hidden 2020-05-05 10:16:18 +10:00
nielsandriesse 0944725a35 Maintain friend request view correctly 2020-05-05 10:15:58 +10:00
Mikunj 1111d5c260 Merge branch 'replace-force-hidden' of https://github.com/loki-project/session-ios into replace-force-hidden 2020-05-05 09:51:04 +10:00
nielsandriesse a9b3f3a6ca Fix constraint issue 2020-05-05 09:32:20 +10:00
Mikunj 0890f65e61 Added isSlaveThread tests. 2020-05-05 09:30:46 +10:00
nielsandriesse 5cc11b9014 Partially fix friend request UI issues 2020-05-05 09:11:43 +10:00
nielsandriesse 868725f513 Update Pods 2020-05-04 16:17:45 +10:00
nielsandriesse 2190c98ba1 Fix Swift/Obj-C interop 2020-05-04 16:17:18 +10:00
Mikunj 6fca0779e5 Added Test Utils. 2020-05-04 16:00:23 +10:00
Mikunj da4a3c3aac Minor fix 2020-05-04 14:08:11 +10:00
Mikunj 4d0207f20a Replace isForceHidden with computed isSlaveThread 2020-05-04 14:05:56 +10:00
nielsandriesse 31bfa0888b Debug 2020-05-04 13:25:38 +10:00
nielsandriesse f834850317 Debug & avoid write transaction 2020-05-04 11:56:26 +10:00
nielsandriesse 7e0435e009 Debug 2020-05-04 11:38:10 +10:00
Niels Andriesse e108a3db96
Merge pull request #175 from loki-project/friend-request-refactor
Friend Request Refactor
2020-05-04 11:12:17 +10:00
nielsandriesse 59344ec41a Clarify API 2020-05-04 11:06:55 +10:00
nielsandriesse 54cd300878 Maintain consistent indentation 2020-05-04 11:04:02 +10:00
nielsandriesse 8463634a83 Reword comment 2020-05-04 11:01:51 +10:00
nielsandriesse 845de99561 Merge branch 'friend-request-refactor' of github.com:loki-project/loki-messenger-ios into friend-request-refactor 2020-05-04 10:59:41 +10:00