4592 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
gmbnt	7116f2502a	Merge pull request #31 from loki-project/multi-device ... Multi Device Support	2019-10-08 14:29:51 +11:00
Niels Andriesse	ac9c9f534e	Somewhat simplify device linking UI	2019-10-08 14:28:30 +11:00
Niels Andriesse	a44c3fcd57	Clean	2019-10-08 14:10:16 +11:00
Niels Andriesse	bf958fffe1	Partially disable settings for slave devices	2019-10-08 12:17:25 +11:00
Niels Andriesse	d0e5ddfe3f	WIP	2019-10-08 10:43:09 +11:00
Niels Andriesse	a6441005ea	Merge branch 'multi-device' of github.com:loki-project/loki-messenger-android into multi-device	2019-10-08 10:39:05 +11:00
Niels Andriesse	95695ff88e	Clean up seed step	2019-10-08 10:38:22 +11:00
Mikunj	98498a66aa	Fix receiving multiple of the same authorisations at once causing us to delete prekeybundles for the user.	2019-10-08 10:11:46 +11:00
Niels Andriesse	79ec4553aa	Clean	2019-10-07 16:53:26 +11:00
Niels Andriesse	c8a90ced19	Add missing event	2019-10-07 16:22:13 +11:00
Niels Andriesse	742d9bfa46	Partially implement feedback	2019-10-07 16:15:06 +11:00
Niels Andriesse	19ec4db687	Update for core changes	2019-10-07 15:30:20 +11:00
Mikunj	4f46c6317b	Renaming.	2019-10-07 13:28:53 +11:00
Mikunj	dbd8133926	Merge branch 'dev' into multi-device-integration ... # Conflicts: # src/org/thoughtcrime/securesms/loki/SeedActivity.kt	2019-10-07 12:21:04 +11:00
Mikunj	a2e9271050	Hide link device preference if we're a secondary device.	2019-10-07 12:19:08 +11:00
Niels Andriesse	53a32cf418	Add missing event	2019-10-07 11:16:02 +11:00
Niels Andriesse	33798c6a17	Match iOS analytics	2019-10-07 10:52:59 +11:00
Mikunj	da67bfab4c	Multi-device sending typing and receipt messages.	2019-10-07 10:32:45 +11:00
Mikunj	0bfa3c33c7	Multi-device sending media message	2019-10-07 10:14:38 +11:00
Niels Andriesse	4f58bc11a1	Update for new username API	2019-10-07 10:06:19 +11:00
Mikunj	8a3b4a6a14	Refactor.	2019-10-07 09:44:43 +11:00
Mikunj	fb3967db55	Multi-device sending text messages.	2019-10-04 16:29:51 +10:00
Mikunj	8e495d087b	Fix bugs in multi device pairing.	2019-10-03 16:02:22 +10:00
Mikunj	be9afa243c	Fix auto accept friend request logic.	2019-10-03 10:05:50 +10:00
Mikunj	be55e1bb55	Fixed multi device database primary key allocation.	2019-10-02 16:26:03 +10:00
Mikunj	e07d8ddb52	Fix ui not being dismissed on message send failure. ... Fix prekey bundle not being sent with the device pairing request.	2019-10-02 15:28:36 +10:00
Mikunj	72059328b3	Show toast if message sending failed. ... Added resetting	2019-10-02 13:15:25 +10:00
Mikunj	373b9b38f6	Moved pairing logic into dialog. ... Refactor.	2019-10-02 10:24:08 +10:00
Mikunj	80e9b8223a	Hooked up dialog ui	2019-10-01 15:35:52 +10:00
Mikunj	258ad57c12	Merge branch 'dev' into multi-device-integration	2019-10-01 14:44:16 +10:00
Niels Andriesse	9f7437aa9e	Implement device linking dialog	2019-10-01 12:21:38 +10:00
Niels Andriesse	d8e86a5e42	WIP	2019-09-30 16:41:53 +10:00
Niels Andriesse	e77ee30c9b	Implement device linking dialog skeleton	2019-09-30 16:22:12 +10:00
Niels Andriesse	0f6a7e88b6	Match iOS design changes	2019-09-30 15:38:07 +10:00
Niels Andriesse	132b59347a	Fix build	2019-09-30 14:21:21 +10:00
Mikunj	dde4ee6e36	Merge branch 'dev' into multi-device-integration	2019-09-30 12:21:04 +10:00
Mikunj Varsani	c546df0227	Merge pull request #30 from loki-project/public-chat-fix ... Public chat message signing	2019-09-30 12:19:32 +10: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
Mikunj	53ae775af8	Update LokiMessageDatabase.	2019-09-26 13:44:57 +10:00
Mikunj	10c1a9cced	Added linking in the ui.	2019-09-26 11:19:36 +10:00
Mikunj	7d1883cfd2	Trigger event when authorisation is accepted.	2019-09-26 10:04:21 +10:00
Mikunj	0b49d7ae0d	Fix crashing during start.	2019-09-25 15:08:01 +10:00
Mikunj Varsani	4af63f780c	Merge commit 'ed9c3ae692ae3e436e0fbb1b12cb8d6662fcda5f' into multi-device-integration	2019-09-24 16:08:32 +10:00
Mikunj Varsani	203348b8fb	Update device mappings on the file server upon receiving a pairing confirmation.	2019-09-24 16:06:19 +10:00