Commit graph

5546 commits

Author SHA1 Message Date
Ryan ZHAO 73ae18feac fix if iOS sets an expire timer in a closed group, it gets turned off when Android sends a message 2020-08-25 12:02:14 +10:00
nielsandriesse c43609ff7e Update build number 2020-08-25 11:14:34 +10:00
nielsandriesse e6ab67ea4c Update version number 2020-08-24 16:18:43 +10:00
nielsandriesse 927fcb84ac Minor refactoring 2020-08-24 15:38:29 +10:00
Niels Andriesse 07d26756ca
Merge pull request #288 from RyanRory/restoration-fix
Fix Restoration From Seed
2020-08-24 15:36:21 +10:00
nielsandriesse 4d7b179008 Minor refactoring 2020-08-24 14:47:28 +10:00
Niels Andriesse 4cc22608aa
Merge pull request #295 from metaphore/patch-1
Fix ContactSelectionListFragment Loader Usage
2020-08-24 14:34:01 +10:00
Anton Chekulaev 61b3cca246 Missed import. 2020-08-24 11:46:50 +10:00
Anton Chekulaev 59b94a1744
Update ContactSelectionListFragment.kt
Manual loader destruction and logging for the loader callback activity check.
2020-08-24 11:43:09 +10:00
Ryan ZHAO aed2941da7 show session reset done message 2020-08-24 11:41:39 +10:00
Ryan ZHAO 16e93f6356 update info message when reset the session 2020-08-24 10:45:33 +10:00
nielsandriesse 72999c7d12 Hopefully fix crash 2020-08-24 09:11:48 +10:00
Ryan ZHAO 8a125244f6 Merge branch 'dev' of https://github.com/loki-project/session-android into restoration-fix 2020-08-21 15:42:24 +10:00
Ryan ZHAO f18d5a3b82 ignore session request before restoration & Automatically rebuild session after restoration 2020-08-21 15:40:19 +10:00
Ryan ZHAO cb5e82ac84 fix session request sent timestamp data type from DB 2020-08-21 15:39:45 +10:00
Ryan ZHAO ad5b2eceb7 Don't show error messages before restoration 2020-08-21 15:39:13 +10:00
nielsandriesse 457c4b75c9 Update version number 2020-08-21 14:24:32 +10:00
nielsandriesse 1a013e9a19 Patch bad mac issues 2020-08-21 14:23:23 +10:00
nielsandriesse 1a8ced90a8 Fix inverted placeholder 2020-08-21 12:03:40 +10:00
nielsandriesse 82fb950956 Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2020-08-21 10:36:20 +10:00
nielsandriesse 7ac94089a2 Integrate improved Persian translation 2020-08-21 10:35:32 +10:00
nielsandriesse aadbe470ae Re-enable Persian translation 2020-08-21 10:31:46 +10:00
Niels Andriesse b9b78241f7
Merge pull request #287 from Brice-W/french-updates
Improved French Translation
2020-08-21 10:01:52 +10:00
Brice 1865871b0c french labels updaed 2020-08-21 09:56:01 +10:00
nielsandriesse 0f733bee51 Update build number 2020-08-20 10:38:05 +10:00
nielsandriesse 7e99aec410 Fix messed up database table 2020-08-20 10:32:31 +10:00
nielsandriesse 86fa15d0c9 Update build number 2020-08-20 09:26:33 +10:00
nielsandriesse af1f45a6e4 Fix received message hash values storage 2020-08-20 09:19:00 +10:00
nielsandriesse a4c6b39ffa Update build number 2020-08-19 16:33:51 +10:00
nielsandriesse cc6c6dab3d Fix legacy closed group messaging 2020-08-19 16:32:15 +10:00
nielsandriesse 39792ef7f9 Fix SSK based closed group updating copy 2020-08-19 15:31:35 +10:00
nielsandriesse fa664d0725 Attempt to fix key store crash 2020-08-19 14:31:56 +10:00
nielsandriesse 219d5ca401 Add recovery phrase disclaimer 2020-08-19 13:48:54 +10:00
nielsandriesse 6658ccdb6e Update version number 2020-08-19 13:40:26 +10:00
nielsandriesse 5907b1f5ab Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev 2020-08-19 13:39:51 +10:00
nielsandriesse c35c08340d Fix delivery receipts 2020-08-19 13:39:02 +10:00
Niels Andriesse 3d6cd7eff3
Merge pull request #286 from Bilb/minor-string-fixes
Copy Improvements
2020-08-19 13:00:53 +10:00
Audric Ackermann 1d6b3b3e7a
change backquote to simple quote and Invite Friends to Invite Contacts 2020-08-19 12:17:08 +10:00
Niels Andriesse e87fbe479a
Merge pull request #285 from loki-project/crashes
Crash Fixes
2020-08-19 12:15:29 +10:00
nielsandriesse e1841db991 Fix crash 2020-08-19 12:15:02 +10:00
nielsandriesse 38464bf1f7 Fix crash 2020-08-19 11:53:04 +10:00
nielsandriesse ac2e4d2ea1 Merge branch 'dev' into crashes 2020-08-19 11:47:35 +10:00
Niels Andriesse 7fc168dfa1
Merge pull request #284 from loki-project/androidx
Raise Deployment Target & Migrate to AndroidX
2020-08-19 11:46:28 +10:00
nielsandriesse a5abfc2755 Fix crash 2020-08-19 11:40:34 +10:00
nielsandriesse 75881273d5 Fix crash 2020-08-19 11:36:54 +10:00
nielsandriesse 15d7a073f9 Hopefully fix file loading crash 2020-08-19 11:29:52 +10:00
nielsandriesse 3a1a99b183 Update dependencies 2020-08-19 10:42:46 +10:00
nielsandriesse 6de5b25e97 Only externally define versions that are used multiple times 2020-08-19 10:18:02 +10:00
nielsandriesse 96736a8095 Raise deployment target and migrate to AndroidX 2020-08-19 10:06:26 +10:00
nielsandriesse 6e2cbb23cc Exclude existing group members from the add members screen 2020-08-18 15:40:24 +10:00