Commit graph

2905 commits

Author SHA1 Message Date
Mikunj
cfb3040b72 Fix test not working because of constructor. 2020-05-05 13:32:08 +10:00
Mikunj
177c762a2e Fix updating friend request status when sending message. 2020-05-05 12:43:31 +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
nielsandriesse
c545efbe72 Minor refactoring 2020-05-05 10:18:24 +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
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
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
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
nielsandriesse
76b5b98038 Clean 2020-05-04 10:57:40 +10:00
Mikunj
62a51ee03d Merge branch 'friend-request-refactor' of https://github.com/loki-project/session-ios into friend-request-refactor 2020-05-04 10:53:05 +10:00
Mikunj
3ed3e00c4c Review fixes 2020-05-04 10:50:49 +10:00
nielsandriesse
be4c548848 Minor refactoring 2020-05-04 10:48:19 +10:00
nielsandriesse
db037a1320 Merge branch 'friend-request-refactor' of github.com:loki-project/loki-messenger-ios into friend-request-refactor 2020-05-04 10:20:45 +10:00
nielsandriesse
3e0a9db5e0 Handle expired friend requests 2020-05-04 10:18:00 +10:00
Mikunj
e091923850 Merge branch 'friend-request-refactor' of https://github.com/loki-project/session-ios into friend-request-refactor 2020-05-04 10:12:15 +10:00
Mikunj
1adc5ce11e Finish up migration test. 2020-05-04 10:12:00 +10:00
nielsandriesse
cfb23de141 Merge branch 'friend-request-refactor' of github.com:loki-project/loki-messenger-ios into friend-request-refactor 2020-05-04 09:59:03 +10:00
nielsandriesse
9bcde73d14 Update FriendRequestView for friend request refactor 2020-05-04 09:57:26 +10:00
Mikunj
45a71181d1 Fix up migration.
Added migration test.
Fix some tests.
2020-05-04 09:42:02 +10:00
nielsandriesse
0d48031e9c Clean 2020-05-02 10:28:04 +10:00
nielsandriesse
96331ecdd5 Fix incorrect target & rename file 2020-05-02 10:02:29 +10:00
nielsandriesse
e879334b3b Clean up documentation 2020-05-02 09:53:47 +10:00
nielsandriesse
34d79210c0 Minor refactoring 2020-05-02 09:48:43 +10:00
nielsandriesse
e60dfe99c5 Clean 2020-05-02 09:21:13 +10:00
nielsandriesse
9611f06e25 Merge branch 'dev' into friend-request-refactor 2020-05-02 08:56:47 +10:00
Mikunj
71297fb4ec Deprecate friendRequestState on TSMessage. 2020-05-01 13:37:50 +10:00
Mikunj
b1345104da Remove saveFriendRequestStatus in TSThread. 2020-05-01 13:17:11 +10:00
nielsandriesse
85fe6db572 Clean up device unlinking 2020-05-01 12:52:23 +10:00
Mikunj
25ae8ca3ba Fix up more tests.
Update friend request status in message sender.
2020-05-01 12:28:51 +10:00
nielsandriesse
1a224ee50b Add more comments 2020-05-01 12:14:17 +10:00
nielsandriesse
ce3ce176b0 Add comment 2020-05-01 12:03:26 +10:00
Mikunj
8fcb61353e Merge branch 'dev' into friend-request-refactor 2020-05-01 11:00:26 +10:00
Mikunj
7216a33dc8 Don't update friend request logic when generating messages 2020-05-01 10:39:43 +10:00
nielsandriesse
0cd4f15bed Fix silliness 2020-05-01 10:30:08 +10:00
nielsandriesse
7b221ca86e Ignore empty display names 2020-05-01 10:26:29 +10:00
Mikunj
d6ff50fac4 Added getFriendRequestUIState and tests. 2020-05-01 10:05:02 +10:00
nielsandriesse
d742d0aeaa Take into account multi device when counting duplicates 2020-05-01 10:00:10 +10:00