Commit graph

11687 commits

Author SHA1 Message Date
Niels Andriesse c69c029509 Update Pods 2019-05-21 11:41:58 +10:00
Niels Andriesse 1c73cf5114 Re-order files 2019-05-21 11:40:29 +10:00
Niels Andriesse 1a8175472a Refactor friend request view & add documentation 2019-05-21 10:30:06 +10:00
Niels Andriesse 4c33fa257a Fix incorrect logic in OWSMessageManager 2019-05-21 09:53:10 +10:00
Niels Andriesse 20adddbac1 Merge branch 'master' of github.com:loki-project/loki-messenger-ios 2019-05-21 09:10:36 +10:00
Niels Andriesse 5622c08124 Fix crash & clean 2019-05-21 09:09:48 +10:00
Mikunj 74867dc525 Updated expire job to use friendRequestStatus states. 2019-05-21 09:07:33 +10:00
Niels Andriesse 740291cceb Implement message friend request status
Untested
2019-05-20 16:36:22 +10:00
Mikunj 56018fd475 Merge branch 'master' of https://github.com/loki-project/loki-messenger-ios 2019-05-20 16:01:28 +10:00
Mikunj fdf7d99ff3 Fix removing interaction while enumerating.
Fix most recent message not being kept.
2019-05-20 15:59:49 +10:00
Niels Andriesse 539392b357 Merge branch 'master' of github.com:loki-project/loki-messenger-ios 2019-05-20 15:37:07 +10:00
Niels Andriesse 78fbcf28bb Slightly simplify friend request removal 2019-05-20 15:36:42 +10:00
Mikunj 10e5ef3e5c Renamed functions to avoid confusion 2019-05-20 15:18:37 +10:00
Niels Andriesse ce31576176 Update Pods 2019-05-20 14:52:45 +10:00
Niels Andriesse 4a633fba68 Debug friend request expiration 2019-05-20 14:52:26 +10:00
Mikunj 3d7bd6b895 Fix incorrect function name.
Refactor fixes.
2019-05-20 13:30:08 +10:00
Mikunj fdff5d8487 Add friend request message discarding. 2019-05-20 13:01:04 +10:00
Niels Andriesse 8a815e1496
Merge pull request #16 from loki-project/message-expiration
Added friend request message expiration.
2019-05-20 12:57:29 +10:00
Niels Andriesse e7eea3f104 Fix typo 2019-05-20 12:56:41 +10:00
Niels Andriesse 7b739bddce Implement expired friend request UI 2019-05-20 12:54:57 +10:00
Niels Andriesse bab8cebc3f Fix crash 2019-05-20 12:39:11 +10:00
Niels Andriesse 6adc8cf014 Add isFriendRequestExpired flag 2019-05-20 12:31:21 +10:00
Niels Andriesse 201b8095ee Merge branch 'master' into message-expiration 2019-05-20 11:42:53 +10:00
Niels Andriesse 7493e037c9 Fix minor code style issues 2019-05-20 11:20:03 +10:00
Mikunj f1cbc2e0d1 Added friend request message expiration. 2019-05-20 11:18:24 +10:00
Niels Andriesse dd46b5eb38 Update Pods 2019-05-20 10:41:15 +10:00
Niels Andriesse 81d5adc8c8 Fix threading issue & unnecessary updating 2019-05-20 10:40:39 +10:00
Niels Andriesse 180c86a940 Update Pods 2019-05-17 16:36:50 +10:00
Niels Andriesse 750a25622b Partially fix remaining UI issues 2019-05-17 16:36:24 +10:00
Niels Andriesse 2e8d62b3ee Fix friend request acceptance bug 2019-05-17 14:03:04 +10:00
Niels Andriesse 3c838c59b2 Update Pods 2019-05-17 13:38:04 +10:00
Niels Andriesse 64f92d261b Refactor 2019-05-17 13:37:36 +10:00
Niels Andriesse 01e80f4569 Update Pods 2019-05-17 12:38:53 +10:00
Niels Andriesse d5dc54af1b Partially fix UI updating bug 2019-05-17 12:38:36 +10:00
Niels Andriesse 23766848b8 Attempt to fix UI updating issue 2019-05-17 12:19:52 +10:00
Niels Andriesse 7dc2416873 Make sure isFriendRequest is always true for OWSFriendRequestMessages 2019-05-17 12:07:29 +10:00
Niels Andriesse b4ca385028 Clean 2019-05-17 11:58:46 +10:00
Niels Andriesse 75d52d7b7a Add missing UI state 2019-05-17 11:55:42 +10:00
Niels Andriesse ca292169d6 Fix friend request view bug 2019-05-17 11:41:28 +10:00
Niels Andriesse 4c6d09aa29 Handle friend request messages before they're discarded by Signal 2019-05-17 11:39:54 +10:00
Niels Andriesse cd03dfd4c6 Add workaround for Signal bug 2019-05-17 11:32:42 +10:00
Niels Andriesse 50f31840bc Update Pods 2019-05-17 11:10:18 +10:00
Niels Andriesse 32ff266213 Fix friend request acceptance bug 2019-05-17 11:09:46 +10:00
Niels Andriesse a8633ff739 Merge branch 'master' of github.com:loki-project/loki-messenger-ios 2019-05-17 10:20:31 +10:00
Niels Andriesse 4d94346959 Fix minor logic issue & document friend request handling 2019-05-17 10:20:18 +10:00
Mikunj Varsani c43295eb7c
Loki session reset (#14)
* Added session reset.

* Hooked up session reset internals to UI.

* Send empty message when we have received an end session message.

* Verify incoming PreKeyWhisperMessage.

* Fix indentations in SessionReset.md
2019-05-17 10:11:06 +10:00
Mikunj fb1e27d633 Fix empty message generation.
Before since we were setting the groupMetaMessage, it was setting the `shouldSave` property to true and thus the message sender was looking for the message in the db.
We now don't set this property so the message should be able to be sent without saving.
2019-05-17 09:47:08 +10:00
Niels Andriesse 7faa9d333c Add missing save 2019-05-16 15:32:43 +10:00
Niels Andriesse 2720cac676
Merge pull request #15 from loki-project/friend-request-handling
Friend Request Handling
2019-05-16 14:46:24 +10:00
Niels Andriesse b6cef5826e Fix build 2019-05-16 14:34:03 +10:00