Commit Graph

2603 Commits

Author SHA1 Message Date
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
Benoit Marty b78dac20c0 Room profile: BigImageViewerActivity now only display the image. Use the room setting to change or delete the room Avatar 2020-10-28 11:22:37 +01:00
Weblate de33f7b3f5 Merge branch 'origin/develop' into Weblate. 2020-10-28 10:09:29 +00:00
Slavi Pantaleev 5be1c447a2 Translated using Weblate (Bulgarian)
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/bg/
2020-10-28 10:06:07 +00:00
Tirifto 3c4b88db0a Translated using Weblate (Esperanto)
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/eo/
2020-10-27 19:50:14 +00:00
Nikita Epifanov fc1b6a4d38 Translated using Weblate (Russian)
Currently translated at 98.9% (188 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
2020-10-26 11:51:04 +00:00
MamasLT 10060b35c8 Translated using Weblate (Lithuanian)
Currently translated at 8.4% (16 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/lt/
2020-10-24 03:49:51 +00:00
Benoit Marty 5a6683574c Toggle Low priority tag (#1490) 2020-10-23 14:58:31 +02:00
Besnik Bleta c9748cb46f Translated using Weblate (Albanian)
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
2020-10-22 21:49:58 +00:00
@a2sc:matrix.org 385f2db038 Translated using Weblate (German)
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/de/
2020-10-22 21:49:57 +00:00
Benoit Marty 4b8c31d806 Add Avatar: SDK
Also add remove avatar action, and add Crop UX
2020-10-22 10:25:53 +02:00
sr093906 ea4325c498 Translated using Weblate (Chinese (Simplified))
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/zh_Hans/
2020-10-21 10:05:00 +00:00
Corentin Noël dc4d2d6ccb Translated using Weblate (French)
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/fr/
2020-10-21 10:05:00 +00:00
Danial Behzadi 06bcd1654c Translated using Weblate (Persian)
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/fa/
2020-10-21 10:04:59 +00:00
Benoit Marty f1e545ad49
Merge pull request #2264 from vector-im/feature/ons/fix_riotx_crypto_migration
Fix crpyto store migration from RiotX.
2020-10-20 22:15:21 +02:00
Valere dc8a6cc745 Code review 2020-10-20 21:42:24 +02:00
Valere d319a353d4 change log level 2020-10-20 21:42:24 +02:00
Valere 464ce16d63 fix sdk copyright 2020-10-20 21:41:48 +02:00
Valere 6cca87da49 Stop thread on close session 2020-10-20 21:41:48 +02:00
Valere ace412f9e3 cleaning 2020-10-20 21:41:48 +02:00
Valere 41e168a519 add UI echo of reactions 2020-10-20 21:41:48 +02:00
Valere 47746d6997 Add event sender in app thread 2020-10-20 21:41:48 +02:00
Onuray Sahin 151f361954
Merge branch 'develop' into feature/ons/fix_riotx_crypto_migration 2020-10-19 11:15:04 +03:00
Onuray Sahin 6d3a659362 Benoit code review fixes. 2020-10-19 11:14:15 +03:00
Benoit Marty 1a9f06681f Translated using Weblate (Czech)
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
2020-10-18 00:04:46 +00:00
Corentin Noël e1b8405c8b Translated using Weblate (French)
Currently translated at 59.4% (113 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/fr/
2020-10-18 00:04:36 +00:00
Benoit Marty 51c9208952 Translated using Weblate (German)
Currently translated at 96.8% (184 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
2020-10-18 00:04:36 +00:00
SpiritCroc 44d3c0118a Merge remote-tracking branch 'upstream/master' into sc
Change-Id: If0e38334e7e479134cd05283f857e4871bb7692f

Conflicts:
	vector/build.gradle
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_legacy.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/view_avatar_selector.xml
2020-10-17 15:28:18 +02:00
Benoit Marty dc7e0a5f88
Merge pull request #2259 from vector-im/feature/ons/fix_file_info_size
Uploading a file to a room caused it to have a info.size of -1
2020-10-16 17:05:26 +02:00
Benoit Marty 0ffe20d863 Small changes 2020-10-16 16:50:51 +02:00
Benoit Marty b07e7a4a36 Use file.length if cursor returns -1 as file size.
Author: Onuray (squashed)
2020-10-16 16:11:11 +02:00
Weblate dea994c1fb Merge branch 'origin/develop' into Weblate. 2020-10-16 14:02:54 +00:00
Benoit Marty 3bf11d1a0b Translated using Weblate (Slovak)
Currently translated at 86.3% (164 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sk/
2020-10-16 14:02:44 +00:00
Benoit Marty dce60d0061 Translated using Weblate (Kabyle)
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/kab/
2020-10-16 14:02:44 +00:00
Benoit Marty 31e73b2f8c Translated using Weblate (Estonian)
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/et/
2020-10-16 14:02:44 +00:00
Benoit Marty d314c8ae58 Translated using Weblate (Bengali (India))
Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/bn_IN/
2020-10-16 14:02:44 +00:00
Benoit Marty e19af47b77 Translated using Weblate (Italian)
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/it/
2020-10-16 14:02:44 +00:00
Onuray Sahin 6531ba6a13 Fix crpyto store migration from RiotX.
Fixes #2252
2020-10-16 15:18:35 +03:00
LinAGKar 72a7bf9e23 Translated using Weblate (Swedish)
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/sv/
2020-10-16 09:04:48 +00:00
Nikita Epifanov 5cb46dba6c Translated using Weblate (Russian)
Currently translated at 98.9% (188 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
2020-10-16 09:04:47 +00:00
linsui ba3500baf6 Translated using Weblate (Chinese (Simplified))
Currently translated at 97.8% (186 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
2020-10-16 09:04:47 +00:00
Priit Jõerüüt f82ee5efdd Translated using Weblate (Estonian)
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/et/
2020-10-16 09:04:47 +00:00
@a2sc:matrix.org 28df01b184 Translated using Weblate (German)
Currently translated at 96.8% (184 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
2020-10-16 09:04:43 +00:00
Jeff Huang 843d1d57cf Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2020-10-16 09:04:43 +00:00
Marcelo Filho c1f08e8f22 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2020-10-16 09:04:39 +00:00
random e7a8679383 Translated using Weblate (Italian)
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/it/
2020-10-16 09:04:38 +00:00
Benoit Marty 7f5c7c3bed Trick to fix a change due to upgrade to build-tools 4.1.0 (?) 2020-10-13 23:05:33 +02:00
Benoit Marty 79d7032e3a Don't set presence when handling a push notification or polling (#2156) 2020-10-13 22:34:08 +02:00
Benoit Marty ede5bb0e90 Format files, in particular align `->` 2020-10-13 14:57:45 +02:00
Benoit Marty db1f129034 Improve detection of encrypted rooms 2020-10-13 11:27:46 +02:00
Benoit Marty 9dc1034891 Fix some of the non-passing tests 2020-10-13 09:47:34 +02:00
Benoit Marty 68947588d7 Replace deprecated shouldEqual and shouldEqualTo by shouldBeEqualTo 2020-10-12 22:30:18 +02:00
Benoit Marty 0fc92889c1 Fix test compilation issue 2020-10-12 22:14:46 +02:00
Benoit Marty 778c5aee32 Add param to `when` 2020-10-12 21:13:26 +02:00
Benoit Marty 63eb119df6 Inject userId and deviceId instead of sessionParam 2020-10-12 21:13:26 +02:00
Benoit Marty d0cb5f4212
Merge pull request #2248 from vector-im/feature/bca/detect_reset
Fix / reset cross signing not well supported
2020-10-12 20:49:15 +02:00
Benoit Marty cb40485aad Format strings 2020-10-12 19:02:12 +02:00
Weblate a6817e8281 Merge branch 'origin/develop' into Weblate. 2020-10-12 16:03:26 +00:00
Danial Behzadi ecdec83c37 Translated using Weblate (Persian)
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/fa/
2020-10-12 16:01:02 +00:00
Besnik Bleta 087711f1f7 Translated using Weblate (Albanian)
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sq/
2020-10-12 16:00:12 +00:00
Valere 840c8e0b91 Fix / reset cross signing not well supported 2020-10-12 17:10:46 +02:00
Benoit Marty 6f709a1e7c
Merge pull request #2203 from vector-im/feature/bma/pusher_data
Feature/bma/pusher data
2020-10-12 14:51:15 +02:00
Valere b12c4f854c Fix / Moshi Cannot serialize kotlin 2020-10-09 15:40:30 +02:00
Benoit Marty ab9bbe9a48 Cleanup and cancel request properly 2020-10-08 22:08:48 +02:00
Benoit Marty 5e45f5c3ea Copyright for SDK 2020-10-08 22:08:48 +02:00
Benoit Marty 5397700ab4 cleanup 2020-10-08 22:08:48 +02:00
Benoit Marty 48ca1384f8 Do some renaming, Sygnal is an implementation of a PushGateway. 2020-10-08 22:08:48 +02:00
Benoit Marty 02f1dab9b2 Push test: better error handling 2020-10-08 22:08:48 +02:00
Benoit Marty 7d53dfeca4 Add Sygnal API implementation to test is Push are correctly received 2020-10-08 22:08:48 +02:00
Benoit Marty cb33b9f158 cleanup 2020-10-08 22:08:25 +02:00
Benoit Marty cee5f8a0fb
Merge pull request #2230 from vector-im/feature/bma/sdk_copyright
Sdk copyright
2020-10-08 22:04:46 +02:00
Benoit Marty bc339191ea Fix Copyright mention 2020-10-08 15:11:01 +02:00
Benoit Marty 44114e66c2 Fix Copyright mention in SDK code 2020-10-08 15:04:55 +02:00
Benoit Marty 1dfc739f19 Onuray's review 2020-10-08 14:19:56 +02:00
Benoit Marty 7952e205b9 Implement "Jump to read receipt" and "Mention" actions on the room member profile screen 2020-10-08 14:18:01 +02:00
Benoit Marty ff0f42900d Do not use deprecated Fragment.startActivityForResult anymore 2020-10-07 16:02:01 +02:00
Benoit Marty 182158c3af Fix runtime issue after upgrading Moshi library 2020-10-06 18:36:54 +02:00
Benoit Marty dd1c9976e3 Fix runtime issue after upgrading Moshi library 2020-10-06 17:25:27 +02:00
Benoit Marty 9e0ebc94c5 Upgrade other dependencies, and remove unused dependencies 2020-10-06 15:44:30 +02:00
Benoit Marty e708b0f01b Fix compilation warning (due to Kotlin 1.4) 2020-10-06 15:09:41 +02:00
Benoit Marty 1a0dba7422 Upgrade Moshi to `1.11.0`, Dagger to `2.29.1`, Epoxy to `4.1.0` 2020-10-06 14:47:57 +02:00
Benoit Marty ebfee5868e Remove OkReplay, not compatible to build tools `4.0.1` (and not used) 2020-10-06 13:06:24 +02:00
Benoit Marty 5056615eb0 Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9` 2020-10-06 12:33:40 +02:00
Benoit Marty 72a412904d small cleanup 2020-10-06 12:26:18 +02:00
ganfra dfbe1188f0 Draft: use session realm provider when possible 2020-10-06 10:17:17 +02:00
ganfra 91b81af5a8 Draft: handle sharing so it doesn't destroy the previous draft 2020-10-06 10:17:17 +02:00
ganfra aa0520d47d Start reworking draft (simplify) 2020-10-06 10:13:14 +02:00
Benoit Marty f030e098a8 Fix code quality and compilation test 2020-10-02 17:18:39 +02:00
Benoit Marty 3705fa14bd Use sender data return from search result 2020-10-01 17:03:53 +02:00
Benoit Marty 4649b2ac1d Code review 2020-10-01 16:09:06 +02:00
Onuray Sahin 4683dc3f21 Documentation added to orderByRecent parameter of the search request. 2020-10-01 14:50:29 +02:00
Onuray Sahin e21f306635 Use enum directly instead of its value. 2020-10-01 14:50:29 +02:00
Onuray Sahin 430a0d2492 Create separate search module. 2020-10-01 14:50:29 +02:00
Onuray Sahin 8759bcca84 Map api response to a domain object. 2020-10-01 14:48:55 +02:00
Onuray Sahin f1a979caa1 Make SearchTask accessible from room. 2020-10-01 14:48:55 +02:00
Onuray Sahin 7c954d220c Fix search request and response fields. 2020-10-01 14:48:55 +02:00
Onuray Sahin 8bff468c7c SearchService is added to the session. 2020-10-01 14:48:55 +02:00
Onuray Sahin c46f0a7430 Simple integration test implementation for searching messages in a room. 2020-10-01 14:48:55 +02:00
Onuray Sahin 2eb60213b4 Do not support searching in multiple rooms for now. 2020-10-01 14:48:55 +02:00
Onuray Sahin 05f48255a3 Move search service into session module. 2020-10-01 14:48:55 +02:00
Onuray Sahin d599cab017 SearchService implementation. 2020-10-01 14:48:55 +02:00
Onuray Sahin b521f36569 SearchTask implementation. 2020-10-01 14:48:55 +02:00
Onuray Sahin 051b431f1d Search api added to RoomAPI. 2020-10-01 14:48:55 +02:00
Onuray Sahin 04b41fce30 Data classes for the search response created. 2020-10-01 14:48:55 +02:00
Onuray Sahin 5fcabca87c Data classes for request body created. 2020-10-01 14:48:55 +02:00
Benoit Marty 29f8c18b09 Translated using Weblate (Kabyle)
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
2020-09-30 13:05:02 +00:00
Benoit Marty 1986de36a6 Better wording for DM creation (note: this event is hidden in the timeline by default) 2020-09-30 12:12:44 +02:00
Onuray Sahin 24fcb3f58f Differentiate wordings for direct rooms. 2020-09-30 10:07:20 +02:00
Benoit Marty b14d22550b PR Review
Cleanup and Add command line to run the UI tests
2020-09-29 15:12:25 +02:00
Valere bc2c345e21 First automated UI tests 2020-09-29 12:51:27 +02:00
SpiritCroc 43b99a2a9a Merge remote-tracking branch 'upstream/master' into sc
Change-Id: Id1192801aa01317d36af3d0619ab281200ecfc80

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/res/layout/activity_signed_out.xml
	vector/src/main/res/layout/fragment_login.xml
	vector/src/main/res/layout/fragment_login_captcha.xml
	vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
	vector/src/main/res/layout/fragment_login_reset_password.xml
	vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
	vector/src/main/res/layout/fragment_login_reset_password_success.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_login_terms.xml
	vector/src/main/res/layout/fragment_login_wait_for_email.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/values-land/styles_login.xml
	vector/src/main/res/values/styles_login.xml
2020-09-27 13:55:40 +02:00
zeritti c14bf80b40 Translated using Weblate (Czech)
Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/cs/
2020-09-27 09:05:00 +00:00
Benoit Marty 8edecf5937 Allow using an outdated homeserver, at user's risk (#1972)
Just warn the user using a non blocking popup
2020-09-23 16:25:01 +02:00
Benoit Marty 91fe308113 Import SAS strings 2020-09-22 15:39:56 +02:00
Benoit Marty 78a76a8038 Remove `↵` from string resource 2020-09-22 15:38:37 +02:00
Weblate d6ba653c21 Merge branch 'origin/develop' into Weblate. 2020-09-22 12:55:48 +00:00
Benoit Marty d868ef0168 Create parent class for all MatrixWorker 2020-09-22 12:06:01 +02:00
SpiritCroc 4ed7529179 Hide redactions by default again
Change-Id: I7b50a2c9aadb55f19f9b7fe49fa6cc3ac169231f
2020-09-22 10:12:36 +02:00
SpiritCroc 2fa4518600 Revert "Revert "Setting for unread badge / room summary event visibility""
This reverts commit 1ff602db3b.

Change-Id: I161a6dcbbee2b2dc517912f6fb1f6b2ec772df0b

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
2020-09-22 10:05:36 +02:00
SpiritCroc 9425640277 Revert "Avoid db upgrade: add back deprecated fields concerning unread kind"
This reverts commit 2812dc0a3e.
2020-09-22 09:55:52 +02:00
Benoit Marty 4d9bd57336 Fix compilation issue after merge 2020-09-21 21:20:06 +02:00
Benoit Marty 30ab6d5ee7
Merge pull request #2147 from vector-im/feature/quick_fix
Safe call to awaitCallback
2020-09-21 21:18:36 +02:00
ganfra 4d558c5f95
Merge branch 'develop' into feature/fix_filtering_redacted 2020-09-21 20:25:49 +02:00
ganfra a29ca2ae09 Clean after Benoit's review 2020-09-21 20:25:16 +02:00
Benoit Marty d1fed08764 Rename `tryThis` to `tryOrNull` 2020-09-21 18:26:35 +02:00