Commit Graph

6427 Commits

Author SHA1 Message Date
Niels Andriesse
0da74c52ac
Merge pull request #447 from hjubb/add_job_factory_key_check
fix: filter jobs that can be executed with the current factories
2021-02-18 10:28:35 +11:00
jubb
6db86eb958 fix: filter jobs that can be executed with the current factories 2021-02-18 10:10:27 +11:00
Ryan ZHAO
c69a8bc15f clean 2021-02-17 16:42:53 +11:00
Ryan ZHAO
64352707d0 clean up close group update message in new message pipeline 2021-02-17 16:31:43 +11:00
Ryan ZHAO
20ec889730 clean up V1 closed group 2021-02-17 16:09:36 +11:00
Ryan ZHAO
fde45f755b minor fix 2021-02-17 13:43:56 +11:00
Ryan ZHAO
7a17b5769a clean up V1 multi device 2021-02-17 12:27:00 +11:00
Ryan ZHAO
37cb4cd28c Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-17 11:53:29 +11:00
nielsandriesse
32902d5bc8 Update build number 2021-02-17 11:39:36 +11:00
nielsandriesse
362e24f98c Fix DB migration 2021-02-17 11:36:56 +11:00
nielsandriesse
d6379c4d58 Update build number 2021-02-17 11:31:20 +11:00
nielsandriesse
7f4603a1ba Fix DB migration 2021-02-17 11:30:37 +11:00
nielsandriesse
f725d903a4 Update version number 2021-02-17 11:09:41 +11:00
nielsandriesse
5226947e0a Fix DB migration 2021-02-17 11:08:57 +11:00
Ryan ZHAO
3285975b1a WIP: clean up V1 multi device 2021-02-17 10:51:02 +11:00
Ryan ZHAO
a61d968771 Merge branch 'dev' of https://github.com/loki-project/session-android into multi_device_refactor 2021-02-17 09:25:51 +11:00
Ryan ZHAO
c5cc191ff3 Merge branch 'dev' of https://github.com/loki-project/session-android into refactor_clean_0 2021-02-17 09:25:07 +11:00
Niels Andriesse
995764d8a2
Merge pull request #444 from hjubb/fix_group_leave_multi
fix: non-admin self-leave now handled correctly
2021-02-16 17:36:47 +11:00
Jubb
1996cc82e2 fix: non-admin self-leave now handled correctly 2021-02-16 17:28:33 +11:00
Ryan ZHAO
75ed938807 Merge branch 'dev' of https://github.com/loki-project/session-android into multi_device_refactor 2021-02-16 15:24:37 +11:00
Ryan ZHAO
b517555a45 timestamp & duplicated message 2021-02-16 15:24:21 +11:00
Ryan ZHAO
e14b5b9f33 minor fix 2021-02-16 11:48:25 +11:00
nielsandriesse
add7150d83 Update version number 2021-02-16 11:34:43 +11:00
Ryan ZHAO
a9e6479624 Merge branch 'dev' of https://github.com/loki-project/session-android into multi_device_refactor 2021-02-16 11:28:01 +11:00
Niels Andriesse
c72c87d698
Merge pull request #441 from hjubb/testing_multi_merge
Testing multi merge
2021-02-16 11:20:02 +11:00
Ryan ZHAO
c6084b0172 replace group create at timestamp with formation timestamp 2021-02-16 11:14:27 +11:00
Ryan ZHAO
f7463caf10 clean 2021-02-16 10:37:48 +11:00
Ryan ZHAO
6dfa882803 minor refactoring 2021-02-16 10:31:26 +11:00
Ryan ZHAO
f6455253a0 send latest encryption key pair 2021-02-16 10:28:24 +11:00
Ryan ZHAO
a7764ed5c9 Merge branch 'testing_multi_merge' of https://github.com/hjubb/session-android into multi_device_refactor 2021-02-16 09:26:55 +11:00
Jubb
9f60a3ca36 fix: other users treated as quit 2021-02-15 17:42:31 +11:00
Jubb
9ccfb4702d fix: self leave group is treated as QUIT instead of UPDATE 2021-02-15 17:41:10 +11:00
Jubb
a63fce4ca6 fix: self-send messages now send to yourself only and aren't treated as sync messages 2021-02-15 17:35:56 +11:00
Jubb
a44a79e59f fix: messages now filter properly for explicit group update messages 2021-02-15 16:38:50 +11:00
Jubb
069719d568 fix: re-add sync message send to self 2021-02-15 12:27:01 +11:00
Jubb
8476e090e2 fix: handle pendingKeyPair.getOrElse nullable after checking if key exists 2021-02-15 12:08:08 +11:00
Jubb
93f7d428cb fix: add in the encryption key send from current / pending for groupID in handleMembersAdded if admin and change pendingKeyPair implementation to keyed on groupPublicKey 2021-02-15 12:05:04 +11:00
jubb
83d107cbce fix: compare serialized to serialized 2021-02-12 14:28:25 +11:00
jubb
2a50a09614 feat: share pending key pair between generate EC and add members 2021-02-12 14:16:06 +11:00
jubb
b6951f09b4 feat: use cached keypair 2021-02-11 18:58:38 +11:00
Ryan ZHAO
a5447e77e7 WIP closed group fix 2021-02-11 16:57:43 +11:00
jubb
6a8e0ae195 feat: use new explicit groups 2021-02-11 16:34:01 +11:00
Ryan ZHAO
5dadb89225 WIP: received message timestamps 2021-02-11 16:09:59 +11:00
Ryan ZHAO
5cbbf92fb9 sync target of multi device for refactored sending & receiving pipeline 2021-02-11 15:00:27 +11:00
jubb
05fef11889 fix: non-compatible handle messages requiring timestamp 2021-02-11 14:20:12 +11:00
jubb
5a892b2932 Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
#	libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java
2021-02-11 14:12:22 +11:00
jubb
34fab9681c fix: closed groups info messages work now 2021-02-11 14:01:31 +11:00
Ryan ZHAO
c8e3cc15c5 Merge branch 'refactor' of https://github.com/oxen-io/session-android into multi_device_refactor 2021-02-11 09:52:25 +11:00
Ryan ZHAO
b2884c84e9 Merge branch 'refactor' of https://github.com/oxen-io/session-android into multi_device 2021-02-11 09:51:43 +11:00
Niels Andriesse
4bd3b2b192
Merge pull request #437 from Brice-W/missing-translations
ban labels added in FR + Invite of settings menu added in translation…
2021-02-11 09:42:44 +11:00