TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,992 Commits 46 Branches 892 Tags 481 MiB
e8dd7cd768
Commit Graph

4992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Andriesse
e8dd7cd768 Merge branch 'master' into dev 2020-02-26 10:02:21 +07:00
gmbnt
665f123d97
Merge pull request #114 from loki-project/bug-fix 
Fix race condition that occurs on device link authorisation.
 2020-02-26 10:00:22 +07:00
Mikunj
85b2379510 Fix race condition that occurs on device link authorisation. 
Upon authorisation, we upload our mapping to the server.
At the same time we also get a contact sync message and send out background friend request messages.
There was a race condition between those 2 functions where to correctly establish multi-device communication, you need your mapping on the server so that the other party knows that it's a secondary device and not a regular user.
 2020-02-26 11:53:28 +11:00
Niels Andriesse
c3ab7e0d12 Update version number 2020-02-25 09:30:23 +07:00
gmbnt
ef2ceff0c1
Merge pull request #111 from loki-project/security 
Untie Profile Picture from Auth Token
 2020-02-24 10:58:28 +07:00
Niels Andriesse
b9307d4cb9 Untie profile picture from auth token 2020-02-24 10:57:51 +07:00
gmbnt
c1404d7cca
Merge pull request #106 from loki-project/group-leaving 
Group leaving
 2020-02-21 15:36:22 +11:00
Niels Andriesse
704c15cd24 Enforce style convention 2020-02-21 11:35:53 +07:00
Niels Andriesse
f46354392c Merge branch 'dev' into group-leaving 2020-02-21 11:22:24 +07:00
gmbnt
b6d22ae2dc
Merge pull request #101 from loki-project/closed-group-sync 
Closed group sync
 2020-02-21 15:20:16 +11:00
Niels Andriesse
5b822f83c9 Enforce style convention 2020-02-21 11:19:20 +07:00
Mikunj
1ce7050f1a Leave group on swiping 2020-02-19 16:19:16 +11:00
Mikunj
3a0c518eeb Don't fetch device links at startup 2020-02-18 14:00:05 +11:00
Mikunj
70bd9350b8 Ensure generated PreKeyBundle is valid 2020-02-18 12:28:49 +11:00
Mikunj
7f51baadd4 Sync groups upon linking device. 2020-02-18 09:19:52 +11:00
gmbnt
f73f62ef59
Update README.md 2020-02-17 16:57:03 +11:00
Niels Andriesse
68785fe44f Merge branch 'dev' 2020-02-17 16:55:48 +11:00
Niels Andriesse
c0def596fb Update version number 2020-02-17 16:47:49 +11:00
Niels Andriesse
526e82a9e3 Clean up naming & indentation 2020-02-16 09:30:05 +11:00
gmbnt
c171a906a6
Merge pull request #93 from loki-project/session-reset-fix 
Session reset fixes.
 2020-02-14 14:46:00 +11:00
Mikunj
3bbcbc8873 Updated to follow LokiSessionResetProtocol. 
Refactor some code to be less confusing.
 2020-02-14 13:34:35 +11:00
Niels Andriesse
bcc219bd1f Debug 2020-02-13 16:05:40 +11:00
Niels Andriesse
b9dd42beb1 Make unlinking & open group joining more robust 2020-02-13 15:33:54 +11:00
Niels Andriesse
07b1ffa77e Refactor multi device 2020-02-13 14:39:29 +11:00
Kee Jefferys
42e221ca6e
Update README.md 2020-02-13 14:32:43 +11:00
Niels Andriesse
9c71a4c3cd Simplify PushDecryptJob a bit 2020-02-13 10:18:05 +11:00
Niels Andriesse
27fdfe4ee8 Trim unused files 2020-02-13 09:28:19 +11:00
Niels Andriesse
31350adcf7 Clean 2020-02-12 16:42:33 +11:00
Niels Andriesse
45d78825a0 Clean 2020-02-12 16:25:14 +11:00
gmbnt
24116bc7cb
Merge pull request #91 from loki-project/robustness 
Handle Clock Out of Sync Issue
 2020-02-12 15:14:01 +11:00
Niels Andriesse
c47ecad024 Handle clock out of sync issue 2020-02-12 14:44:23 +11:00
gmbnt
fc2a7bb5a9
Merge pull request #90 from loki-project/robustness 
Refactor
 2020-02-12 13:40:16 +11:00
Niels Andriesse
705b3dc625 Refactor 2020-02-12 13:27:28 +11:00
Niels Andriesse
b1cbbf2940 Fix copy 2020-02-11 14:02:01 +11:00
Niels Andriesse
2fbe33736c Reduce background polling interval 2020-02-11 11:37:06 +11:00
Niels Andriesse
18ee21355c Clean 2020-02-11 11:36:31 +11:00
Niels Andriesse
73c33ff096 Merge branch 'master' into dev 2020-02-11 11:27:04 +11:00
gmbnt
324bf35e83
Merge pull request #81 from RyanRory/pn-fix 
PN fix
 2020-02-11 11:25:14 +11:00
gmbnt
4af78eb3bc
Merge pull request #88 from loki-project/files 
Implement File Size Limit
 2020-02-11 11:03:25 +11:00
Niels Andriesse
cb1553631e Implement file size limit 2020-02-11 11:00:00 +11:00
Ryan ZHAO
2aafce5f4c apply the changes to MultipleRecipientNotification and refactor some code 2020-02-11 10:50:24 +11:00
gmbnt
98d4ee1724
Merge pull request #87 from loki-project/security 
Don't Include an Auth Token with Encrypted File Uploads
 2020-02-11 09:44:06 +11:00
Niels Andriesse
b5792a81aa Update for core changes 2020-02-11 09:38:05 +11:00
gmbnt
f934b3c18b
Merge pull request #86 from loki-project/open-group 
Enable the User to Join an Open Group Without Entering "https://"
 2020-02-11 09:24:29 +11:00
Niels Andriesse
24df781259 Enable the user to join an open group without entering "https://" 2020-02-10 13:40:12 +11:00
Ryan ZHAO
3710be72fd "Clicking on message notifications doesn't mark the messages as read" fixed 2020-02-07 15:39:44 +11:00
Ryan ZHAO
ea0ba98722 Display username in notifications instead of public keys fixed 2020-02-07 15:13:12 +11:00
Niels Andriesse
2ca7e8a5ce Update version number 2020-02-07 14:33:09 +11:00
gmbnt
06dae527a6
Merge pull request #78 from RyanRory/delete-thread-ui-fix 
fix the issue that the cell is not showing after swiped out
 2020-02-07 14:27:46 +11:00
gmbnt
3e4809c05b
Merge pull request #79 from loki-project/copy 
Fix Copy
 2020-02-07 13:02:56 +11:00