Commit Graph

6802 Commits

Author SHA1 Message Date
Brice-W
ab68001b15 clean 2021-04-28 16:00:13 +10:00
ryanzhao
d0d4d9eb6f Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 2021-04-28 15:59:47 +10:00
ryanzhao
01eb7945f6 fix crash 2021-04-28 15:59:30 +10:00
jubb
9d4a2d1505 fix: NPE in highlighting messages for OGv2, deletion and moderation working 2021-04-28 14:46:50 +10:00
Brice-W
54ba848d09 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-28 14:21:16 +10:00
nielsandriesse
97c74bb3dc Fix polling 2021-04-28 14:10:44 +10:00
jubb
7f0962b3d4 Merge branch 'fix_profile_nulls' into open_groups_V2
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
#	app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
#	libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
2021-04-28 13:53:50 +10:00
Brice-W
8806fd0462 Merge branch 'dev' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-28 09:42:02 +10:00
jubb
5d8f036f82 fix: attachment downloads and uploads
enable multi-threaded attachment handling for messages to speed up download/upload and free up message processing queue.

leaving group removes appropriate entries now in threaddb
2021-04-27 17:29:37 +10:00
Niels Andriesse
366276fe20
Merge pull request #503 from oxen-io/hardfork
Update for Hardfork Changes
2021-04-27 14:51:44 +10:00
Niels Andriesse
a14fc0503f Take care of remaining loose ends 2021-04-27 14:48:57 +10:00
Niels Andriesse
e2ad23482d Resolve various loose ends 2021-04-27 14:36:03 +10:00
Niels Andriesse
7150374c94 Clean 2021-04-27 14:26:26 +10:00
jubb
11aed5daff refactor: don't update profile if it is user's at all in visible message handling, leave it to config updates 2021-04-27 09:38:07 +10:00
jubb
d3bd844d82 fix: re-import getLong and turn off optimize imports 2021-04-27 09:18:09 +10:00
Brice-W
d4aaebd0a9 don't show zombie members in group remove updates 2021-04-26 16:33:54 +10:00
jubb
96cc867512 fix: BackgroundPollWorker.kt new instance instead of null instance 2021-04-26 15:55:13 +10:00
jubb
42ca1332ec fix: update prof pic and name and use new profile instead of existing recipient 2021-04-26 15:44:31 +10:00
Brice-W
6a32fabda5 revert change of commit 7c6475d9ee 2021-04-26 15:38:26 +10:00
jubb
572f262b6d fix: don't update the profiles if the values are empty 2021-04-26 15:18:12 +10:00
jubb
4bf0990ef9 feat: open group attachment and message processing 2021-04-26 14:30:51 +10:00
Brice-W
f0394fb908 fix avatar display issues 2021-04-26 14:14:39 +10:00
Niels Andriesse
07fe672f31 Clean 2021-04-26 13:12:05 +10:00
Brice-W
7c6475d9ee EncryptionKeyPair: only set a public key for 1-1 message case 2021-04-26 11:51:11 +10:00
Niels Andriesse
fdede1c656 Clean 2021-04-26 11:39:23 +10:00
Niels Andriesse
69f05dabdf Clean 2021-04-26 11:23:09 +10:00
Niels Andriesse
17e764fc31 Clean 2021-04-26 11:14:45 +10:00
Niels Andriesse
25307068e8 Match iOS protobuf 2021-04-26 11:06:00 +10:00
Niels Andriesse
676c307412 Clean 2021-04-26 10:58:48 +10:00
Niels Andriesse
bc66c45bca Clean 2021-04-26 10:26:31 +10:00
jubb
6272856ef9 feat: syncing / joining / leaving working on open group v2 2021-04-23 17:49:24 +10:00
Brice-W
15707b7060 fix encryption key pair handling 2021-04-23 16:35:24 +10:00
Niels Andriesse
7415c728eb Merge branch 'hardfork' of github.com:oxen-io/session-android into hardfork 2021-04-23 16:11:31 +10:00
Niels Andriesse
979c21ccbf Fix duplicated API 2021-04-23 16:09:47 +10:00
Brice-W
b064f8f5d7 implementation of the zombie members handling logic 2021-04-23 14:07:10 +10:00
Brice-W
3e4a6a9df4 Merge branch 'hardfork' of https://github.com/loki-project/session-android into closed-groups-update 2021-04-23 10:58:14 +10:00
jubb
a4d79ea2d3 feat: join groups logic 2021-04-22 17:26:40 +10:00
Niels Andriesse
f21ad17dd5 Merge branch 'dev' into hardfork 2021-04-22 13:27:09 +10:00
Ryan ZHAO
951e6f6e0c Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout 2021-04-22 09:16:43 +10:00
jubb
f9939aae92 feat: handling default group requests and open group api updates for proper image endpoint handling 2021-04-21 17:00:57 +10:00
Brice-W
0653b2c2d3 only admin can delete members 2021-04-21 16:34:22 +10:00
Brice-W
5c9ddef19b clean proto 2021-04-21 14:45:42 +10:00
Niels Andriesse
9f26436041
Merge pull request #508 from Brice-W/data-extraction-2
Data extraction notifications
2021-04-21 13:44:46 +10:00
Brice-W
d1e276bf08 disable data extraction notification sending 2021-04-21 13:43:29 +10:00
Niels Andriesse
72f9bb8f4b
Merge pull request #506 from Brice-W/group-creation-ui
Improvement to the Group creation UI
2021-04-21 12:47:58 +10:00
Niels Andriesse
bd72971a49
Merge pull request #505 from Brice-W/specific-group-updates
Explicit group updates messages
2021-04-21 12:47:45 +10:00
Brice-W
99fa7eb767 added specific UpdateMessageData.King types 2021-04-21 12:00:25 +10:00
jubb
c601098065 feat: updating android deps 2021-04-20 17:23:02 +10:00
jubb
1e164f8648 feat: adding default group handling to frontend viewmodel 2021-04-20 17:22:36 +10:00
Brice-W
7aa1f30c98 fix 2021-04-20 17:07:21 +10:00