Harris
51061cac0e
Merge remote-tracking branch 'upstream/dev' into identity_key_encryption
2021-06-08 11:53:38 +10:00
Brice-W
14d401b27a
fix
2021-06-07 14:46:54 +10:00
Harris
91aefb7c87
feat: upgrade to keystore sealed identity key preferences
2021-06-07 11:53:17 +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
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
Niels Andriesse
639146cc0a
Simplify & fix from_server_id usage
2021-05-24 13:48:01 +10:00
Niels Andriesse
716e768dac
Merge branch 'dev' into polling-limit
2021-05-24 13:37:13 +10:00
Niels Andriesse
90dca7149a
Remove redundant this
2021-05-24 13:32:16 +10:00
Brice-W
6c37e7a93f
move logic from Storage to OpenGroupAPIV2
2021-05-24 13:13:07 +10:00
Brice-W
1b25de6a96
Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity
2021-05-24 13:00:02 +10:00
Brice-W
becc3c7278
Merge branch 'dev' of https://github.com/loki-project/session-android into polling-limit-after-inactivity
2021-05-24 12:58:35 +10:00
Niels Andriesse
b5b3f4aebe
Merge pull request #555 from oxen-io/nicknames
...
Nicknames
2021-05-24 12:46:44 +10:00
Niels Andriesse
38f50a6dda
Fix open group display name handling
2021-05-24 12:44:45 +10:00
Brice-W
dbaa51bd9a
implementation of polling limit on open groups
2021-05-24 12:00:17 +10:00
Niels Andriesse
d7afcd07f8
Add contacts migration
2021-05-24 11:35:05 +10:00
Niels Andriesse
e7ae08fe7a
Clean
2021-05-24 10:27:31 +10:00
ryanzhao
b186d4a670
Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam
2021-05-24 09:19:56 +10:00
Niels Andriesse
66e7df22bb
Don't notify for closed group control messages
...
This addresses an issue where:
• someone would create a closed group
• on other peoples' devices this control message would be received through a background poll or a push notification
• the received message timestamps table would be updated
• processing wouldn't be finished (during a background poll or while handling a push notification the system can cut you off at any time)
• some of the added users don't see the new closed group because when they open the app and get the control message from their swarm it's considered a duplicate and isn't processed again
2021-05-24 08:53:27 +10:00
Niels Andriesse
dfd3ccc5d2
Clean
2021-05-21 15:56:38 +10:00
Niels Andriesse
c0f894e1b2
Clean
2021-05-21 15:36:16 +10:00
Niels Andriesse
e0c1456af4
Merge branch 'dev' into nicknames
2021-05-21 15:21:24 +10:00
