TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,947 Commits 46 Branches 892 Tags 484 MiB
Commit Graph

5947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Chekulaev
4fe6c8acfd Work manager migration code removed. 2020-10-28 15:46:05 +11:00
Anton Chekulaev
577ccfb04a Merge branch 'dev' of https://github.com/loki-project/session-android into background-polling 2020-10-28 15:32:24 +11:00
nielsandriesse
c8f7d788b9 Fix migration issue 1.6.2 2020-10-28 15:04:47 +11:00
Niels Andriesse
ced392a555
Merge pull request #368 from loki-project/open-group-profile-pictures 
Open Group Profile Pictures
 2020-10-28 14:58:40 +11:00
nielsandriesse
404ea7d347 Merge branch 'dev' into open-group-profile-pictures 2020-10-28 14:39:13 +11:00
nielsandriesse
6ad688b8d0 Update build number 2020-10-28 13:57:59 +11:00
Niels Andriesse
fe854cf625
Merge pull request #366 from loki-project/onion-requests-2 
Further Improved Path Maintenance
 2020-10-28 13:18:54 +11:00
nielsandriesse
49b588a6e3 Update build number 2020-10-28 11:31:53 +11:00
nielsandriesse
8070b9dd4e Update build number 2020-10-28 10:14:53 +11:00
Anton Chekulaev
0b1b7cd258 Merge branch 'dev' of https://github.com/loki-project/session-android into background-polling 2020-10-27 18:56:44 +11:00
nielsandriesse
00e45174e4 Update build number 2020-10-27 14:41:03 +11:00
Anton Chekulaev
8101ad665e Merge branch 'dev' of https://github.com/metaphore/session-android into background-polling 2020-10-27 12:23:48 +11:00
nielsandriesse
4c81f4f197 Merge branch 'dev' into onion-requests-2 2020-10-27 11:12:42 +11:00
nielsandriesse
5d3c495f63 Reword log 2020-10-27 10:15:15 +11:00
Niels Andriesse
e005fbf282
Merge pull request #369 from RyanRory/PN-fix-step-1 
Fix PNs Part 1
 2020-10-27 10:13:53 +11:00
Ryan ZHAO
ae261ebd83 disable background polling when FCM is on 2020-10-27 10:03:32 +11:00
nielsandriesse
a959c02252 Fix inverted boolean 2020-10-27 09:59:29 +11:00
nielsandriesse
4e69a538cb Fix crash 2020-10-27 09:42:39 +11:00
nielsandriesse
8395fd4b6f Merge branch 'dev' into onion-requests-2 2020-10-26 11:06:42 +11:00
nielsandriesse
53a58acbd5 Update version number 2020-10-26 09:36:09 +11:00
nielsandriesse
6027f2c5e1 Merge branch 'dev' into onion-requests-2 2020-10-26 08:57:32 +11:00
nielsandriesse
19c5fd8d18 Minor UI polish 2020-10-21 10:20:23 +11:00
nielsandriesse
bdbb03687e Fix build 2020-10-19 15:21:15 +11:00
nielsandriesse
d19a69567d Clean 2020-10-19 15:12:06 +11:00
nielsandriesse
7cbeace0ce Merge branch 'dev' into open-group-profile-pictures 2020-10-19 14:41:37 +11:00
Niels Andriesse
37eefd0127
Merge pull request #367 from loki-project/shared-sender-keys 
SSK Improvements Part 1
 2020-10-19 09:56:26 +11:00
nielsandriesse
9fd7b5802f Debug 2020-10-19 09:35:25 +11:00
nielsandriesse
b192542427 Fix various SSK race conditions 2020-10-19 09:27:34 +11:00
nielsandriesse
0cd24905b7 Update version number 1.6.1 2020-10-14 10:11:30 +11:00
nielsandriesse
f9e8eb2549 Debug 2020-10-09 14:38:29 +11:00
nielsandriesse
501f3bbb87 Match iOS path maintenance changes 2020-10-09 13:57:52 +11:00
nielsandriesse
bda81fa9f8 Fix indentation 2020-10-08 15:08:09 +11:00
Niels Andriesse
5b498b9f4a
Merge pull request #364 from RyanRory/SSK-group-editing-crash 
Fix SSK Group Editing Crash
 2020-10-08 15:05:40 +11:00
Niels Andriesse
ba1033bfe5
Merge pull request #363 from loki-project/shared-sender-keys 
Fix SSK Group Leaving Race Condition
 2020-10-08 15:05:21 +11:00
Niels Andriesse
0e39374b7b Retry PN server requests if needed 2020-10-07 15:56:55 +11:00
Ryan ZHAO
fd108e9d00 fix the crash when editing ssk groups with both adding and removing 2020-10-07 14:55:05 +11:00
nielsandriesse
0c669548f3 Disable the done button while the group is being created 2020-10-06 14:19:52 +11:00
nielsandriesse
6d724fe349 Disable the apply button while the group is being updated 2020-10-06 14:15:37 +11:00
nielsandriesse
389b4b9768 Show a loader while the group is updating 2020-10-06 14:10:57 +11:00
nielsandriesse
a34b1f74b3 Fix SSK group leaving race condition 2020-10-06 13:47:46 +11:00
nielsandriesse
cd177ee61e Simplify expression 1.6.0 2020-10-05 11:23:59 +11:00
Niels Andriesse
91a62a7449
Merge pull request #360 from RyanRory/ssk-closed-group-leaving-message 
Fix Group Leaving Copy
 2020-10-05 11:22:43 +11:00
nielsandriesse
6aeae72240 Update build number 2020-10-05 09:13:31 +11:00
nielsandriesse
a51850a147 Potentially fix crashes 2020-10-02 15:40:55 +10:00
nielsandriesse
9b40a2c0b8 Fix various minor UI issues 2020-10-02 15:24:13 +10:00
Anton Chekulaev
fa02d41691 Group database cleanup. 2020-10-01 21:26:28 +10:00
Anton Chekulaev
fcba710a32 Merge branch 'dev' of https://github.com/loki-project/session-android into open-group-avatar 2020-10-01 21:19:43 +10:00
Anton Chekulaev
f620d1cdb9 Use a Bitmap instead of a BitmapDrawable for open group attachment notification icon. 2020-10-01 21:15:22 +10:00
nielsandriesse
29f988d45c Update build number 2020-10-01 15:50:44 +10:00
nielsandriesse
9e69a61d75 Update build number 2020-10-01 15:26:37 +10:00