Commit Graph

13230 Commits

Author SHA1 Message Date
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
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 03ecdbd42f Avoid write transaction 2020-05-04 09:57:38 +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 576eac282c Update Pods 2020-05-02 09:54:13 +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 fce6fe1170 Minor refactoring 2020-05-02 09:10:36 +10:00
nielsandriesse 488f821881 Make database transaction explicit 2020-05-02 09:10:19 +10:00