287 Commits

Author	SHA1	Message	Date
Niels Andriesse	1e788b337f	Clean	2020-02-01 07:58:32 +11:00
Mikunj	81b4259dab	Merge branch 'dev' into private-group-chat	2020-01-31 15:29:31 +11:00
Niels Andriesse	d7f1b86615	Remove legacy code	2020-01-31 12:50:25 +11:00
gmbnt	2fec819b48	Merge pull request #57 from loki-project/disable-sms ... Disable insecure sms option	2020-01-28 11:31:57 +11:00
Niels Andriesse	3e0cf28d0a	Undo debug setup	2020-01-28 11:13:35 +11:00
Niels Andriesse	2823c0ce5d	Clean up UI	2020-01-28 11:13:07 +11:00
Niels Andriesse	e3c54c21d1	Merge branch 'dev' into session-restore	2020-01-28 10:36:46 +11:00
Niels Andriesse	25cd9e6cc7	Clean	2020-01-24 10:00:20 +11:00
Niels Andriesse	1e014a690f	Clean	2020-01-22 15:28:39 +11:00
Niels Andriesse	b5cca49b54	Background poll for group messages	2020-01-22 11:57:16 +11:00
Niels Andriesse	f5c0936cd8	Implement group member count	2020-01-22 10:46:04 +11:00
Mikunj	6b38e5d799	Get group record programatically instead of making user pass in the recipient. ... This was the original function but i added in recipient to it. This is causing crashes and thus we just get the group record.	2020-01-22 09:30:26 +11:00
Niels Andriesse	552502b96a	Fix shortcut	2020-01-21 09:38:11 +11:00
Niels Andriesse	153baa294c	Clean	2020-01-17 15:00:36 +11:00
Niels Andriesse	a2f1eb67f9	Fix conversation title view	2020-01-17 10:37:06 +11:00
Niels Andriesse	ec2691a918	Fix message deletion & connectivity bug	2020-01-17 10:06:32 +11:00
Niels Andriesse	5f1fe4da68	Clean	2020-01-16 15:15:08 +11:00
Niels Andriesse	f4360bddc7	Implement message status bar	2020-01-16 14:35:51 +11:00
Niels Andriesse	7519400579	WIP	2020-01-16 11:37:52 +11:00
Niels Andriesse	9378818b73	WIP	2020-01-15 17:13:46 +11:00
Niels Andriesse	8aa214bd7d	WIP	2020-01-15 16:13:28 +11:00
Niels Andriesse	bfb6435d72	WIP	2020-01-15 12:20:10 +11:00
Niels Andriesse	23336cc2ea	WIP	2020-01-14 16:36:03 +11:00
Niels Andriesse	9776420135	WIP	2020-01-14 16:05:31 +11:00
Niels Andriesse	7d21e98ced	WIP	2020-01-14 12:19:28 +11:00
Niels Andriesse	4294977722	Fix attachment type selector	2020-01-14 10:27:17 +11:00
Niels Andriesse	52dc8d6b63	WIP	2020-01-14 10:27:17 +11:00
Niels Andriesse	df61e9565c	WIP	2020-01-14 10:27:17 +11:00
Niels Andriesse	b75a15a063	Fix attachment type selector	2020-01-14 10:27:12 +11:00
Niels Andriesse	c05c1eecd8	Implement input bar redesign	2020-01-10 16:35:32 +11:00
Niels Andriesse	4f9b5f06f0	Start implementing conversation screen redesign	2020-01-10 11:35:16 +11:00
Niels Andriesse	c3f1e6d72a	Clean	2019-12-19 12:04:38 +01:00
Mikunj	c19733e04a	Disable insecure sms option	2019-12-16 09:17:31 +11:00
Mikunj	23a5fa7580	Let user know when members have been removed from the group.	2019-12-13 09:05:18 +11:00
Mikunj	33788189dd	Distinguish public chat and rss feed from regular groups	2019-12-12 13:01:56 +11:00
Mikunj	b44ff69d8d	Fix banner display	2019-12-09 10:39:33 +11:00
Mikunj	97ffea040f	Move session restore prompt from message level to conversation level.	2019-12-09 09:15:25 +11:00
Mikunj	0caeb3a109	Handle session restoration.	2019-12-06 11:35:10 +11:00
Mikunj	fd2dc678ea	Show custom message on no session message. ... Made a no session message an update message.	2019-12-05 15:40:55 +11:00
Mikunj	9337a1d44a	Share profile straight away if you initiate a conversation	2019-11-27 16:10:41 +11:00
Mikunj	a852b019aa	Enable profile sharing upon becoming friends with a contact.	2019-11-27 15:25:53 +11:00
Niels Andriesse	549631848d	Clean	2019-11-20 09:17:31 +11:00
ryanzhao	2677599953	fix up the crash of mention. fix up the '@' issue.	2019-11-18 17:10:28 +11:00
Niels Andriesse	dbd09d6889	Merge branch 'temp' into dev	2019-11-18 15:01:56 +11:00
gmbnt	d5fbab4116	Merge pull request #41 from RyanRory/multiple-deletion ... multiple deletion in public group chat	2019-11-18 15:01:17 +11:00
Niels Andriesse	3e09946d25	Clean	2019-11-18 15:00:55 +11:00
ryanzhao	ed2dfdbf68	remove the commented out code	2019-11-15 15:47:46 +11:00
ryanzhao	9ed5ebab6d	Update ConversationFragement.java with the change of server. Use List instead of Array. Delete the converting codes.	2019-11-15 09:27:14 +11:00
ryanzhao	4837c520e3	multiple deletion frontend	2019-11-14 13:14:09 +11:00
Mikunj	d1289ec7bd	Refactoring.	2019-11-14 12:00:46 +11:00
Mikunj Varsani	a90b0e70f5	Fix conversation input.	2019-11-13 16:05:37 +11:00
Mikunj Varsani	41e0934dd4	Only update thread friend request status on message send if we haven't sent a previous request. ... Always send self sync messages to our primary device. Cache conversation input enabled so that subsequent calls don't cause it to flicker.	2019-11-13 12:28:17 +11:00
Mikunj	039df379cc	Fix minor UI	2019-11-12 08:33:54 +11:00
Mikunj	6f2a6f7f94	Sync contact upon accepting friend request	2019-11-06 16:08:34 +11:00
Mikunj	789aa244b5	Use promises instead of blocking the thread.	2019-11-01 14:29:43 +11:00
Mikunj	31ad7a40de	Stop main thread from being blocked. ... Refactoring.	2019-10-31 11:36:52 +11:00
Mikunj	7ff7c36e27	Cleanup code.	2019-10-30 09:59:11 +11:00
Mikunj	10ec395915	Correctly update UI when an outgoing friend request is accepted from a secondary device.	2019-10-29 12:13:22 +11:00
Mikunj	09f5f50af4	Don't render friend requests if we are already friends with a users linked device.	2019-10-29 10:06:01 +11:00
Mikunj	26800cba82	Send a background message to all devices upon manually accepting a friend request.	2019-10-25 15:21:19 +11:00
Mikunj	98cfd93b97	Enable note to self. ... Fix note to self crashing.	2019-10-24 15:38:13 +11:00
Mikunj	24ae0c640b	Handle friend requests correctly.	2019-10-24 12:17:58 +11:00
Mikunj	1c1685ae9d	Fix multidevice. ... Fix authorisation grant not being sent.	2019-10-24 10:30:53 +11:00
Mikunj	d58364c9b0	Disable input if we have a pending request to any other linked device and we're not friends with any of them	2019-10-23 15:31:58 +11:00
Mikunj	21e529c6c9	Forward messages from secondary devices to primary device.	2019-10-23 15:31:58 +11:00
Mikunj	b12e6b838c	Disable attachments on non-friends.	2019-10-18 16:12:49 +11:00
Mikunj	fd9f1b712f	Get attachment logic to work.	2019-10-18 12:47:44 +11:00
Niels Andriesse	a5b543c43c	Move add public chat button to home screen	2019-10-15 16:19:00 +11:00
Niels Andriesse	c2d4f4b58d	Fix mentions bug	2019-10-15 16:07:34 +11:00
Niels Andriesse	4a613df52d	Clean	2019-10-15 14:32:23 +11:00
Niels Andriesse	65f95839d9	Fix build	2019-10-15 13:51:18 +11:00
Niels Andriesse	08a1b0e947	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into custom-server	2019-10-15 13:42:44 +11:00
Niels Andriesse	a8c4fa22a3	Partially fix build	2019-10-15 13:39:17 +11:00
Niels Andriesse	e423ec8848	Change mentions approach	2019-10-11 16:37:28 +11:00
Mikunj	2f18c5bad2	Merge branch 'dev' into custom-server ... # Conflicts: # src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt	2019-10-11 15:40:09 +11:00
Niels Andriesse	ca9032e109	Quick fix crash	2019-10-11 14:59:13 +11:00
Niels Andriesse	0f364fcea7	Render mentions in previews & refactor	2019-10-11 14:41:43 +11:00
Niels Andriesse	b425929da6	Render mentions in replies	2019-10-11 13:24:20 +11:00
Niels Andriesse	57bbad6fab	Debug	2019-10-11 12:02:02 +11:00
Niels Andriesse	18eb3449ca	Debug	2019-10-11 11:42:01 +11:00
Niels Andriesse	7ea349ff00	Mention by display name rather than hex encoded public key	2019-10-11 11:13:34 +11:00
Mikunj	13d42f542c	Added public chat manager. ... Replace hard coded public chat server with dynamic one.	2019-10-11 09:36:52 +11:00
Niels Andriesse	3d78dac65c	Ensure that mention behavior is consistent cross-platform	2019-10-10 16:29:58 +11:00
Niels Andriesse	f0224f8ec6	Debug	2019-10-10 15:30:34 +11:00
Niels Andriesse	871f629e64	Debug	2019-10-10 15:00:14 +11:00
Niels Andriesse	25f1405512	Show user selection view dynamically	2019-10-10 14:44:08 +11:00
Niels Andriesse	9207e479a6	Implement user selection view	2019-10-10 13:53:02 +11:00
Niels Andriesse	25bd1073b0	Pre-populate user ID cache as needed	2019-10-10 10:39:56 +11:00
Niels Andriesse	5901967eee	Implement mention rendering	2019-10-10 09:42:40 +11:00
Mikunj Varsani	c70de8c569	Merge pull request #23 from loki-project/bug-fix ... Correctly show quote author name in group chats.	2019-09-30 12:04:57 +10:00
Niels Andriesse	3a257d745b	Debug	2019-09-19 14:06:54 +10:00
Niels Andriesse	96dadbaaa8	Handle media message friend requests	2019-09-18 17:33:34 +10:00
Niels Andriesse	6bf90d7d5d	Fix crash	2019-09-18 14:49:08 +10:00
Niels Andriesse	cc7f93688f	Fix message ordering	2019-09-18 14:43:02 +10:00
Niels Andriesse	a78b8a77b6	Clean	2019-09-18 10:00:18 +10:00
Niels Andriesse	74dfac6fd1	Implement GIF sending	2019-09-17 11:46:47 +10:00
Niels Andriesse	db320be3f0	Debug moderator tags	2019-09-13 09:22:36 +10:00
Niels Andriesse	b67efcf2ab	Implement moderator tags	2019-09-12 16:42:52 +10:00
Niels Andriesse	7cc7f907fe	Implement copy public key action for group chats	2019-09-12 14:10:04 +10:00
Mikunj	28b8d080c4	Correctly show quote author name in group chats.	2019-09-12 11:08:45 +10:00
Niels Andriesse	52b55652c8	Clean	2019-09-12 09:59:15 +10:00
Niels Andriesse	3b242e7435	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into bug-fixes ... # Conflicts: # src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java	2019-09-12 09:46:12 +10:00
Niels Andriesse	f3c4098f14	Disallow quoting multiple messages simultaneously	2019-09-11 16:28:07 +10:00
Niels Andriesse	88a5b7a87f	Implement quotes in group chats	2019-09-11 15:52:32 +10:00
Mikunj	caff6e1da4	Fix notification edge case	2019-09-11 09:29:29 +10:00
Niels Andriesse	fd389a637a	Clean	2019-09-10 13:50:59 +10:00
Mikunj	842be4378a	Show correct names on public chats.	2019-09-09 13:01:54 +10:00
Niels Andriesse	6341ca0101	Add basic events	2019-09-05 09:38:36 +10:00
Niels Andriesse	4efe8fb040	Clean	2019-09-04 10:02:42 +10:00
Niels Andriesse	9bd4a9e542	Fix indentation	2019-09-03 16:05:21 +10:00
Niels Andriesse	1042ed7a14	Fix moderation	2019-09-03 16:02:06 +10:00
Niels Andriesse	208eda8568	Fix menu option visibility	2019-09-03 15:17:14 +10:00
Niels Andriesse	9ff7f2a8e0	Implement public chat message deletion	2019-09-03 14:48:07 +10:00
Niels Andriesse	517d4e94c5	Clean	2019-08-28 16:07:20 +10:00
Niels Andriesse	386b219076	Disable input bar for RSS feeds	2019-08-28 15:17:43 +10:00
Niels Andriesse	eb9537f1c1	Make group chats a bit more future proof	2019-08-09 12:00:01 +10:00
Niels Andriesse	04aa7db499	Use alternative approach for group message sending	2019-08-08 17:24:00 +10:00
Niels Andriesse	2c3e67e062	Disable deleting and replying to messages in Loki public chat	2019-08-08 14:25:09 +10:00
Niels Andriesse	2249bf1edb	Fix message spacing	2019-08-08 11:47:21 +10:00
Niels Andriesse	1822e87f7c	Merge Signal 4.41.0	2019-08-07 16:48:54 +10:00
Niels Andriesse	781a8500df	Clean	2019-08-07 15:24:05 +10:00
Niels Andriesse	a900c389bc	Implement group message sending	2019-08-07 15:13:44 +10:00
Niels Andriesse	7602b973a9	Show loader while accept friend request message is sending	2019-08-07 12:00:12 +10:00
Niels Andriesse	149d4b0181	Disable unwanted menu options	2019-08-06 15:43:47 +10:00
Niels Andriesse	8ad0069fec	Fix group message UI	2019-08-06 10:22:05 +10:00
Niels Andriesse	93b7472e25	WIP	2019-08-05 16:32:05 +10:00
Niels Andriesse	a7b49d2ce5	Revert back to old background message strategy	2019-07-26 12:20:55 +10:00
gamabuntan	4374a902be	Merge pull request #2 from loki-project/friend-request-handling ... Friend Request Handling V2	2019-07-24 12:49:00 +10:00
Niels Andriesse	b3d76bfd28	Clean	2019-07-24 12:48:42 +10:00
Niels Andriesse	0ef0140b0d	Update package	2019-07-24 12:30:23 +10:00
Mikunj	1d7cb0d5bb	Updated friend request handling.	2019-07-24 12:18:45 +10:00
Niels Andriesse	6d521e4227	Send session reset request acknowledgement if needed	2019-07-22 16:22:40 +10:00
Niels Andriesse	1da6f20f18	Further Lokify UI	2019-07-22 13:08:56 +10:00
Mikunj	61622fbd3d	Session reset handling.	2019-07-22 09:38:12 +10:00
Niels Andriesse	8651f20c9b	Further Lokify UI	2019-07-19 15:59:51 +10:00
Niels Andriesse	8c054a060e	Block input if a friend request is pending	2019-07-19 13:15:17 +10:00
Niels Andriesse	daa1248e6c	Debug session handling	2019-07-02 11:47:28 +10:00
Niels Andriesse	ca370211f8	Resolve TODO	2019-06-28 16:08:27 +10:00
Niels Andriesse	e8bece45b9	Fix missing delegate & friend request acceptance	2019-06-28 14:59:25 +10:00
Niels Andriesse	86c765b1c2	Debug friend request logic further	2019-06-28 12:32:23 +10:00
Niels Andriesse	1a7e0562bb	Debug friend request logic	2019-06-27 16:03:05 +10:00
Niels Andriesse	047a98ad63	Disable input bar if a friend request is pending	2019-06-25 11:48:39 +10:00
Niels Andriesse	b27dfdf6ce	Fix crash	2019-06-25 09:28:37 +10:00
Niels Andriesse	b58fce3a68	Update for core changes & refactor	2019-06-24 14:10:09 +10:00
Niels Andriesse	d99a996d0e	Finish friend request view & add message friend request status	2019-06-24 11:22:53 +10:00
Niels Andriesse	7c501980fa	Implement friend request view skeleton	2019-06-21 12:21:48 +10:00
Niels Andriesse	21e1ece19c	Model friend request status as an enum	2019-06-18 09:57:36 +10:00
Mikunj	d44081d040	Added database to map thread to loki friend request	2019-06-17 12:17:05 +10:00
Niels Andriesse	25e0213d4b	Fix blocked conversation screen	2019-06-07 13:54:50 +10:00
Niels Andriesse	bb180ff2d5	Fix build	2019-06-05 16:30:31 +10:00