Commit Graph

7104 Commits

Author SHA1 Message Date
Brice-W
362589f83f refactor 2021-06-21 14:06:48 +10:00
Brice-W
bb7dc318c7 delete obsolete code 2021-06-21 14:04:00 +10:00
Brice-W
a71273e813 refactor 2021-06-21 14:03:08 +10:00
Brice-W
35d5def515 adding expiration timer to configuration message 2021-06-18 16:44:58 +10:00
Brice-W
59d9063774 proto update 2021-06-18 15:08:30 +10:00
Niels Andriesse
ac4b576abe
Merge pull request #606 from Brice-W/fix-illegalstateexception
Fix IllegalStateException
2021-06-17 09:32:44 +10:00
Niels Andriesse
eacfecd7fc
Merge pull request #605 from hjubb/extract_string_resources
Extract QR code scanner related strings and others mentioned in GH issues
2021-06-17 09:12:11 +10:00
Brice-W
9af804ec21 don't close the cursor if it's the same that is in the parameters 2021-06-16 16:43:33 +10:00
Harris
b0dab208d2 feat: extracting more strings, replacing link device strings using existing activities in case they change in future 2021-06-16 16:14:06 +10:00
Harris
5ce28f976b feat: extracting QR related strings and other github mentioned strings 2021-06-16 16:05:08 +10:00
Niels Andriesse
de45ec584d
Merge pull request #604 from hjubb/fix_qr_scanner_offscreen
Only Activate QR Scanner Once On-Screen
2021-06-16 15:07:10 +10:00
Harris
99fbf26907 feat: removing the QR code on visibility hint no longer visible 2021-06-16 14:25:33 +10:00
Niels Andriesse
71ffaaabc2 Add documentation 2021-06-16 10:19:42 +10:00
Niels Andriesse
4253cd62e3
Merge pull request #603 from Brice-W/formation-timestamp-update
Fix Formation Timestamp Handling for Users Re-Joining a Closed Group
2021-06-16 10:16:42 +10:00
Brice-W
8837256276 delete listener if current user is admin 2021-06-15 17:21:24 +10:00
Brice-W
1b6ab36a03 fix 2021-06-15 16:47:35 +10:00
Brice-W
7b22d14a2c using different timestamp for NEW group updates 2021-06-15 16:16:03 +10:00
Brice-W
47c989ab2e Merge branch 'dev' of https://github.com/loki-project/session-android into formation-timestamp-update 2021-06-15 11:21:55 +10:00
Niels Andriesse
f4ae16239e Clean 2021-06-11 11:27:15 +10:00
Niels Andriesse
b9a18a50b3
Merge pull request #600 from Brice-W/exp-timer-group-creation
Include Closed Group Expiration Timer Setting When Adding Members
2021-06-11 11:22:26 +10:00
Brice-W
b8efe73a3b update formation timestamp when group is rejoined after being left 2021-06-10 17:34:48 +10:00
Brice-W
3b03aef80f handle expiration timer with NEW group update type 2021-06-09 14:31:05 +10:00
Brice-W
534e0e8e69 proto updated 2021-06-09 11:03:18 +10:00
nielsandriesse
411a0dee6f Update build number 2021-06-08 08:38:43 +10:00
Niels Andriesse
2a1b14c954
Merge pull request #596 from Brice-W/minor-fix
Fix Typo
2021-06-07 14:51:53 +10:00
Brice-W
14d401b27a fix 2021-06-07 14:46:54 +10:00
nielsandriesse
3bf5a50439 Fix readability issues & simplify code 2021-06-04 16:32:19 +10:00
Niels Andriesse
7ea399b55d
Merge pull request #525 from Brice-W/zombie-handling-update
Closed Group Fixes
2021-06-04 16:26:53 +10:00
Brice-W
1d0b61cf89 fix to avoid zombies to be cleared when new group update received 2021-06-04 12:20:21 +10:00
Brice-W
6fb461f7d8 reset zombie members list if group already exists 2021-06-04 11:24:01 +10:00
nielsandriesse
d09d6aa0a7 Update version number 2021-06-04 08:38:55 +10:00
nielsandriesse
051dc698d7 Fix German translation 2021-06-04 08:37:30 +10:00
nielsandriesse
7b930ad08f Update translations 2021-06-04 08:35:38 +10:00
Brice-W
807e1042ca make update messages not selectable 2021-06-03 14:43:23 +10:00
Brice-W
2c7730260d fix case where closed group was impossible to delete 2021-06-03 14:08:13 +10:00
Brice-W
1a117b0189 Merge branch 'dev' of https://github.com/loki-project/session-android into zombie-handling-update 2021-06-03 11:51:57 +10:00
Niels Andriesse
25d8d27163
Merge pull request #595 from oxen-io/localization
Update Translations
2021-06-02 09:59:46 +10:00
nielsandriesse
86ccc3767e Update translations 2021-06-02 09:53:02 +10:00
nielsandriesse
be96c1b772 Merge branch 'master' of github.com:loki-project/loki-messenger-android into dev 2021-06-02 09:20:38 +10:00
Niels Andriesse
e117a3d2a2
Update bug_report 2021-06-02 09:19:30 +10:00
Niels Andriesse
c8e3174288
Update ISSUE_TEMPLATE 2021-06-02 09:18:34 +10:00
Niels Andriesse
356efb6c9e
Merge pull request #594 from oxen-io/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2021-06-02 09:16:44 +10:00
Kee Jefferys
3932d2fddd
Create CODE_OF_CONDUCT.md 2021-06-01 17:16:34 +10:00
nielsandriesse
d3776ae0e6 Enable data extraction notifications 2021-06-01 10:07:37 +10:00
nielsandriesse
b8a85c35c4 Update version number 2021-05-31 14:31:36 +10:00
Niels Andriesse
44ba6384a4
Merge pull request #593 from hjubb/json_deserialisation_fix
Fix Message Deletion Bug
2021-05-31 14:30:18 +10:00
Harris
2bdb4d18a2 fix: property name for json deserialisation 2021-05-31 14:24:43 +10:00
nielsandriesse
1e1e3bf0e8 Update version number 2021-05-31 13:13:50 +10:00
nielsandriesse
e1f3362c2a Fix crash 2021-05-31 13:13:25 +10:00
nielsandriesse
f872c2b9be Prepare for OGS timestamp handling changes 2021-05-31 11:23:37 +10:00