Commit Graph

235 Commits

Author SHA1 Message Date
Niels Andriesse
a978253e00 Fix indentation 2019-10-21 15:26:57 +11:00
Mikunj
e438d09a62 Update attachments for public group chats. 2019-10-21 13:49:38 +11:00
Niels Andriesse
cbad885586 Add missing display name update & message fetch 2019-10-15 16:06:38 +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
Mikunj
4657b79179 UI improvements. 2019-10-11 15:38:15 +11:00
Niels Andriesse
0f364fcea7 Render mentions in previews & refactor 2019-10-11 14:41:43 +11:00
Niels Andriesse
48d282a864 Require the user to pick a display name 2019-10-11 13:37:56 +11:00
Mikunj
b676c25930 Add UI 2019-10-11 11:53:53 +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
f0224f8ec6 Debug 2019-10-10 15:30:34 +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
Mikunj
8b92932b6d Added database functionality. 2019-10-10 11:03:51 +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
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
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
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
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
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
0b49d7ae0d Fix crashing during start. 2019-09-25 15:08:01 +10:00
Mikunj Varsani
d51c62ecaf Moved LokiMultiDeviceDatabase into LokiAPIDatabase. 2019-09-24 13:33:42 +10:00
Mikunj
901d627d32 Linked storage api and database. 2019-09-23 11:28:17 +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
cc7f93688f Fix message ordering 2019-09-18 14:43:02 +10:00
Niels Andriesse
9b2a90639d Switch onboarding seed step and display name step 2019-09-18 11:57:46 +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
b67efcf2ab Implement moderator tags 2019-09-12 16:42:52 +10:00
Niels Andriesse
88a5b7a87f Implement quotes in group chats 2019-09-11 15:52:32 +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
01945c16b7 Fix link previews for group conversations 2019-09-10 10:27:45 +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
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
9e3a6ce977 Added Identicon 2019-09-09 13:01:54 +10:00
Niels Andriesse
6341ca0101 Add basic events 2019-09-05 09:38:36 +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
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
754e73e241 Fix crash 2019-08-29 10:21:23 +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
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
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