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

2450 Commits

Author SHA1 Message Date
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
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