Commit graph

536 commits

Author SHA1 Message Date
Niels Andriesse 8f2f1a47fd
Merge branch 'ui' into ui 2021-06-29 13:37:11 +10:00
Niels Andriesse 9f4571b0c1 Implement remaining menu actions 2021-06-29 13:26:33 +10:00
jubb 09f4cfb1ad feat: add back overflow text, increase AttachmentDownloadJob.kt max failure count, resize overflow text size, remove unused animator update listener implementation in ThumbnailProgressBar.kt 2021-06-29 11:22:59 +10:00
Niels Andriesse 18e345733e Implement a few basic contextual actions 2021-06-28 16:28:00 +10:00
Niels Andriesse 123cd6d486 Handle text only quote drafts 2021-06-18 15:54:24 +10:00
Niels Andriesse 2188200717 Merge branch 'dev' into ui 2021-06-16 10:19:52 +10:00
Niels Andriesse 71ffaaabc2 Add documentation 2021-06-16 10:19:42 +10:00
Brice-W 1b6ab36a03 fix 2021-06-15 16:47:35 +10:00
Brice-W 7b22d14a2c using different timestamp for NEW group updates 2021-06-15 16:16:03 +10:00
Brice-W 47c989ab2e Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update 2021-06-15 11:21:55 +10:00
Niels Andriesse ed6db6f4e7 Merge branch 'dev' into ui 2021-06-11 13:41:50 +10:00
Niels Andriesse f4ae16239e Clean 2021-06-11 11:27:15 +10:00
Brice-W b8efe73a3b update formation timestamp when group is rejoined after being left 2021-06-10 17:34:48 +10:00
Brice-W 3b03aef80f handle expiration timer with NEW group update type 2021-06-09 14:31:05 +10:00
Brice-W 14d401b27a fix 2021-06-07 14:46:54 +10:00
nielsandriesse d465fecf4c Populate conversation menu 2021-06-07 09:48:01 +10:00
nielsandriesse 3bf5a50439 Fix readability issues & simplify code 2021-06-04 16:32:19 +10:00
Brice-W 1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
Brice-W 6fb461f7d8 reset zombie members list if group already exists 2021-06-04 11:24:01 +10:00
Brice-W 1a117b0189 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-06-03 11:51:57 +10:00
nielsandriesse dfd9bd89f9 Fix colors 2021-06-02 13:03:22 +10:00
nielsandriesse d8ba01cf5d Clean up join open group screen 2021-06-02 10:51:36 +10:00
nielsandriesse 15d864cd2a Update documentation 2021-06-02 09:38:22 +10:00
Harris 2bdb4d18a2 fix: property name for json deserialisation 2021-05-31 14:24:43 +10:00
nielsandriesse e1f3362c2a Fix crash 2021-05-31 13:13:25 +10:00
nielsandriesse f872c2b9be Prepare for OGS timestamp handling changes 2021-05-31 11:23:37 +10:00
ryanzhao e8c52961aa minor fix 2021-05-28 15:14:05 +10:00
ryanzhao 4f7d26d86e debug for new encryption 2021-05-28 12:04:37 +10:00
ryanzhao a81c17057f Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-28 11:22:58 +10:00
ryanzhao 497405fe50 clean 2021-05-28 11:22:46 +10:00
ryanzhao c0d4dd741c debug 2021-05-28 11:22:06 +10:00
nielsandriesse e16322977b Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2021-05-28 11:01:41 +10:00
nielsandriesse c6976ca3cd Fix naming confusion 2021-05-28 11:00:49 +10:00
Harris 4a8ce784b8 fix: no longer using the wrong deletion IDs for open group deletions 2021-05-28 10:50:07 +10:00
Ryan ZHAO a66d2c97e0 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 16:52:12 +10:00
Ryan ZHAO 592825dcc6 implement get session id from ons name api 2021-05-27 16:23:15 +10:00
Niels Andriesse 2441d86b32 Make member ordering consistent 2021-05-27 16:07:54 +10:00
jubb 72569327a9 Merge remote-tracking branch 'upstream/dev' into improve_background_jobs 2021-05-27 15:45:07 +10:00
Ryan ZHAO 0e89d88459 Merge branch 'dev' of https://github.com/oxen-io/session-android into ONS-name-1 2021-05-27 15:32:00 +10:00
Niels Andriesse 85120b57ea Batch conversation updates 2021-05-27 15:05:15 +10:00
ryanzhao ae23266058 wip: implement ons name 2021-05-26 16:34:08 +10:00
jubb efa36d4cea refactor: trim thread is now queued after batch processing messages, for other conversations still after every persisted message
migrate TrimThreadJob.kt to new job system

deleting more open group references in removal

open group last message / last deletion now sets after processing vs after fetching
2021-05-26 15:22:19 +10:00
Brice-W 365ccda113 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-05-25 16:15:51 +10:00
Brice-W 5eaef76b02 don't update zombie members if current user is removed 2021-05-25 15:45:43 +10:00
Niels Andriesse abf2c05424 Debug closed group creation issue 2021-05-25 10:56:29 +10:00
Niels Andriesse 5d9957a57d Fix merge 2021-05-24 16:21:24 +10:00
Niels Andriesse ba116df195
Merge pull request #554 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam Part 2
2021-05-24 16:14:25 +10:00
Niels Andriesse 550d8b61c7 Quick fix crash 2021-05-24 15:31:46 +10:00
ryanzhao 25df4330be Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-24 14:49:56 +10:00
Niels Andriesse c058b332da Fix typo 2021-05-24 14:14:09 +10:00