Ryan ZHAO
|
2c85fbf91b
|
Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout
|
2021-04-29 14:59:37 +10:00 |
|
Niels Andriesse
|
43c484e35f
|
Clean
|
2021-04-29 13:41:43 +10:00 |
|
Ryan ZHAO
|
b23144cb1a
|
Merge branch 'dev' of https://github.com/oxen-io/session-android into screenlock-timeout
|
2021-04-29 13:23:16 +10:00 |
|
Ryan ZHAO
|
4508510958
|
fix for API 21
|
2021-04-29 13:23:02 +10:00 |
|
Niels Andriesse
|
f727244342
|
Merge pull request #514 from oxen-io/refactoring
Minor Refactoring
|
2021-04-29 10:11:02 +10:00 |
|
Niels Andriesse
|
a822c74ecc
|
Use global Kovenant config
|
2021-04-29 10:10:41 +10:00 |
|
Niels Andriesse
|
761c12addd
|
Clean
|
2021-04-29 10:02:07 +10:00 |
|
jubb
|
d05da5c447
|
Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls
# Conflicts:
# app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
# app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
# libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
|
2021-04-29 09:39:33 +10:00 |
|
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 |
|
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 |
|
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
|
96cc867512
|
fix: BackgroundPollWorker.kt new instance instead of null instance
|
2021-04-26 15:55:13 +10:00 |
|
jubb
|
572f262b6d
|
fix: don't update the profiles if the values are empty
|
2021-04-26 15:18:12 +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 |
|
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
|
bc66c45bca
|
Clean
|
2021-04-26 10:26: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 |
|
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 |
|
Brice-W
|
0653b2c2d3
|
only admin can delete members
|
2021-04-21 16:34:22 +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 |
|
Brice-W
|
99fa7eb767
|
added specific UpdateMessageData.King types
|
2021-04-21 12:00:25 +10:00 |
|
Brice-W
|
7aa1f30c98
|
fix
|
2021-04-20 17:07:21 +10:00 |
|
Ryan ZHAO
|
1e40c861d1
|
make screenlock work within 60s
|
2021-04-20 17:02:14 +10:00 |
|
Brice-W
|
3bfef2d0cd
|
e UpdateMessageBuilder to generate data extraction message
|
2021-04-20 16:55:46 +10:00 |
|
Brice-W
|
66e811ed75
|
Merge branch 'specific-group-updates' into data-extraction-2
|
2021-04-20 15:42:04 +10:00 |
|
Brice-W
|
f9de34f947
|
comment
|
2021-04-20 09:45:29 +10:00 |
|
Brice-W
|
10554011f8
|
avoid displaying self in the contacts list
|
2021-04-20 09:39:51 +10:00 |
|
Brice-W
|
be2692fec6
|
clean
|
2021-04-19 13:37:34 +10:00 |
|
Brice-W
|
b92f2e7904
|
clean
|
2021-04-19 13:36:42 +10:00 |
|
Brice-W
|
cba4e65b9e
|
update with payload logic
|
2021-04-19 13:35:09 +10:00 |
|
Brice-W
|
3c210ca437
|
optimization on contacts selection
|
2021-04-19 10:46:19 +10:00 |
|
Brice-W
|
2b7cf7c1b4
|
added Kind sealed class in UpdateMessageData + minor fixes
|
2021-04-16 15:54:39 +10:00 |
|
Brice-W
|
c8f42d3b8e
|
Merge branch 'dev' of https://github.com/loki-project/session-android into data-extraction-2
|
2021-04-16 09:11:01 +10:00 |
|
Brice-W
|
2a1dfff8c4
|
translations added
|
2021-04-15 16:33:40 +10:00 |
|
Brice-W
|
abb1db7a7e
|
new approach in update saving
|
2021-04-15 14:41:29 +10:00 |
|
Brice-W
|
418363fdea
|
Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates
|
2021-04-14 16:37:57 +10:00 |
|
Brice-W
|
9cdcdc43a6
|
redesign of group update messages management
|
2021-04-14 16:37:04 +10:00 |
|
nielsandriesse
|
5bcac3b39c
|
Update version number
|
2021-04-14 10:51:21 +10:00 |
|
nielsandriesse
|
2d42d22df4
|
Don't close cursor prematurely
|
2021-04-14 10:49:19 +10:00 |
|
nielsandriesse
|
d1f00b6d77
|
Don't run local backup jobs for now
|
2021-04-14 10:04:25 +10:00 |
|