Commit graph

4642 commits

Author SHA1 Message Date
Mikunj
757216fe80 Fix text input disabling. 2018-11-13 13:46:53 +11:00
Mikunj
2a83c8710c Fix up sending friend requests. 2018-11-13 13:41:32 +11:00
Mikunj
fc3cb9c46d Replace old pending messages with new one when adding a new incoming friend request.
More refactoring.
2018-11-13 13:41:32 +11:00
Mikunj
d5fafd4d78 refactor friend request message props 2018-11-13 13:41:32 +11:00
Mikunj
a80d6bb868 Merged branch correctly. 2018-11-13 13:41:21 +11:00
Mikunj Varsani
e4d28fbcb8
Merge pull request #31 from Mikunj/fix/minor-bug
Fixed incorrect variable used.
2018-11-13 12:35:26 +11:00
Mikunj
40fb7f726f Fixed incorrect variable used. 2018-11-13 12:34:31 +11:00
sachaaaaa
7887786b00
Merge pull request #29 from BeaudanBrown/message-polling
Message server is polled every 5 seconds to check for new messages
2018-11-13 11:50:38 +11:00
BeaudanBrown
9ceb3c8ac0
Merge branch 'development' into message-polling 2018-11-13 11:18:52 +11:00
sachaaaaa
5c93acffe1
Merge pull request #27 from Mikunj/merge/signal
Merge new signal changes
2018-11-13 11:09:38 +11:00
Beaudan
c59b196487 Now reading messages and adding them to conversations. Some cleaning of unreachable code. Modified the message data to be encoded as base64 string before sending to server
Sending our public key in header of message

Now attaching our key to the source field when sending messages, allows messages to be decrypted with the fallback cypher

Now polling the server for messages every 5 seconds

Sending the source device with messages

Added mock respond function to request to leave it that same as the websocket stuff. RetrieveMessages now just returns the result

Polling now continues if the server responds with an error. Returning only the result from sendMessage and retrieveMessages

Revert commenting of unreachable code

Refactored http logic into own file

Revert a change to websocket-resources
2018-11-13 10:13:19 +11:00
Mikunj
fca5a74da3 Fixed review issues. 2018-11-12 14:16:56 +11:00
Mikunj
0cecbe147c Removed todo 2018-11-12 13:13:22 +11:00
Mikunj
21f76fa693 Minor layout fix 2018-11-12 12:22:56 +11:00
Mikunj
0a23888875 Fix up friend request message layout 2018-11-12 12:17:47 +11:00
Mikunj
c583819ccf Fixed view layouts after deleting a conversation. 2018-11-12 11:34:28 +11:00
Mikunj
0cf616328e Fixed saving prekey bundle once friend request is accepted.
Added option to delete conversation after it is declined.
2018-11-12 11:02:08 +11:00
Mikunj
0a88f337d5 Merge branch 'sig-development' into merge/signal 2018-11-12 10:06:34 +11:00
Mikunj
be1a69c200 Fix up saving friendRequestStatus 2018-11-12 09:31:46 +11:00
Mikunj
c150cbe34f Friend request message indicator. 2018-11-12 09:22:05 +11:00
Mikunj
b9e85bb141 Added handling of accept and decline events. 2018-11-09 15:28:33 +11:00
Mikunj
9dc19044b9 Handle the case where the user is sending a friend request.
Fix up styling for outgoing message.
2018-11-09 14:42:14 +11:00
Mikunj
08ca779fe1 Fixed up friend request message display 2018-11-09 14:27:49 +11:00
Mikunj
5626cfe47d Added FriendRequest message 2018-11-09 12:24:10 +11:00
Mikunj
1bef7a0c98 Modified createAccount to only accept params needed for Loki Messenger.
Removed implementation of registerSecondDevice.
2018-11-09 10:28:55 +11:00
Mikunj
b63844af57 Fix registration. 2018-11-08 12:39:48 +11:00
Scott Nonnenberg
59d048ca06 v1.18.0-beta.6 2018-11-07 17:24:51 -08:00
Mikunj
d5154bef73 Move version 7 schema to version 6. 2018-11-08 12:13:08 +11:00
Scott Nonnenberg
e828253ef0 Restor full function syntax to custom Mocha reporter 2018-11-07 16:53:41 -08:00
Scott Nonnenberg
a2202d7d8c Update localization strings 2018-11-07 16:36:05 -08:00
Scott Nonnenberg
dbf0be2db5 eslintify all test files 2018-11-07 16:34:38 -08:00
Scott Nonnenberg
884bc9333d Make timestamp test a bit more forgiving 2018-11-07 16:34:20 -08:00
Scott Nonnenberg
2d48daa7b6 Refine Sealed Sender behaviors 2018-11-07 16:34:20 -08:00
Mikunj
e678d84d7e Oops forgot semi colons 2018-11-08 11:21:27 +11:00
Mikunj
abe7170b4e Added sql deletion of contact pre keys and contact signed pre keys 2018-11-08 11:20:18 +11:00
Mikunj
2fabd93fd6 Fix message sending 2018-11-08 11:03:11 +11:00
Mikunj
98185fa6fd Added sql migration. 2018-11-08 10:15:28 +11:00
Mikunj
77602e3dbb Moved contactPreKey and contactSignedPreKey to sql. 2018-11-08 09:48:49 +11:00
Mikunj
525007f944 Added fetching preKey by recipient. 2018-11-08 07:48:09 +11:00
Mikunj
1a4adf2281 Merge branch 'development' into merge/signal 2018-11-08 07:23:27 +11:00
sachaaaaa
c77df8e304
Merge pull request #26 from Mikunj/feature/public-key-validation
Public key validation
2018-11-07 19:42:37 +11:00
Mikunj
f589fdac5c Merge signal changes into branch. 2018-11-07 15:26:37 +11:00
Mikunj
683d4f4106 Merge branch 'development' into feature/public-key-validation 2018-11-07 14:04:20 +11:00
sachaaaaa
726f6b11f1
Merge pull request #25 from loki-project/fix/duplicate-search
[Fix] User searching
2018-11-07 13:46:23 +11:00
Mikunj
61d15fdd57 Changed == to === 2018-11-07 13:20:52 +11:00
Mikunj
9ea44a5cd2 fix incorrect error return. 2018-11-07 13:11:03 +11:00
Mikunj
4e6df71999 Fix up tests. 2018-11-07 12:15:22 +11:00
Beaudan
1ccf3b6b95 Added function to loki_message_api to do a single request call to storage server. Currently just gets called once when the application starts 2018-11-07 11:49:56 +11:00
Mikunj
9d342e8951 Show a message if user types in an invalid public key in search. 2018-11-07 11:41:46 +11:00
sachaaaaa
ba1894ec40
Merge pull request #23 from sachaaaaa/fix_lock
Always lock editor after sending friend request. unlock if error.
2018-11-07 10:28:47 +11:00