filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,623 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

2527 Commits

Author SHA1 Message Date
SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/res/menu/menu_timeline.xml
 2020-11-05 13:15:55 +01:00
Weblate f3b8bb066c Merge branch 'origin/develop' into Weblate. 2020-11-04 13:43:47 +00:00
Onuray Sahin 9ed529b944
Merge branch 'develop' into feature/ons/fix_markdown_formatter 2020-11-04 13:43:26 +03:00
Onuray Sahin bbc3dc0504 Set br softbreak to html parser. 2020-11-04 13:42:52 +03:00
Benoit Marty d1d2c5f117
Merge pull request #2327 from vector-im/feature/bma/keysbackupcrash 
Feature/bma/keysbackupcrash
 2020-11-04 00:02:48 +01:00
Onuray Sahin f24b593349 Update MarkdownParserTest. 2020-11-03 15:56:51 +03:00
Benoit Marty 997cd68344 Add some padding for easier readability 2020-11-03 09:57:34 +01:00
Onuray Sahin b40334f7db Markdown body should be pure text, see #739, #1506. 2020-11-03 11:53:50 +03:00
Benoit Marty a216f82b35 Avoid code duplication and log total count 2020-11-03 09:30:26 +01:00
Benoit Marty 5eb2f14375 Move RealmDebugTools and make it an internal class 2020-11-03 09:20:24 +01:00
Benoit Marty d4963dfb31 Use the same name for the 2 db log methods 2020-11-03 09:17:07 +01:00
Valere 3c7f61e45c Clean oldest gossiping entries on open 
Add a dump of DB size on bug report
 2020-11-02 17:45:08 +01:00
Besnik Bleta 10eef60f45 Translated using Weblate (Albanian) 
Currently translated at 99.4% (189 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
 2020-11-02 15:49:57 +00:00
zeritti cb70757790 Translated using Weblate (Czech) 
Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
 2020-11-02 15:49:57 +00:00
notramo 438060dfa2 Translated using Weblate (Hungarian) 
Currently translated at 64.2% (122 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/hu/
 2020-10-31 12:50:08 +00:00
Benoit Marty 1db120a963 cleanup 2020-10-30 18:08:11 +01:00
Benoit Marty fca0aa2cc4 KeysBackup: Avoid using `!!`, should fix #2262 2020-10-30 17:17:25 +01:00
Benoit Marty 0bcf42dbb8 KeysBackup: some API parameters are mandatory, so stop considering them as optional and avoid using `!!` 
Also fix an issue with Json name: `hash` -> `etag`
Add some `internal` modifier (not as much as I would like to)
var -> val
Remove unused code
 2020-10-30 16:14:33 +01:00
Benoit Marty 14e7e5e9fd Avoid usage of `!!` 2020-10-30 14:29:44 +01:00
Benoit Marty 1fcbf7ed42 Release backupOlmPkEncryption 2020-10-30 14:16:04 +01:00
Benoit Marty d654771fcf
Merge pull request #2318 from vector-im/feature/bca/fix_duplicate_reaction_echo 
Fix ui echo isues
 2020-10-30 11:56:51 +01:00
Benoit Marty 4791eb85af
Merge pull request #2283 from vector-im/feature/bca/crypto_perf 
Crypto cleaning and perf improvement
 2020-10-30 11:11:34 +01:00
Benoit Marty 239ead7ccb
Merge pull request #2311 from vector-im/feature/bma/direct 
Room member profile: Add action to create (or open) a DM (#2310)
 2020-10-29 16:21:26 +01:00
Benoit Marty 41e3ff381f Rename method 2020-10-29 16:02:21 +01:00
Valere 479f10a28e Fix potential ConcurrentModificationException 
give a copy to avoid issues
 2020-10-29 14:36:40 +01:00
Benoit Marty f48d4c021a Cleanup and split long lines 2020-10-29 14:10:41 +01:00
Benoit Marty f190356934 Fix compilation warnings 2020-10-29 13:44:47 +01:00
Benoit Marty 1bc726abff Update the algorithm to find an existing DM: simplify and make sure there is only 2 people in the room 2020-10-29 13:25:21 +01:00
Valere c2027be0ee Fix audit freeze, add export, and buffer gossip saves 2020-10-29 12:55:26 +01:00
Valere 5a111af2fe Fix / add close to IncomingRequestManager 2020-10-29 12:55:26 +01:00
Valere bb000f77f8 Offload self verif todevice off crypto thread 2020-10-29 12:55:26 +01:00
Valere 6d2b3a6940 cleaning 2020-10-29 12:55:26 +01:00
Valere dbb14e6313 offload megolm backup import off crypto thread 2020-10-29 12:55:26 +01:00
Valere 2144879e73 Offload sending keywithheld to computation 2020-10-29 12:55:26 +01:00
Valere e149be9e0f Offload Incoming Gossip to dedicated thread 2020-10-29 12:55:26 +01:00
Valere 9e921d8b50 safeguard for save after store closed 2020-10-29 12:55:26 +01:00
Valere 9bf5059631 Fix test helper not working 2020-10-29 12:55:26 +01:00
Valere b9fdc14e18 add internal 2020-10-29 12:55:26 +01:00
Valere f39938d17d Fix / device check was not reading up to date trust 2020-10-29 12:55:26 +01:00
Valere aa238775c6 Fix copyrights 2020-10-29 12:55:26 +01:00
Valere 7e7a953345 Crypto cleaning and perf improvement 2020-10-29 12:55:26 +01:00
Valere 9ec68fa5be Fix ui echo isues 2020-10-29 12:49:30 +01:00
Benoit Marty d9723387eb We only need the roomId in many cases, so update the API 2020-10-29 11:00:01 +01:00
Benoit Marty 4433436416 Room member profile: Add action to create (or open) a DM (#2310) 2020-10-28 18:13:36 +01:00
Benoit Marty 6ed77e276b Fix issue with plurals 2020-10-28 16:49:42 +01:00
Benoit Marty 7bebd6151e
Merge pull request #2308 from vector-im/feature/bma/wl 
Fix lint issue
 2020-10-28 15:27:01 +01:00
Benoit Marty 2f7c7badc1 Another lint fix 2020-10-28 15:26:34 +01:00
Benoit Marty 1e60d6f6e8
Merge pull request #2282 from vector-im/feature/bma/room_settings 
Feature/bma/room settings
 2020-10-28 13:54:08 +01:00
Benoit Marty 8091e224f7
Merge branch 'develop' into feature/bma/low_priority 2020-10-28 13:53:19 +01:00
Benoit Marty e84eba23a1 Fix lint issue 2020-10-28 13:49:16 +01:00