Commit graph

2050 commits

Author SHA1 Message Date
Mikunj
b5cc66262d Added ttl property on TSOutgoingMessage.
Use this ttl value when sending a message.
2019-05-22 13:00:32 +10:00
Mikunj
5a1272c23b Merge branch 'dev' into p2p 2019-05-22 12:42:00 +10:00
Niels Andriesse
638cb62f5a Fix build 2019-05-22 12:29:14 +10:00
Niels Andriesse
d5b176d831 Mock swarms for now 2019-05-22 12:28:19 +10:00
Niels Andriesse
e1d2c48c9b Integrate swarm changes into message sending code 2019-05-22 12:24:20 +10:00
Mikunj
fc702e2420 Merge commit 'e5463e545ac6be6c13b9d3cf65d9105ad475b4dc' into p2p 2019-05-22 12:06:30 +10:00
Niels Andriesse
adcb469b53 Integrate swarm changes into message receiving code 2019-05-22 12:06:02 +10:00
Niels Andriesse
e5463e545a Filter duplicate messages & make parsing strategy consistent 2019-05-22 11:32:32 +10:00
Mikunj
865bb1932f Added LokiP2PMessageHandler.
Moved wrapping and unwrapping of proto envelopes to LokiMessageWrapper.
2019-05-22 11:31:07 +10:00
Niels Andriesse
f3e2737043 Fix inconsistent function signatures 2019-05-22 09:36:35 +10:00
Mikunj
efa303abeb Fix mnemonic languages not being linked. 2019-05-22 09:16:03 +10:00
Niels Andriesse
35bdf69053 Merge branch 'swarms' of github.com:loki-project/loki-messenger-ios into swarms 2019-05-21 16:41:05 +10:00
Niels Andriesse
b1e18de5e2 Implement swarm parsing 2019-05-21 16:40:31 +10:00
Mikunj
167c154796 Fix up imports. 2019-05-21 15:47:19 +10:00
Mikunj
16b1622bea Updated imports. 2019-05-21 15:45:16 +10:00
Niels Andriesse
dc103c7bd6 Refactor 2019-05-21 15:21:51 +10:00
Mikunj
472113bccb Merge branch 'last-message-hash' into swarms 2019-05-21 14:45:34 +10:00
Mikunj
a12d36fb9e Set last hash in params. 2019-05-21 13:48:42 +10:00
Niels Andriesse
59de49641e Implement swarm caching 2019-05-21 13:44:46 +10:00
Mikunj
3dcb859316 Merge commit '9d7cec90e1012a5273f33cd2710f5f5b3169f783' into last-message-hash 2019-05-21 13:31:29 +10:00
Niels Andriesse
9d7cec90e1 WIP 2019-05-21 13:26:51 +10:00
Mikunj
50b41c63af Added storing of last message hash. 2019-05-21 13:26:10 +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
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
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
81d5adc8c8 Fix threading issue & unnecessary updating 2019-05-20 10:40:39 +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
64f92d261b Refactor 2019-05-17 13:37:36 +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