5530 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mikunj	c66786e0f1	Allow users to edit device name.	2019-11-21 10:50:33 +11:00
Mikunj	b61b4c581d	Add bottom sheet dialog	2019-11-21 10:32:26 +11:00
Mikunj	d96664cb6a	Remove textbox in linking dialog.	2019-11-20 16:22:17 +11:00
Mikunj	c3bda57ac1	Show name and short id in linked device screen.	2019-11-20 15:47:28 +11:00
Mikunj	e72d5502ce	Show our device words in preferences if we're a secondary device.	2019-11-20 15:21:54 +11:00
Mikunj	28a04f13af	Refactor. ... Add text field to authorise dialog.	2019-11-20 14:55:42 +11:00
Mikunj	dc40ff0548	Only update display name from received message if the user is not one of our devices.	2019-11-20 11:59:18 +11:00
Mikunj	8c2d075147	Revert changes made in ApplicationPreferencesActivity.	2019-11-20 11:45:54 +11:00
Mikunj	ba78fcb9b1	Move device linking logic into LinkedDeviceActivity.	2019-11-20 11:44:44 +11:00
Mikunj	0f5db5aa33	Hook up signal device linking view.	2019-11-20 11:20:45 +11:00
Niels Andriesse	549631848d	Clean	2019-11-20 09:17:31 +11:00
gmbnt	0e7c1b1aca	Merge pull request #44 from RyanRory/mention ... Mention	2019-11-20 09:14:13 +11:00
Niels Andriesse	e5a964bc4b	Update build number 1.5.0-beta	2019-11-19 11:46:26 +11:00
Mikunj Varsani	291fb7f7ad	Fix display name not being set correctly once we pair with a device.	2019-11-19 09:03:32 +11:00
ryanzhao	2677599953	fix up the crash of mention. fix up the '@' issue.	2019-11-18 17:10:28 +11:00
RyanZhao	a307a8e207	Merge pull request #2 from loki-project/dev ... Fix threading	2019-11-18 16:54:18 +11:00
Niels Andriesse	8ccfa77ef6	Fix threading	2019-11-18 16:35:57 +11:00
RyanZhao	b238d6508c	Merge pull request #1 from loki-project/dev ... Dev	2019-11-18 16:16:45 +11:00
Niels Andriesse	e17002c979	Update build number	2019-11-18 15:10:56 +11:00
Niels Andriesse	045e4be2f0	Partially undo threading changes	2019-11-18 15:10:40 +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
Niels Andriesse	780ee73511	Update version number	2019-11-18 13:53:02 +11:00
gmbnt	28c5d0d11c	Merge pull request #40 from loki-project/disable-permissions ... Disabled unused permissions	2019-11-18 13:22:48 +11:00
gmbnt	2a4eaf9644	Merge pull request #43 from loki-project/device_cap ... Set linked device cap to 1	2019-11-18 13:22:30 +11:00
Niels Andriesse	e785eab28b	Clean	2019-11-18 13:21:52 +11:00
gmbnt	053183a628	Merge pull request #42 from loki-project/batch-name-updating ... Public chat batch name updating	2019-11-18 13:19:39 +11:00
Niels Andriesse	5da4892d9d	Ensure UI updates happen on the main thread	2019-11-18 13:19:25 +11:00
Niels Andriesse	638d693e11	Clean	2019-11-18 13:12:57 +11:00
Mikunj	cf8ed65f4e	Merge branch 'dev' into disable-permissions	2019-11-18 13:06:00 +11:00
Mikunj	35ee1c1391	Fix avatar images not being updated correctly.	2019-11-18 13:02:19 +11:00
Mikunj	edbffe7211	Disable linking devices once we hit a cap.	2019-11-18 12:59:49 +11:00
Mikunj	8eedff81eb	Async everything!	2019-11-18 11:55:16 +11:00
Mikunj	457faae5a5	Added public chat server profile name batch polling.	2019-11-18 11:33:18 +11:00
Niels Andriesse	cfe321b248	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev	2019-11-18 11:31:47 +11:00
Niels Andriesse	573aabdd52	Fix copy	2019-11-18 11:31:19 +11:00
Mikunj	d0a828985a	Fix placeholder messages showing in the wrong conversation.	2019-11-18 10:03:59 +11:00
gmbnt	4f1beeaa88	Merge pull request #39 from loki-project/multi-device-stage-2 ... [Stage 2] Multi device	2019-11-15 16:25:56 +11:00
Niels Andriesse	30df89ea58	Fix critical issues	2019-11-15 16:24:58 +11:00
ryanzhao	ed2dfdbf68	remove the commented out code	2019-11-15 15:47:46 +11:00
Mikunj	463aaf0fb8	Fix processing of outgoing attachment messages in public chats. ... Before we were directly inserting messages into the database but that wasn't working because attachments never got downloaded. This fixes it so we forcefully go through signals pipeline via self sync messages.	2019-11-15 11:44:12 +11:00
Mikunj	848cab8677	Handle incoming messages from our other devices in public chats.	2019-11-15 09:58:13 +11:00
Mikunj	55ea9869a8	Hook up http cache to LokiDotNetAPI.	2019-11-15 09:33:30 +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	44ccc66ec2	Fix multi-device media messages. ... This fixes the issue of the same attachments being uploaded multiple times per linked device. Now we only upload the attachments once and then we send the media message.	2019-11-14 10:44:55 +11:00
Mikunj Varsani	a90b0e70f5	Fix conversation input.	2019-11-13 16:05:37 +11:00
Mikunj Varsani	9c243eed75	Correctly redirect typing messages and receipts. ... Send an accept message back after becoming friends with a contact during contact sync.	2019-11-13 14:53:42 +11:00