Commit Graph

673 Commits

Author SHA1 Message Date
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
dfce9d636a Update build number 2021-05-24 16:10:51 +10:00
Niels Andriesse
e674e40959 Experimental performance improvement 2021-05-24 16:10:27 +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
5353e124df Update translations 2021-05-24 14:46:28 +10:00
Niels Andriesse
2a0a5a2326 Fix case 2021-05-24 14:33:10 +10:00
Niels Andriesse
08a2295f16
Merge pull request #562 from hjubb/pubkey_validation_on_open_group
Validate Public Key When Adding Open Group
2021-05-24 14:32:18 +10:00
jubb
4f84b976c5 fix: return error early if the public key is not expected length or format with an appropriate message 2021-05-24 14:01:20 +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
95657195e6 Update build number 2021-05-24 13:24:35 +10:00
Brice-W
2969d4b161 clean 2021-05-24 13:14:37 +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
f64fb68e96
Merge branch 'dev' into fix_hardcoded_strings 2021-05-24 12:52:10 +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
04b62df83c Make user details bottom sheet look better 2021-05-24 11:08:08 +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
051dbbfef9 Update version number 2021-05-24 08:54:38 +10:00
jubb
7c7ace9ecd refactor: extract hardcoded strings
allows fix for #529
2021-05-21 16:49:06 +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
Niels Andriesse
01b86fcc2f Merge branch 'dev' of github.com:oxen-io/session-android into dev 2021-05-21 15:10:49 +10:00
Niels Andriesse
a4a11e8e5e Fix indentation 2021-05-21 15:09:50 +10:00
Niels Andriesse
6302b5d65c
Merge pull request #553 from Brice-W/profile-picture-fix
Fix Home Screen Profile Picture Refreshing
2021-05-21 15:09:18 +10:00
Niels Andriesse
49c3ffd9ca Remove redundant code 2021-05-21 15:02:34 +10:00
Ryan ZHAO
953f6d8c17 Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-21 14:55:15 +10:00
Ryan ZHAO
d52787a661 try to use jobs to mark if all open groups are caught up 2021-05-21 14:55:06 +10:00
Brice-W
c90ab52cdf clean 2021-05-21 13:36:21 +10:00
Brice-W
05535983e2 clean 2021-05-21 13:34:44 +10:00
Brice-W
b58e4427dd fix profile picture not updated on home UI 2021-05-21 13:24:49 +10:00
Niels Andriesse
ff96bb05a8 Implement remaining bits and pieces 2021-05-21 11:09:03 +10:00
Niels Andriesse
da331b036e Integrate new closed group poller 2021-05-21 10:30:02 +10:00
Niels Andriesse
6829895995 Handle Kryo version incompatibility 2021-05-21 09:08:16 +10:00
Niels Andriesse
b0f564672b Update build number 2021-05-21 09:04:32 +10:00
Niels Andriesse
79e76ef46b Update build number 2021-05-20 15:56:01 +10:00
Niels Andriesse
31b5cfb4e0
Merge pull request #548 from RyanRory/fix-open-group-spam
Fix Open Group Notification Spam
2021-05-20 15:50:49 +10:00
Niels Andriesse
8e9deba756
Merge pull request #549 from hjubb/fix_deleting_necessary_empty_threads
Don't Auto-Delete Empty Open Groups
2021-05-20 15:50:37 +10:00
Niels Andriesse
b9a7531f58 Clean 2021-05-20 15:44:30 +10:00
jubb
1cc0b0ee7d refactor: don't delete empty threads if they're open groups 2021-05-20 15:43:29 +10:00
Ryan ZHAO
5c39a09d8e Merge branch 'dev' of https://github.com/oxen-io/session-android into fix-open-group-spam 2021-05-20 15:41:25 +10:00
Ryan ZHAO
6822bc461c new approach for batch notification 2021-05-20 15:41:17 +10:00