3154 Commits

Author	SHA1	Message	Date
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	203348b8fb	Update device mappings on the file server upon receiving a pairing confirmation.	2019-09-24 16:06:19 +10:00
Mikunj Varsani	8acc0bcff9	Auto accept friend requests if we're friends with the primary device.	2019-09-24 15:02:23 +10:00
Mikunj Varsani	d51c62ecaf	Moved LokiMultiDeviceDatabase into LokiAPIDatabase.	2019-09-24 13:33:42 +10:00
Mikunj	90ee676a53	Hookup receiving logic.	2019-09-23 15:38:00 +10:00
Mikunj	901d627d32	Linked storage api and database.	2019-09-23 11:28:17 +10:00
Niels Andriesse	c1c374407f	Improve performance	2019-09-19 15:00:52 +10:00
Niels Andriesse	3a257d745b	Debug	2019-09-19 14:06:54 +10:00
Mikunj	ff65d4e342	Added Database.	2019-09-19 12:52:37 +10:00
Niels Andriesse	96dadbaaa8	Handle media message friend requests	2019-09-18 17:33:34 +10:00
Niels Andriesse	14508971ed	Fix app preview UI	2019-09-18 15:40:18 +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	8a16fd2a97	Only record crashes in release mode	2019-09-18 13:56:50 +10:00
Niels Andriesse	cad37f29e7	Fix link previews	2019-09-18 12:13:02 +10:00
Niels Andriesse	9b2a90639d	Switch onboarding seed step and display name step	2019-09-18 11:57:46 +10:00
Niels Andriesse	88dbeddb04	Set LokiGroupChatAPI.isDebugMode as needed	2019-09-18 11:38:08 +10:00
Niels Andriesse	a8460b3aac	Fix build	2019-09-18 10:04:36 +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	df36d5e539	Handle case where GIF fetch fails	2019-09-17 10:36:34 +10:00
Mikunj	e5d82b325d	Fix GIFs	2019-09-17 09:57:23 +10:00
Niels Andriesse	bdb950373a	Partially implement GIFs	2019-09-16 16:11:07 +10:00
Mikunj	3dba87198a	Fix messages infinitely sending. ... This was because signal infinitely tries to send message on network errors. Since we already have retrying built into the loki api we just disable this behaviour and set a cap of 3 on PushSendJobs incase.	2019-09-13 11:56:36 +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
Niels Andriesse	7cf543bdf8	Fix typo	2019-09-12 12:06:45 +10:00
Niels Andriesse	cbb7f9827c	Include public key with display names	2019-09-12 11:52:03 +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	f3dc4f51e1	Fix group chat quote display name	2019-09-11 16:36:02 +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
Mikunj	aa560b60a9	Stop pollers once leaving group chats.	2019-09-11 09:29:29 +10:00
Mikunj	a683c3fa90	Disable notification triggers on group messages.	2019-09-11 09:29:29 +10:00
Mikunj	c738f810b5	Fix constant group update notifications being shown	2019-09-11 09:29:29 +10:00
Mikunj	9d8de789d7	Fixed link preview messages not being deleted in group chats.	2019-09-11 09:29:29 +10:00
Niels Andriesse	f209784648	Fix QR code UI issue	2019-09-10 16:12:16 +10:00
gmbnt	0948156ddf	Merge pull request #21 from loki-project/profile-icons ... Jazz Icons	2019-09-10 13:51:18 +10:00
Niels Andriesse	fd389a637a	Clean	2019-09-10 13:50:59 +10:00
Niels Andriesse	1859a22419	Debug	2019-09-10 11:09:31 +10:00
Niels Andriesse	01945c16b7	Fix link previews for group conversations	2019-09-10 10:27:45 +10:00
Niels Andriesse	fc2f70cb85	Hide link preview cancel button	2019-09-10 09:56:53 +10:00
Niels Andriesse	869c06e71a	Clean	2019-09-10 09:52:43 +10:00
Niels Andriesse	e109df7525	Implement link previews for group conversations	2019-09-09 16:31:28 +10:00
Niels Andriesse	9d76b8bdf7	Clean	2019-09-09 16:04:06 +10:00
Niels Andriesse	66c2e0d448	Debug	2019-09-09 16:02:25 +10:00
Niels Andriesse	50ab79673a	Clean up link preview UI	2019-09-09 15:04:29 +10:00
Niels Andriesse	d1c1083751	Refactor	2019-09-09 14:30:02 +10:00
Niels Andriesse	1d5a31aae4	Implement link previews for regular conversations	2019-09-09 13:53:23 +10:00
Mikunj	7c6c551b32	Fix order of execution.	2019-09-09 13:20:59 +10:00
Mikunj	842be4378a	Show correct names on public chats.	2019-09-09 13:01:54 +10:00
Mikunj	7ff27b572f	Fix identicons for public chats	2019-09-09 13:01:54 +10:00
Mikunj	e054740ce0	Disable identicon generation for groups.	2019-09-09 13:01:54 +10:00
Mikunj	9e3a6ce977	Added Identicon	2019-09-09 13:01:54 +10:00
Niels Andriesse	387f99cd94	Fix link preview image rendering	2019-09-09 10:49:20 +10:00
Niels Andriesse	83742a0fc2	Set up Crashlytics	2019-09-06 14:00:36 +10:00
Niels Andriesse	6341ca0101	Add basic events	2019-09-05 09:38:36 +10:00
Niels Andriesse	e346a45d99	Set up Mixpanel	2019-09-04 16:44:19 +10:00
Niels Andriesse	b72e5c4c6a	Fix group chat restoration	2019-09-04 11:11:48 +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	f4bcb285af	Integrate group chat moderation API	2019-09-02 16:42:08 +10:00
Niels Andriesse	7273eb2774	Switch to new group chat message deletion endpoint	2019-08-30 17:08:46 +10:00
Niels Andriesse	c5428d7267	Clean up lock screen UI	2019-08-30 10:24:39 +10:00
Niels Andriesse	754e73e241	Fix crash	2019-08-29 10:21:23 +10:00
Niels Andriesse	517d4e94c5	Clean	2019-08-28 16:07:20 +10:00
Niels Andriesse	68ca131d22	Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev	2019-08-28 15:17:54 +10:00
Niels Andriesse	386b219076	Disable input bar for RSS feeds	2019-08-28 15:17:43 +10:00
Niels Andriesse	2f7e4e2bd2	Fix RSS feed URL formatting	2019-08-28 14:39:14 +10:00
Niels Andriesse	85373e7643	Implement RSS feeds	2019-08-28 14:19:08 +10:00
Niels Andriesse	f6c1a3ef9c	Update for core changes	2019-08-28 12:09:05 +10:00
Niels Andriesse	fb8104cd18	Lower deletion polling interval	2019-08-27 12:25:09 +10:00
Niels Andriesse	1ce8268445	Add missing database migration	2019-08-26 15:58:31 +10:00
Niels Andriesse	0c4ea32269	Debug	2019-08-26 15:32:02 +10:00
Niels Andriesse	a2a74fddcd	Keep track of first message ID	2019-08-26 13:55:45 +10:00
Niels Andriesse	c5e4a2255c	Update for core changes	2019-08-26 13:24:49 +10:00
Niels Andriesse	3f24f8753a	Poll for deleted group chat messages	2019-08-26 13:04:12 +10:00
gmbnt	42dec85884	Merge pull request #12 from loki-project/group-chat ... Public chat auth	2019-08-23 16:58:02 +10:00
Niels Andriesse	a3a3c379e0	Clean	2019-08-23 16:57:26 +10:00
Mikunj	51646c98c8	Added database to store public chat tokens.	2019-08-23 16:09:05 +10:00
Niels Andriesse	3ae087bb88	Fix copy	2019-08-23 15:15:32 +10:00
Niels Andriesse	d831274920	Clean	2019-08-23 13:22:52 +10:00
Niels Andriesse	5d34314a00	Implement QR code scanning	2019-08-23 11:46:28 +10:00
Niels Andriesse	f3377fe384	Add show QR code button to settings	2019-08-23 11:00:07 +10:00
Niels Andriesse	67b7a1d8c2	Disable typing indicators in group chats	2019-08-23 09:41:35 +10:00
Niels Andriesse	88403024eb	Clean	2019-08-21 14:53:14 +10:00
Niels Andriesse	43f34b259b	Fix LokiGroupChatPoller bug	2019-08-21 11:04:05 +10:00
Niels Andriesse	313acacedf	Guard against invalid seeds	2019-08-21 09:50:03 +10:00
Niels Andriesse	feb6cfdecb	Fix ANR	2019-08-19 16:33:56 +10:00
Niels Andriesse	ae54c641a9	Update for seed changes	2019-08-19 15:34:21 +10:00
Niels Andriesse	24a03cd5bc	Disable notifications for group chats	2019-08-19 11:08:56 +10:00
Niels Andriesse	e093655ea3	Fix message ordering	2019-08-19 10:40:40 +10:00
Niels Andriesse	a3cb8eb969	Re-enable group chats	2019-08-19 10:37:17 +10:00
Niels Andriesse	342bd797b8	Fix identicon crash	2019-08-19 09:21:18 +10:00
Niels Andriesse	21fc47d7bf	Prepare for release	2019-08-09 14:00:54 +10:00
Niels Andriesse	8a6559b1fe	Disable group updates for now	2019-08-09 13:43:55 +10:00
Niels Andriesse	67889489e9	Fix missing message body	2019-08-09 13:03:41 +10:00
Niels Andriesse	eb9537f1c1	Make group chats a bit more future proof	2019-08-09 12:00:01 +10:00
Niels Andriesse	717a28a446	Fix missing message ID & update for core changes	2019-08-09 10:11:30 +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	5936c16c47	Debug merge issues	2019-08-08 11:29:40 +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	6144d6cad2	Lower background polling interval	2019-08-07 14:57:24 +10:00
Niels Andriesse	6d13b49ed1	Copy public key to clipboard on settings header long press	2019-08-07 12:40:33 +10:00
Niels Andriesse	a5a6631fb5	Quick fix quoting issue	2019-08-07 12:13:14 +10:00
Niels Andriesse	7602b973a9	Show loader while accept friend request message is sending	2019-08-07 12:00:12 +10:00
Niels Andriesse	f2ddc2a235	Disable unused permissions	2019-08-07 09:42:12 +10:00
Niels Andriesse	8962487ad9	Reduce group chat poll interval	2019-08-06 16:26:11 +10:00
Niels Andriesse	9e4b70058c	Actively poll public chat group if the app is in the foreground	2019-08-06 16:18:24 +10:00
Niels Andriesse	149d4b0181	Disable unwanted menu options	2019-08-06 15:43:47 +10:00
Niels Andriesse	6eea8c9aa4	Merge branch 'master' into dev	2019-08-06 14:28:52 +10:00
Niels Andriesse	90056fe670	Disable experience upgrade prompts	2019-08-06 13:20:45 +10:00
Niels Andriesse	8ad0069fec	Fix group message UI	2019-08-06 10:22:05 +10:00
Niels Andriesse	3a5f5a9a41	Fix ratcheting bug	2019-08-06 09:46:43 +10:00
Niels Andriesse	93b7472e25	WIP	2019-08-05 16:32:05 +10:00
Niels Andriesse	787b74ad1f	Set up public chat as needed	2019-08-05 13:26:30 +10:00
Niels Andriesse	8caaee7b43	Catch key pair restoration errors	2019-08-01 09:26:06 +10:00
Niels Andriesse	fcb5cbb74d	Fix threading issue	2019-07-26 16:16:40 +10:00
Niels Andriesse	97b25507d2	Partially fix background message issue	2019-07-26 15:17:12 +10:00
Niels Andriesse	a7b49d2ce5	Revert back to old background message strategy	2019-07-26 12:20:55 +10:00
Niels Andriesse	a3a757c3ef	Disable quick reply for now	2019-07-25 10:40:57 +10:00
Niels Andriesse	7598830a1b	Fix quote messages & friend request handling	2019-07-24 15:05:39 +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	fe16a90741	Clean up splash screen	2019-07-24 10:09:02 +10:00
Niels Andriesse	1b7a04ab50	Update notification & app switcher icon	2019-07-24 09:51:09 +10:00
Niels Andriesse	a925b17419	Fix session handling	2019-07-23 16:02:25 +10:00
Niels Andriesse	ecd60b8723	Clean	2019-07-22 16:46:03 +10:00
Niels Andriesse	6d521e4227	Send session reset request acknowledgement if needed	2019-07-22 16:22:40 +10:00
Niels Andriesse	9be8d75773	Refactor	2019-07-22 15:11:38 +10:00
Niels Andriesse	06e8d20da4	Refactor	2019-07-22 14:25:59 +10:00
Niels Andriesse	a767c84f74	Fix remaining UI issues	2019-07-22 14:05:51 +10:00
Niels Andriesse	1da6f20f18	Further Lokify UI	2019-07-22 13:08:56 +10:00
Mikunj	b71293fb11	Merge branch 'master' of https://github.com/loki-project/loki-messenger-android	2019-07-22 12:34:15 +10:00
Mikunj	16ddfc37ce	Finalise session reset.	2019-07-22 12:34:10 +10:00
Niels Andriesse	210a88ce02	Use identicons as profile pictures	2019-07-22 12:13:53 +10:00
Mikunj	fce57f46a0	More session reset.	2019-07-22 12:09:34 +10:00
Niels Andriesse	1d2e8072a0	Fix build	2019-07-22 11:27:24 +10:00
Niels Andriesse	d6cf9b573e	Use Signal's job framework for background polling	2019-07-22 11:22:42 +10:00
Niels Andriesse	19cdf8068d	Fix build	2019-07-22 10:41:50 +10:00
Mikunj	61622fbd3d	Session reset handling.	2019-07-22 09:38:12 +10:00
Mikunj	e626e09a45	Send PreKeyBundle with an EndSession message.	2019-07-22 08:30:28 +10:00
Niels Andriesse	2329e9d03d	Implement BackgroundPollWorker	2019-07-19 16:46:04 +10:00
Niels Andriesse	8651f20c9b	Further Lokify UI	2019-07-19 15:59:51 +10:00
Niels Andriesse	c0a9500706	Observe display name changes	2019-07-19 15:23:45 +10:00
Niels Andriesse	956f20fc0e	Use display name	2019-07-19 15:02:47 +10:00
Niels Andriesse	acae76161d	Parse display name from messages	2019-07-19 14:15:51 +10:00
Niels Andriesse	244d4fd899	Fix friend request accepted preview	2019-07-19 13:23:19 +10:00
Niels Andriesse	8c054a060e	Block input if a friend request is pending	2019-07-19 13:15:17 +10:00
Niels Andriesse	b123948230	Exclude empty messages from conversations	2019-07-19 10:17:34 +10:00
Niels Andriesse	3a8d509c1e	Further Lokify UI	2019-07-18 15:59:41 +10:00
Niels Andriesse	424998a8ee	Implement restore from seed logic	2019-07-17 11:31:19 +10:00
Niels Andriesse	659d9e6a8f	Implement restore from seed UI	2019-07-17 10:26:06 +10:00
Niels Andriesse	bac4b86ec3	Further Lokify settings UI	2019-07-17 09:45:20 +10:00
Niels Andriesse	ab99874ede	Partially Lokify UI	2019-07-16 17:09:15 +10:00
Niels Andriesse	862288abfd	Clean	2019-07-15 15:06:52 +10:00
Niels Andriesse	208ac71bfe	Update for core changes	2019-07-15 13:19:58 +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	52a0b2a5e8	Clean	2019-06-28 14:07:42 +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	232faba39f	Fix message delivery	2019-06-27 14:07:13 +10:00
Niels Andriesse	dd67e59807	Fix pre key usage	2019-06-26 14:31:38 +10:00
Niels Andriesse	e7f7c3cdb2	Hook up message receiver	2019-06-25 13:51:24 +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	169a7e609e	Propagate message ID	2019-06-24 16:00:15 +10:00
Niels Andriesse	a3d23e55a1	Update for core changes	2019-06-24 14:57:53 +10:00
Niels Andriesse	1023227744	Remove unnecessary friend request status update	2019-06-24 14:26:06 +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	5c4ef59c0b	Fix UI issue	2019-06-21 15:29:25 +10:00
Niels Andriesse	f6542b9834	Further build out friend request view	2019-06-21 14:18:38 +10:00
Niels Andriesse	7c501980fa	Implement friend request view skeleton	2019-06-21 12:21:48 +10:00
Niels Andriesse	a1b6eaf3f5	Refactor	2019-06-21 10:39:05 +10:00
Niels Andriesse	bd00013f02	Hide keyboard before going to key pair screen	2019-06-20 14:25:38 +10:00
Niels Andriesse	3afd8b8b7f	Fix database issues	2019-06-19 15:45:40 +10:00
Niels Andriesse	26ba7fb387	Update for core changes	2019-06-19 14:47:42 +10:00
Niels Andriesse	ab68ae2e58	Group Loki logic together in ApplicationContext	2019-06-18 13:23:58 +10:00
Mikunj	6928bfa2ae	Added long polling	2019-06-18 12:49:21 +10:00
Niels Andriesse	fc4ea70621	Update for core changes	2019-06-18 10:53:03 +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
Mikunj	d7bb828d67	Added database which maps sms to loki friend request.	2019-06-17 11:14:42 +10:00
Niels Andriesse	8e16bee431	Update for core changes	2019-06-12 11:41:50 +10:00
Niels Andriesse	69ecb19654	Update for core changes	2019-06-11 16:27:00 +10:00
Niels Andriesse	021bf1b33c	Clean	2019-06-11 14:41:04 +10:00
Niels Andriesse	66010f4755	Fix pre key refreshing & add TODO	2019-06-11 13:41:16 +10:00
Niels Andriesse	c47be74f0d	Fix crash & undo debugging setup	2019-06-11 09:46:42 +10:00
Niels Andriesse	c8cc22e8fe	WIP	2019-06-07 15:21:25 +10:00
Niels Andriesse	becce74cc8	Fix messed up database layout	2019-06-07 14:19:58 +10:00
Niels Andriesse	25e0213d4b	Fix blocked conversation screen	2019-06-07 13:54:50 +10:00
Niels Andriesse	f22be7262b	Hook up conversation screen	2019-06-07 13:27:48 +10:00
Niels Andriesse	0349978321	Merge branch 'master' of github.com:loki-project/loki-messenger-android	2019-06-06 15:01:36 +10:00
Niels Andriesse	b4328d1aa3	Create UI path to new conversation screen	2019-06-06 15:01:06 +10:00
Mikunj	75a8123d1e	Send friend request accept message back to the user.	2019-06-06 10:39:24 +10:00
Niels Andriesse	858b34306b	Share actual public key	2019-06-06 10:04:43 +10:00
Niels Andriesse	32e02d1f0d	Merge branch 'master' of github.com:loki-project/loki-messenger-android	2019-06-06 09:52:35 +10:00
Niels Andriesse	ed025fcc4b	Disable reminders	2019-06-06 09:51:54 +10:00
Mikunj	89d5c4d0f1	Generate PreKeyBundle if we're sending a friend request.	2019-06-06 09:48:02 +10:00
Niels Andriesse	7d24ab12a2	Implement share public key button	2019-06-05 16:45:12 +10:00
Niels Andriesse	bb180ff2d5	Fix build	2019-06-05 16:30:31 +10:00
Niels Andriesse	57825d58b5	Remove unnecessary getter and setter	2019-06-05 16:24:15 +10:00
Niels Andriesse	79927be0c0	Fix name updating	2019-06-05 16:20:11 +10:00
Niels Andriesse	167e65d67d	Merge branch 'master' of github.com:loki-project/loki-messenger-android	2019-06-05 16:05:24 +10:00
Niels Andriesse	e36d9e110c	Add copy mnemonic button	2019-06-05 16:05:08 +10:00
Mikunj	7d33a9cc8f	Always send a friend request if we're not friends. ... Pass down isFriendRequest to message sender.	2019-06-05 15:53:10 +10:00
Niels Andriesse	2c35ed2177	Fix ugly spacing	2019-06-05 15:49:15 +10:00
Niels Andriesse	eae5e90814	Fix remaining registration issues	2019-06-05 15:33:31 +10:00
Niels Andriesse	3c2504418d	Add missing registration logic	2019-06-05 14:56:10 +10:00
Niels Andriesse	3609517ff0	Merge branch 'master' of github.com:loki-project/loki-messenger-android	2019-06-05 13:34:18 +10:00
Niels Andriesse	1498a2e382	WIP	2019-06-05 13:33:54 +10:00
Mikunj	46af1aacbb	Fix incorrect sql statement.	2019-06-05 13:24:33 +10:00