3875 Commits

Author	SHA1	Message	Date
Kee Jefferys	9db11df567	Style mentions the same	2020-06-19 11:56:00 +10:00
nielsandriesse	bcd5285afc	Update for upcoming desktop protocol changes	2020-06-18 16:56:19 +10:00
nielsandriesse	7e89f28ab4	Update background poll interval	2020-06-18 13:10:58 +10:00
nielsandriesse	f85ad3564b	Add FIXME	2020-06-15 14:01:09 +10:00
nielsandriesse	132ca11692	Merge branch 'fix-profile-picture-updating' of github.com:RyanRory/loki-messenger-android into dev	2020-06-15 13:54:12 +10:00
nielsandriesse	2e8e428257	Don't repair session if there's an outstanding session request	2020-06-12 15:15:33 +10:00
nielsandriesse	5db952d676	Merge branch 'dev' into firebase	2020-06-09 15:11:23 +10:00
Niels Andriesse	bcdc07e55b	Merge pull request #223 from Haafingar/smsflashfix ... Fix SMS Button Flash	2020-06-09 14:41:54 +10:00
nielsandriesse	9c8c23c5d9	Fix various new conversation button issues	2020-06-09 13:35:27 +10:00
Haafingar	e58290b93a	remove enable SMS button	2020-06-09 12:57:32 +10:00
nielsandriesse	07737262ca	Unify background pollers and reduce polling interval ... We were getting rate limited	2020-06-09 11:39:08 +10:00
nielsandriesse	eded767e56	Rename ACCESS_SECRETS → ACCESS_SESSION_SECRETS	2020-06-09 11:21:46 +10:00
Niels Andriesse	ceee4581e4	Merge pull request #208 from loki-project/session-handling ... Potentially Fix Message Reception Issue	2020-06-05 16:37:12 +10:00
nielsandriesse	58c6e1ce1e	Also increase MAX_COMPRESSION_QUALITY	2020-06-05 16:10:16 +10:00
Haafingar	cfc1bca033	introduce excludes in build.gradle	2020-06-04 14:17:44 +10:00
ryanzhao	733ed3ff5a	Fix profile picture and display name updating from a slave device	2020-06-03 17:03:35 +10:00
Haafingar	edd20dd83c	increase quality parameter	2020-06-03 13:06:03 +10:00
nielsandriesse	6a12517105	Fix crash	2020-06-03 11:52:30 +10:00
nielsandriesse	47947e3546	Update copy	2020-06-02 16:07:16 +10:00
nielsandriesse	5b5413991d	Don't block while countries are loading	2020-06-02 15:59:25 +10:00
nielsandriesse	6cb6714893	Ditch rebuild path button	2020-06-02 15:22:32 +10:00
nielsandriesse	1217e5278f	Show countries rather than IPs	2020-06-02 15:18:09 +10:00
nielsandriesse	51f0374109	Implement IP2Country	2020-06-02 15:00:37 +10:00
nielsandriesse	f493a790be	Potentially fix message reception issue	2020-06-01 16:38:28 +10:00
nielsandriesse	cae6afec52	Update for core changes	2020-06-01 10:33:47 +10:00
nielsandriesse	6c4b3b0fff	Fix closed group profile pictures & mentions	2020-05-30 08:53:00 +10:00
nielsandriesse	3294b829ca	Turn comment into TODO	2020-05-29 14:08:13 +10:00
Niels Andriesse	163548328c	Merge pull request #205 from Haafingar/fixbackups ... Fix Backup Names & File Paths	2020-05-29 14:07:14 +10:00
nielsandriesse	9ddddaf880	Persist onion request paths to database	2020-05-29 13:57:56 +10:00
nielsandriesse	c0f4ccfbe5	Persist snode pool to database	2020-05-29 12:01:43 +10:00
nielsandriesse	3a646476ff	Implement remaining onion request UI	2020-05-29 11:16:52 +10:00
nielsandriesse	326b5a9475	Use actual path data, clean and fix incorrect copy	2020-05-29 09:43:03 +10:00
nielsandriesse	c7adf9f232	Add animation	2020-05-28 18:16:53 +10:00
nielsandriesse	388ca90361	Implement basic onion request UI	2020-05-28 16:43:37 +10:00
Haafingar	f80bbcf927	Fix backup names and filepaths, refactor function names	2020-05-28 14:55:17 +10:00
nielsandriesse	5d4c7dcb49	Update legal URLs	2020-05-28 14:39:56 +10:00
nielsandriesse	5f8f95898a	Fix build	2020-05-28 14:04:46 +10:00
Haafingar	1b9908377c	Change button behaviour to match usr expectations	2020-05-27 17:40:08 +10:00
Niels Andriesse	a6b9012aec	Show actual open group member count	2020-05-27 13:51:19 +10:00
Niels Andriesse	a750f4f9f1	Merge branch 'dev' into translation	2020-05-27 13:39:55 +10:00
nielsandriesse	3d44816e4a	Potentially fix crash	2020-05-26 09:03:41 +10:00
nielsandriesse	0c0c740bc8	Fix build	2020-05-26 08:55:29 +10:00
nielsandriesse	b4f1640d0b	Potentially fix crash	2020-05-25 18:01:21 +10:00
nielsandriesse	18967d9890	Prepare remaining screens for localization	2020-05-25 17:11:15 +10:00
nielsandriesse	61733d90ba	Prepare setting screens for localization	2020-05-25 16:38:36 +10:00
nielsandriesse	7855c7dc4f	Prepare new conversation screens for localization	2020-05-25 16:12:24 +10:00
nielsandriesse	e585d94892	Prepare home screen for localization	2020-05-25 15:46:53 +10:00
nielsandriesse	13943f75ef	Prepare onboarding for localization	2020-05-25 15:24:55 +10:00
nielsandriesse	607b3d6a96	Debug	2020-05-25 14:20:47 +10:00
nielsandriesse	29679ed266	Hopefully unbork existing clients	2020-05-25 13:58:30 +10:00
nielsandriesse	b4299c4308	Fix friend request acceptance bug	2020-05-25 13:37:18 +10:00
nielsandriesse	40bc3bfda0	Partially unbork accepting FRs sent by slave devices	2020-05-25 12:30:58 +10:00
nielsandriesse	92b4b81935	Fix closed group messaging from slave devices	2020-05-25 11:37:30 +10:00
nielsandriesse	25fd92fa79	Fix device unlinking	2020-05-25 10:20:18 +10:00
nielsandriesse	904d9b95b7	Clean	2020-05-22 15:03:15 +10:00
nielsandriesse	c73409b9d2	Fix database reset	2020-05-22 13:47:51 +10:00
nielsandriesse	a7b94d188f	Fix various session reset issues	2020-05-22 13:41:36 +10:00
nielsandriesse	9b329cbd34	Fix closed group creation	2020-05-22 11:57:40 +10:00
nielsandriesse	b647fff5b8	Fix inverted check	2020-05-22 11:57:26 +10:00
nielsandriesse	f3dbf98976	Clean	2020-05-22 11:18:47 +10:00
nielsandriesse	7d5114b595	Fix closed group multi device message sending	2020-05-22 11:14:36 +10:00
nielsandriesse	f015339fc5	Fix simultaneous session request bug	2020-05-22 10:41:31 +10:00
nielsandriesse	06883cc3ef	Clean	2020-05-22 09:53:04 +10:00
nielsandriesse	373dfc264f	Fix AFRs	2020-05-21 16:48:10 +10:00
nielsandriesse	45985f4f64	Ignore synced ephemeral messages & fix expiration updating bug	2020-05-21 16:08:48 +10:00
nielsandriesse	bb67801c85	Clean	2020-05-21 14:58:47 +10:00
nielsandriesse	ceaee33d28	Fix self syncing	2020-05-21 14:29:51 +10:00
nielsandriesse	7588981f10	Debug	2020-05-21 11:24:09 +10:00
nielsandriesse	e2ca40952e	Partially fix note to self	2020-05-21 11:00:54 +10:00
nielsandriesse	45706b8e66	Fix device linking	2020-05-20 15:44:21 +10:00
nielsandriesse	e6e5cb5adb	Clean	2020-05-19 16:26:11 +10:00
nielsandriesse	7b143fa7e9	Re-enable previously problematic code	2020-05-19 14:42:09 +10:00
nielsandriesse	92bf59b5a0	Fix duplicate message handling	2020-05-19 14:21:29 +10:00
nielsandriesse	a907d78916	Improve logging	2020-05-19 13:59:19 +10:00
nielsandriesse	5cb98d8fc3	Refactor & temporarily disable problematic code	2020-05-19 13:57:47 +10:00
nielsandriesse	40200fe5e1	Only show GIF metadata warning once	2020-05-19 09:21:39 +10:00
nielsandriesse	d4f6178700	Clean	2020-05-15 15:44:45 +10:00
nielsandriesse	eecfd82780	Fix multi device message routing bug	2020-05-15 10:25:18 +10:00
nielsandriesse	9f4fcec98f	Fix session request handling bug	2020-05-15 09:24:08 +10:00
nielsandriesse	4aafba218c	Debug	2020-05-14 14:51:34 +10:00
nielsandriesse	f29f775cf9	Implement AFR sending	2020-05-14 14:24:05 +10:00
nielsandriesse	7a351592a4	Fix build	2020-05-14 14:11:34 +10:00
nielsandriesse	e668341e38	Glue some things together again	2020-05-14 13:52:20 +10:00
nielsandriesse	27b5a93161	Glue some things together again	2020-05-14 12:11:42 +10:00
nielsandriesse	281d921849	Clean	2020-05-14 11:44:33 +10:00
nielsandriesse	e5b1174879	Add missing friend request protocol logic	2020-05-14 11:27:17 +10:00
nielsandriesse	3c328b3c84	Add missing friend request protocol logic	2020-05-14 11:19:20 +10:00
nielsandriesse	42346cf54b	Refactor ConversationActivity	2020-05-14 10:44:13 +10:00
nielsandriesse	52926584b5	Add missing sync message handling	2020-05-14 10:11:55 +10:00
nielsandriesse	deb2fff0ae	Refactor ApplicationContext	2020-05-14 09:35:34 +10:00
nielsandriesse	1eedd38861	Glue some things together again	2020-05-13 16:39:14 +10:00
nielsandriesse	6205b6c9f6	Refactor PushDecryptJob	2020-05-13 16:34:08 +10:00
nielsandriesse	afe049c9c3	Clean	2020-05-13 11:16:04 +10:00
nielsandriesse	d0742cf09f	Refactor multi device message sending	2020-05-13 11:15:17 +10:00
nielsandriesse	eb5b8886d4	Refactor MessageSender	2020-05-13 10:24:20 +10:00
nielsandriesse	819f414446	Clean & debug	2020-05-13 09:07:51 +10:00
nielsandriesse	9b4a219b06	Clean GroupManager	2020-05-12 16:33:04 +10:00
nielsandriesse	04e14dd5dd	Refactor GroupMessageProcessor	2020-05-12 16:28:35 +10:00
nielsandriesse	439bdac7f4	Refactor MultiDeviceContactUpdateJob	2020-05-12 15:50:29 +10:00
nielsandriesse	10865adba8	Refactor PushGroupSendJob	2020-05-12 15:29:00 +10:00
nielsandriesse	03f2c76344	Refactor PushMediaSendJob	2020-05-12 14:57:48 +10:00
nielsandriesse	361083f790	Refactor PushTextSendJob	2020-05-12 14:47:40 +10:00
nielsandriesse	32ae74c442	Re-order files	2020-05-12 11:46:11 +10:00
nielsandriesse	0a5d12cbc3	Debug	2020-05-12 11:32:00 +10:00
nielsandriesse	b9d8d100d9	Refactor	2020-05-12 11:26:44 +10:00
nielsandriesse	8e53383ab9	Clean	2020-05-12 10:46:58 +10:00
nielsandriesse	ed2ab2d78a	Refactor	2020-05-11 16:19:26 +10:00
nielsandriesse	410bb9df43	Update for core changes	2020-05-11 08:43:54 +10:00
nielsandriesse	8d50998ea1	Partially update for core changes	2020-05-07 17:59:41 +10:00
Niels Andriesse	f164508673	Merge branch 'dev' into share	2020-05-06 11:44:38 +10:00
nielsandriesse	4599407b3a	Clean	2020-05-06 11:43:04 +10:00
nielsandriesse	2af186a8bf	Fix copy	2020-04-22 12:12:13 +10:00
nielsandriesse	7abf8f033d	Reduce FCM token re-upload interval	2020-04-21 12:21:07 +10:00
nielsandriesse	af80d066d3	Fix new conversation button quick tap issue	2020-04-20 13:52:14 +10:00
nielsandriesse	dda578bef8	Ditch RSS feeds for now	2020-04-20 11:54:56 +10:00
nielsandriesse	0e95c8cec3	Clean	2020-04-17 16:12:29 +10:00
nielsandriesse	669e8b9f6b	Fix FCM token updating bug	2020-04-17 13:26:11 +10:00
nielsandriesse	9f1809abf4	Clean	2020-04-17 12:21:01 +10:00
nielsandriesse	0a3dbc55a8	Integrate push notifications	2020-04-17 12:11:27 +10:00
Niels Andriesse	e68c2d1cfe	Merge pull request #174 from loki-project/push-notifications ... Improved Push Notifications Stage 2	2020-04-16 16:58:15 +10:00
nielsandriesse	84c783fae1	Minor refactoring	2020-04-16 16:56:12 +10:00
nielsandriesse	6d4398e740	Implement PN mode bottom sheet UI	2020-04-16 15:18:11 +10:00
nielsandriesse	c09032900f	Implement PN mode screen UI	2020-04-16 14:49:23 +10:00
Mikunj	42d74208ff	Refactor	2020-04-15 16:38:53 +10:00
ryanzhao	1183b76ef5	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-android into remote-push-notification	2020-04-15 15:04:08 +10:00
ryanzhao	8ea2fe0294	add update token guard and move acknowledgement to signal service	2020-04-15 15:03:57 +10:00
Niels Andriesse	0b565588d8	Merge pull request #167 from loki-project/closed-group-fixes ... Closed Group Fixes	2020-04-15 15:02:06 +10:00
nielsandriesse	6ed3a4c372	Add FIXME	2020-04-15 15:01:02 +10:00
Mikunj	dd9b134dab	Updated UserView	2020-04-15 13:06:10 +10:00
Mikunj	361dab24d6	Replaced signal ContactSelection things with loki ones. ... Fixed sharing in session (we can only share to one user at a time).	2020-04-15 12:52:23 +10:00
ryanzhao	18ce4433d2	Merge branch 'dev' of https://github.com/loki-project/loki-messenger-android into remote-push-notification	2020-04-15 10:24:55 +10:00
ryanzhao	b72048d9a4	add FCM to app for remote push notification	2020-04-15 10:24:30 +10:00
Mikunj	7b8fbcea4e	Added ContactUtilities.	2020-04-14 16:31:31 +10:00
Niels Andriesse	11b5c78e3e	Merge pull request #168 from loki-project/onion-requests ... Onion Requests	2020-04-14 11:43:00 +10:00
Mikunj	7d9eafe8fb	Ignore closed group messages from users who are not members.	2020-04-09 15:30:29 +10:00
Mikunj	45220bfa70	Hide input when group is marked as not active. ... Fix bug where input panel gets shown when you long press a message.	2020-04-09 15:01:26 +10:00
nielsandriesse	be688d8095	Update for core changes	2020-04-09 14:45:13 +10:00
nielsandriesse	a6bfd14285	Update for core changes	2020-04-09 13:38:15 +10:00
Mikunj	f149065a30	Fix GroupDescriptions updating dynamically. ... This shouldn't happen, rather it should have the snapshot of the group state per message.	2020-04-09 13:17:00 +10:00
Mikunj	4a36ed333d	Disable chat if we were removed from the group.	2020-04-09 10:47:18 +10:00
Mikunj	3ec5974210	Correctly display when user was kicked or added	2020-04-09 10:35:08 +10:00
Audric Ackermann	407f6aa3a5	trigger register on press enter	2020-04-09 09:32:35 +10:00
gmbnt	1f6ea3b55c	Maintain consistent code style	2020-04-06 14:34:19 +10:00
Mikunj	52060ac9fd	Fix avatar and names on Note to self	2020-04-01 14:16:31 +11:00
gmbnt	824bdc6089	Maintain consistent code style	2020-03-27 10:35:44 +11:00
gmbnt	a3d416daa0	Make multi device instructions clearer	2020-03-25 11:36:53 +11:00
gmbnt	16f207b785	Ditch long polling	2020-03-24 13:48:23 +11:00
gmbnt	6246fea83b	Further improve threading	2020-03-24 11:31:01 +11:00
gmbnt	94549724a9	Fix Signal UI coming up in some cases	2020-03-23 10:49:25 +11:00
gmbnt	2357642627	Update for core changes	2020-03-20 13:08:12 +11:00
gmbnt	f8e5bc7ec2	Prevent spam	2020-03-19 14:18:00 +11:00
gmbnt	56d1820356	Notify user of unexpected device link requests	2020-03-19 13:45:55 +11:00
gmbnt	169b566244	Clean	2020-03-17 12:13:12 +11:00
gmbnt	949bfefd81	Clean	2020-03-17 11:43:12 +11:00
gmbnt	8eca046acb	Hack around message status bar bug	2020-03-17 11:02:05 +11:00
gmbnt	e4ab8b87f7	Merge branch 'master' of github.com:loki-project/loki-messenger-android	2020-03-16 16:29:38 +11:00
gmbnt	11237d2009	Merge pull request #138 from loki-project/ui ... Various UI Improvements	2020-03-16 15:35:56 +11:00
gmbnt	cae76a2f66	Add home screen gradient	2020-03-16 15:35:14 +11:00
gmbnt	f94bf6301b	Allow user to tap as well	2020-03-16 15:05:01 +11:00
gmbnt	83feb26225	Fix clipping	2020-03-16 15:05:01 +11:00
Niels Andriesse	f6a8cd93da	Implement new conversation button redesign	2020-03-16 15:04:29 +11:00
Niels Andriesse	e129999d66	Add comment	2020-03-13 14:26:54 +11:00
Mikunj Varsani	8079b5da51	Clean	2020-03-13 13:49:39 +11:00
Mikunj Varsani	a256f59231	Fix potential crash caused by getting a Recipient asynchronously.	2020-03-13 11:14:43 +11:00
Mikunj Varsani	449a53ea32	Fix QR code handler not running on UI thread	2020-03-13 10:56:25 +11:00
Mikunj Varsani	983b137cd6	Handle IndexOutOfBoundsError on QR Code scanning	2020-03-13 10:49:36 +11:00
Mikunj Varsani	a30d90ed29	Fix joining public chat crashing.	2020-03-13 10:24:50 +11:00
Mikunj Varsani	e484a95fcb	Remove DirectoryRefresh. ... This was causing crashes on some devices and it's used for accessing contacts on a device which we don't need.	2020-03-13 09:46:28 +11:00
Niels Andriesse	f96eebde20	Rename variables	2020-03-12 16:03:21 +11:00
Mikunj Varsani	49be17b969	Fix reply showing up in RSS feed notifications.	2020-03-12 12:05:08 +11:00
Niels Andriesse	8ff4688de1	Handle new closed group screen empty state	2020-03-12 11:16:07 +11:00
Mikunj Varsani	152ddf013b	Clean up.	2020-03-12 10:49:35 +11:00
Niels Andriesse	c4d302e3ac	Fix group conversation layout	2020-03-12 10:49:17 +11:00
Mikunj Varsani	996f233d25	Enable quick reply	2020-03-12 10:42:08 +11:00
Mikunj Varsani	d694cfa68a	Differentiate Signal actions from Signal actions	2020-03-12 09:52:42 +11:00
Mikunj Varsani	34ef29a645	Remove account authenticator. ... Remove unused listeners.	2020-03-12 09:23:39 +11:00
Niels Andriesse	32193e4efd	Increase background polling interval	2020-03-10 16:44:08 +11:00
capturethefire	148b363393	Update privacy policy links ... Fixes loki-project/session-android#131	2020-03-08 22:01:34 +01:00
gmbnt	0c194301bc	Merge pull request #127 from loki-project/error-reporting ... Improved Error Reporting	2020-03-06 10:34:57 +11:00
Niels Andriesse	5a6b65e188	Clean	2020-03-06 10:34:10 +11:00
Niels Andriesse	a272677fba	Clean	2020-03-05 16:22:45 +11:00
Niels Andriesse	8c6b60aa08	Clean & handle media message errors	2020-03-05 16:14:14 +11:00
Niels Andriesse	a20ccd659a	Clean	2020-03-05 14:24:10 +11:00
Niels Andriesse	44fd72dfac	Merge branch 'dev' into version	2020-03-05 14:15:05 +11:00
Niels Andriesse	652201958a	Propagate Loki API related errors	2020-03-05 14:07:42 +11:00
Niels Andriesse	eb77b7d56b	Remove unneeded code	2020-03-05 09:30:55 +11:00
Niels Andriesse	4dd882ea52	Remove unneeded code	2020-03-05 09:27:39 +11:00
Ryan ZHAO	2fdd9bfe3e	fix syncing contacts and closed groups after device linking	2020-03-03 14:29:40 +11:00
Niels Andriesse	597b7f157c	Move file	2020-02-28 09:04:57 +07:00
Niels Andriesse	fb9567a61b	Merge branch 'dev' into open-group-syncing	2020-02-28 08:56:37 +07:00
Mikunj	3cdaf80c5d	Removed all references to google play and firebase. ... Removed phone number utils. Slowly remove signal code.	2020-02-28 09:07:01 +11:00
gmbnt	19356bf969	Merge pull request #116 from loki-project/threading-fix ... Fix device linking blocking the main promise thread.	2020-02-27 19:38:40 +07:00
Mikunj	a57bf0cd98	Remove un-used permissions.	2020-02-27 15:44:57 +11:00
Mikunj	dd0b9c80b0	Fix device linking blocking the main promise thread.	2020-02-26 16:56:07 +11:00
Mikunj	85b2379510	Fix race condition that occurs on device link authorisation. ... Upon authorisation, we upload our mapping to the server. At the same time we also get a contact sync message and send out background friend request messages. There was a race condition between those 2 functions where to correctly establish multi-device communication, you need your mapping on the server so that the other party knows that it's a secondary device and not a regular user.	2020-02-26 11:53:28 +11:00
Mikunj	efef42a6f6	Added version string at the bottom of settings.	2020-02-25 14:04:15 +11:00
Mikunj	7b267ee8b7	Fix isSignalGroup boolean check. ... Set thread deletion delay to 1s for private chats and open groups.	2020-02-25 13:11:06 +11:00
Mikunj	55523b3baf	Added open group syncing. ... Refactor open group adding code.	2020-02-25 12:46:23 +11:00
Niels Andriesse	b9307d4cb9	Untie profile picture from auth token	2020-02-24 10:57:51 +07:00
Niels Andriesse	704c15cd24	Enforce style convention	2020-02-21 11:35:53 +07:00
Niels Andriesse	f46354392c	Merge branch 'dev' into group-leaving	2020-02-21 11:22:24 +07:00
Niels Andriesse	5b822f83c9	Enforce style convention	2020-02-21 11:19:20 +07:00
Mikunj	1ce7050f1a	Leave group on swiping	2020-02-19 16:19:16 +11:00
Mikunj	3a0c518eeb	Don't fetch device links at startup	2020-02-18 14:00:05 +11:00
Mikunj	70bd9350b8	Ensure generated PreKeyBundle is valid	2020-02-18 12:28:49 +11:00
Mikunj	7f51baadd4	Sync groups upon linking device.	2020-02-18 09:19:52 +11:00
Niels Andriesse	526e82a9e3	Clean up naming & indentation	2020-02-16 09:30:05 +11:00
Mikunj	3bbcbc8873	Updated to follow LokiSessionResetProtocol. ... Refactor some code to be less confusing.	2020-02-14 13:34:35 +11:00
Niels Andriesse	bcc219bd1f	Debug	2020-02-13 16:05:40 +11:00
Niels Andriesse	b9dd42beb1	Make unlinking & open group joining more robust	2020-02-13 15:33:54 +11:00
Niels Andriesse	07b1ffa77e	Refactor multi device	2020-02-13 14:39:29 +11:00
Niels Andriesse	9c71a4c3cd	Simplify PushDecryptJob a bit	2020-02-13 10:18:05 +11:00
Niels Andriesse	27fdfe4ee8	Trim unused files	2020-02-13 09:28:19 +11:00
Niels Andriesse	31350adcf7	Clean	2020-02-12 16:42:33 +11:00
Niels Andriesse	45d78825a0	Clean	2020-02-12 16:25:14 +11:00
Niels Andriesse	c47ecad024	Handle clock out of sync issue	2020-02-12 14:44:23 +11:00
Niels Andriesse	705b3dc625	Refactor	2020-02-12 13:27:28 +11:00
Niels Andriesse	b1cbbf2940	Fix copy	2020-02-11 14:02:01 +11:00
Niels Andriesse	2fbe33736c	Reduce background polling interval	2020-02-11 11:37:06 +11:00
Niels Andriesse	18ee21355c	Clean	2020-02-11 11:36:31 +11:00
Niels Andriesse	73c33ff096	Merge branch 'master' into dev	2020-02-11 11:27:04 +11:00
gmbnt	324bf35e83	Merge pull request #81 from RyanRory/pn-fix ... PN fix	2020-02-11 11:25:14 +11:00
Niels Andriesse	cb1553631e	Implement file size limit	2020-02-11 11:00:00 +11:00
Ryan ZHAO	2aafce5f4c	apply the changes to MultipleRecipientNotification and refactor some code	2020-02-11 10:50:24 +11:00
Niels Andriesse	b5792a81aa	Update for core changes	2020-02-11 09:38:05 +11:00
Niels Andriesse	24df781259	Enable the user to join an open group without entering "https://"	2020-02-10 13:40:12 +11:00
Ryan ZHAO	3710be72fd	"Clicking on message notifications doesn't mark the messages as read" fixed	2020-02-07 15:39:44 +11:00
Ryan ZHAO	ea0ba98722	Display username in notifications instead of public keys fixed	2020-02-07 15:13:12 +11:00
gmbnt	06dae527a6	Merge pull request #78 from RyanRory/delete-thread-ui-fix ... fix the issue that the cell is not showing after swiped out	2020-02-07 14:27:46 +11:00
Ryan ZHAO	df1814800a	fix the issue that the cell is not showing after swiped out	2020-02-07 11:34:28 +11:00
Niels Andriesse	8c17efd981	Update legal copy & URLs	2020-02-07 11:32:00 +11:00
Niels Andriesse	d84b0611c5	Don't show Session Public Chat suggestion sheet	2020-02-06 16:12:50 +11:00
Niels Andriesse	b84724409f	Fix Session Public Chat profile picture	2020-02-06 11:58:30 +11:00
Niels Andriesse	abae6ddb12	Fix notification bug	2020-02-06 10:02:13 +11:00
Niels Andriesse	f38b7a30a0	Implement open group suggestion sheet	2020-02-05 11:29:45 +11:00
Niels Andriesse	c50b599ea5	Remove Crashlytics	2020-02-05 10:39:35 +11:00
Niels Andriesse	7036706485	Debug	2020-02-05 10:36:26 +11:00
Niels Andriesse	1fb7081fa2	Fix open group message sending	2020-02-05 10:08:57 +11:00
Mikunj	a1e98bae75	Fix crash.	2020-02-04 14:52:25 +11:00
Niels Andriesse	b74506ea24	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev	2020-02-04 14:31:50 +11:00
Niels Andriesse	2945390842	Quick fix closed group UI issues	2020-02-04 14:31:44 +11:00
gmbnt	58b0d002f1	Merge pull request #72 from RyanRory/sealed-sender-modification ... fix friend request with sealed sender	2020-02-04 14:26:16 +11:00
Ryan ZHAO	8ce13c855c	fix friend request with sealed sender	2020-02-04 14:22:01 +11:00
Niels Andriesse	3e5c6126a3	Debug	2020-02-04 14:20:42 +11:00
Niels Andriesse	155c7f2b12	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into private-group-chat	2020-02-04 13:23:23 +11:00
Niels Andriesse	079779f15a	Rename Loki Messenger Updates → Session Updates	2020-02-04 13:07:54 +11:00
Mikunj	5183a76575	Minor bug fixes	2020-02-04 12:58:34 +11:00
Mikunj	db9f26d9df	Map text & media group messages from secondary deivces to their primary device	2020-02-04 11:46:50 +11:00
Mikunj	cc369f5c52	Fix message syncing in group chats	2020-02-04 10:09:32 +11:00
Niels Andriesse	621ff9c6e3	Remove Signal request	2020-02-04 09:53:10 +11:00
Mikunj	f7b2312f99	Merge commit '1ec1717c9984593b6b31c672bfe467ece002abb5' into private-group-chat	2020-02-04 08:31:50 +11:00
Mikunj	9d0f40a18f	Allow leaving from a secondary device.	2020-02-04 08:31:38 +11:00
Niels Andriesse	1ec1717c99	Fix typo	2020-02-03 21:08:09 +11:00
Niels Andriesse	8233be77e9	Merge branch 'closed-groups-ui' of github.com:loki-project/loki-messenger-android into private-group-chat	2020-02-03 21:02:00 +11:00
Mikunj	a61f9b4eb7	Don't set friend request on messages to ourselves	2020-02-03 16:00:05 +11:00
Mikunj	44a0a428f5	Don't send a friend request message to a group.	2020-02-03 13:53:58 +11:00
Mikunj	60aa7f6ae3	Fix friend request accept message showing up in group chats. ... Fix crash.	2020-02-03 12:08:11 +11:00
Mikunj	353f456ae2	Accept session request if it was sent by a member of our group or if it was sent by one of our friends.	2020-02-03 10:52:15 +11:00
Mikunj	d5420de0b7	Hookup group creation to activity	2020-02-03 10:23:24 +11:00
Mikunj	ea28bd2e6f	Merge branch 'closed-groups-ui' into private-group-chat	2020-02-03 08:46:18 +11:00
Niels Andriesse	0b2986a8a9	Add link preview, GIF & open group metadata warnings	2020-02-01 15:12:06 +11:00
Niels Andriesse	e9842b2626	Disable link previews by default	2020-02-01 09:00:29 +11:00
Niels Andriesse	c783b221d5	Fix profile picture loading bug	2020-02-01 08:59:53 +11:00
Niels Andriesse	1e788b337f	Clean	2020-02-01 07:58:32 +11:00
Niels Andriesse	67cc92d983	Remove Mixpanel	2020-01-31 16:18:03 +11:00
Mikunj	a7ea2f01a2	Don't use envelope to determine friend request	2020-01-31 16:15:04 +11:00
Mikunj	73ec256745	Merge branch 'dev' into private-group-chat	2020-01-31 15:33:59 +11:00
Mikunj	81b4259dab	Merge branch 'dev' into private-group-chat	2020-01-31 15:29:31 +11:00
Mikunj	9e7ad2eb76	Merge branch 'dev' into sealed-sender	2020-01-31 14:48:59 +11:00
Mikunj	8aa46aebec	Merge branch 'dev' into sealed-sender	2020-01-31 14:32:30 +11:00
Niels Andriesse	7610314165	Exclude linked devices from group member options	2020-01-31 14:23:53 +11:00
Mikunj	76c2fdf9d2	Added rss feed proxy	2020-01-31 14:09:11 +11:00
Niels Andriesse	998d03b258	Implement create closed group screen	2020-01-31 13:57:24 +11:00
Niels Andriesse	d7f1b86615	Remove legacy code	2020-01-31 12:50:25 +11:00
Mikunj	5fa6e5a75c	Enable sealed sender by default	2020-01-30 10:07:29 +11:00
Mikunj	62d391085b	Stop relying on SignalServiceEnvelope and instead use SignalServiceContent to determine message sender and friend request	2020-01-30 10:07:29 +11:00
Mikunj	01f5ff7c86	Fix up build gradle.	2020-01-30 10:07:29 +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	2ea009b05b	Clean	2020-01-28 10:52:06 +11:00
Niels Andriesse	e3c54c21d1	Merge branch 'dev' into session-restore	2020-01-28 10:36:46 +11:00
gmbnt	299d81f4dc	Merge pull request #63 from loki-project/proxy ... Snode proxy	2020-01-28 10:19:07 +11:00
Niels Andriesse	438b33d355	Clean	2020-01-28 10:18:18 +11:00
Niels Andriesse	460f25629b	Don't show seed reminder after restoring from seed	2020-01-28 09:30:26 +11:00
Niels Andriesse	25cd9e6cc7	Clean	2020-01-24 10:00:20 +11:00
Niels Andriesse	93e1cd7756	Fix public chat deletion	2020-01-24 09:59:37 +11:00
Niels Andriesse	5bcf7940a0	Fix copy	2020-01-23 16:48:03 +11:00
Niels Andriesse	9b01282f61	Clean	2020-01-23 10:25:22 +11:00
Mikunj	f7197ca1de	Update how swarms are stored in the database.	2020-01-23 10:14:41 +11:00
Niels Andriesse	1e014a690f	Clean	2020-01-22 15:28:39 +11:00
Niels Andriesse	d0225bdffb	Fix notification display name	2020-01-22 15:11:14 +11:00
Niels Andriesse	67eee3ddea	Fix notification display name	2020-01-22 13:43:18 +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	5891f19996	Fix push notification bug	2020-01-21 10:10:36 +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	a5aeacda63	Fix QR code sharing	2020-01-17 14:33:55 +11:00
Niels Andriesse	6fccd873db	Don't invert QR codes	2020-01-17 14:24:33 +11:00
Niels Andriesse	5c8bbc161b	Fix layout bug	2020-01-17 14:06:35 +11:00
Niels Andriesse	9efa528377	Fix device linking	2020-01-17 12:53:32 +11:00
Niels Andriesse	e95e39fdc9	Partially fix device linking	2020-01-17 11:38:30 +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	362256dc94	Fix crashes	2020-01-17 09:33:31 +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	eda21064a4	Implement mute UI	2020-01-16 11:48:49 +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	7424684c75	Implement linked devices screen redesign	2020-01-09 15:52:40 +11:00
Niels Andriesse	38f3c3cff6	Fix crash	2020-01-09 14:19:21 +11:00
Niels Andriesse	a55d5b9263	Implement detailed settings screen redesign	2020-01-09 14:15:43 +11:00
Niels Andriesse	8a5307000b	Update app icon & implement recovery phrase screen	2020-01-09 11:35:43 +11:00
Niels Andriesse	df61cbb30d	Partially implement device linking redesign & fix copy	2020-01-08 15:16:34 +11:00
Niels Andriesse	7da4f1f6ae	Fix conversation deletion & public chat joining	2020-01-08 10:50:11 +11:00
Niels Andriesse	fb3bd26538	WIP	2020-01-07 16:44:53 +11:00
Niels Andriesse	b80d70c31f	Implement clear all data dialog redesign	2020-01-07 16:11:02 +11:00
Niels Andriesse	7f1359c6d3	Implement seed dialog redesign	2020-01-07 15:59:18 +11:00
Niels Andriesse	15b4c6aacc	Implement profile picture editing	2020-01-07 14:51:11 +11:00
Niels Andriesse	fd14d66d4f	Implement display name editing	2020-01-07 12:00:30 +11:00
Niels Andriesse	9dee062976	Clean	2020-01-07 10:52:50 +11:00
Niels Andriesse	23770f79a9	Fix QR code sharing	2020-01-07 09:35:14 +11:00
Niels Andriesse	7f0cda3b75	WIP	2020-01-06 16:43:47 +11:00
Niels Andriesse	b56d19e865	Implement QR code screen redesign	2020-01-06 16:05:57 +11:00
Niels Andriesse	c76335150c	Implement settings screen redesign	2020-01-06 14:26:52 +11:00
Niels Andriesse	1616e841da	Customize main toolbar	2020-01-06 12:07:55 +11:00
Niels Andriesse	ed20a96ed0	Fix profile picture view	2020-01-06 10:18:43 +11:00
Niels Andriesse	9f4f0d4f4b	WIP	2019-12-19 16:10:11 +01:00
Niels Andriesse	c3f1e6d72a	Clean	2019-12-19 12:04:38 +01:00
Niels Andriesse	4bfb51e6e2	Fix updating	2019-12-19 11:49:23 +01:00
Niels Andriesse	ded709a58b	Hook up home screen logic	2019-12-19 11:15:58 +01:00
Niels Andriesse	95dc4e6590	Implement join public chat screen redesign	2019-12-18 15:25:23 +01:00
Niels Andriesse	6dbe9b0ca9	Hook up new private chat screen redesign logic	2019-12-18 14:31:12 +01:00
Niels Andriesse	bb976a4bff	Implement new private chat screen redesign	2019-12-18 11:36:09 +01:00
Niels Andriesse	f8737c3f81	Clean	2019-12-17 16:58:50 +01:00
Niels Andriesse	5c2b33bfdc	Implement profile picture view	2019-12-17 16:24:42 +01:00
Niels Andriesse	a2776cde0f	Partially hook up home screen logic	2019-12-17 15:15:13 +01:00
Niels Andriesse	a10c056ac5	Implement rough home screen redesign	2019-12-17 14:27:59 +01:00
Niels Andriesse	d4db46aeca	Hook up onboarding logic	2019-12-17 10:04:08 +01:00
Niels Andriesse	f42e69388e	Clean	2019-12-16 21:13:10 +01:00
Niels Andriesse	8b640251b7	Polish	2019-12-16 17:09:10 +01:00
Niels Andriesse	3a91280b40	Implement fake chat view	2019-12-16 16:20:48 +01:00
Niels Andriesse	e46e1b2dd9	Implement rough onboarding redesign	2019-12-16 11:43:08 +01:00
Mikunj	c19733e04a	Disable insecure sms option	2019-12-16 09:17:31 +11:00
Mikunj	93a9f4c1dc	Handle SessionRequest messages.	2019-12-13 16:04:24 +11:00
Mikunj	538cd39d00	Send group messages to members and their secondary devices.	2019-12-13 12:23:06 +11:00
Mikunj	b6d2717286	Added admins to groups. ... Only process group updates if an admin sent it.	2019-12-13 11:04:37 +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	97cde203ca	minor fix	2019-12-11 15:14:29 +11:00
Mikunj	338149b7a4	Clean up my code.	2019-12-09 13:55:54 +11:00
Mikunj	3d574be931	Clean. ... Removed recipient cache as signal already had that. Removed message cache as it messes with the ui (public chat conversations pop in with all the messages)	2019-12-09 13:52:21 +11:00
Mikunj	151e97c82e	Clean	2019-12-09 11:50:22 +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	ba93fdd649	Only show one session reset prompt at a time	2019-12-05 13:18:33 +11:00
Mikunj	e285ede03d	Ignore friend request messages before restoration,	2019-12-05 12:10:29 +11:00
Mikunj	12e07bc5bb	Merge branch 'dev' into performance	2019-12-04 13:34:54 +11:00
Mikunj	fdba9023fc	Fix minor crash.	2019-12-04 13:33:05 +11:00
Mikunj	5e5309d07e	Trigger session reset if we got a new friend request from one of our friends.	2019-12-04 12:44:34 +11:00
ryanzhao	66d87533d3	add cache for Addresses and Messages. ... make multiple insertion into one transaction.	2019-12-04 11:28:12 +11:00
Mikunj	a5bf5c0f5d	Set profile picture upon joining a public chat.	2019-12-03 15:05:43 +11:00
Niels Andriesse	b5709473d7	Fix crash	2019-12-03 15:03:13 +11:00
Niels Andriesse	5a8f0dda9d	Merge branch 'profile-avatar-setting' of github.com:loki-project/loki-messenger-android into profile-avatar-setting	2019-12-02 15:03:20 +11:00
Niels Andriesse	f8464a1462	Fix up UI	2019-12-02 15:03:12 +11:00
Mikunj	00856857d7	Fix avatar downloads on public chats.	2019-12-02 15:02:31 +11:00
Mikunj	b4a81bf937	Update create table command because it might exist already.	2019-12-02 13:29:12 +11:00
Mikunj	f92506b7bb	Only upload avatar if there was a change.	2019-11-28 15:53:41 +11:00
Mikunj	280d866df3	Public chat avatar handling. ... Fix note to self.	2019-11-28 15:26:02 +11:00
Mikunj	0cefac1bce	Clean	2019-11-28 11:19:39 +11:00
Mikunj	bef1e5c469	Fix note to self icon not showing correctly.	2019-11-28 11:13:18 +11:00
Mikunj	6e7b21e8b4	Multi-device profile avatar.	2019-11-28 10:51:27 +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
Mikunj	88234c26a3	Fix icon in notification.	2019-11-27 13:17:31 +11:00
Mikunj	5038dec3d1	Fix up profile picture display.	2019-11-27 13:17:31 +11:00
Mikunj	ee00241515	Rotate profile key on every new upload. ... Only fetch profile if avatar if profile key changed.	2019-11-27 13:17:31 +11:00
Mikunj	7b842d2c1c	Added profile downloading.	2019-11-27 13:17:31 +11:00
Mikunj	06f75859fa	Removed custom profile avatar url table since signal already has an existing one. ... Clean	2019-11-27 13:17:31 +11:00
ryanzhao	5a4b619c9d	try to store avatar url locally	2019-11-27 13:17:31 +11:00
Mikunj	439d39e380	Add cache for master secret. This will stop unnecessary database calls.	2019-11-27 13:17:16 +11:00
Mikunj	826142a07b	Move loki db writes to background so that decrypt thread doesn't get blocked.	2019-11-27 12:47:53 +11:00
Mikunj	050849d302	Wrapped envelope handing code inside a try-catch.	2019-11-22 15:53:46 +11:00
Mikunj	c25e0fded9	Add timeout to blocking promises. ... Don't prematurely store PreKeyBundle from a pairing authorisation. Don't re-create ids needed for pre-key generation	2019-11-22 15:42:03 +11:00
Mikunj	b650ee6ebc	Added QR code scanning.	2019-11-22 12:53:47 +11:00
Mikunj	27c8b45ae3	Show device unlink message on startup.	2019-11-22 10:43:22 +11:00
Mikunj	733ab06e70	Clear database on unpair.	2019-11-22 10:02:02 +11:00
Mikunj	f753dd1ea9	Added a way to clear database.	2019-11-21 16:31:01 +11:00
Mikunj	76ce008063	forgot to use lokiv4 in previous code	2019-11-21 15:37:19 +11:00
Mikunj	3a79e1f215	Handle unpair request flag.	2019-11-21 12:43:33 +11:00
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
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
Niels Andriesse	8ccfa77ef6	Fix threading	2019-11-18 16:35:57 +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
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