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

6632 Commits

Author SHA1 Message Date
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
Benoit Marty c88c2a17ca
Merge pull request #2235 from vector-im/feature/bca/perf_better_send_time 
Feature/bca/perf better send time
 2020-10-20 22:12:19 +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 89458a49b5 Updated change log 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
Markus 42fc47685c Merge tag 'v1.0.9' into fix_2100_2 2020-10-19 14:07:17 +02:00
Benoit Marty 9a5e71f391 Merge branch 'hotfix/bma/versionCode' 2020-10-19 12:31:35 +02:00
Benoit Marty c05147a019 Merge branch 'hotfix/bma/versionCode' into develop 2020-10-19 12:31:35 +02:00
Benoit Marty a59c92f55a Fix issue with VersionCode 2020-10-19 12:29:20 +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
inthepan 2026d93934 Translated using Weblate (German) 
Currently translated at 96.9% (1860 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2020-10-18 00:04:46 +00: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 85747d2ed4 Translated using Weblate (French) 
Currently translated at 98.1% (1883 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 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
Slavi Pantaleev c0cea9448f Translated using Weblate (Bulgarian) 
Currently translated at 74.3% (1426 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bg/
 2020-10-18 00:04:36 +00:00
SpiritCroc 5853709c97 Increment version 
Change-Id: Id0f9498606265ff48842ca210358ee1541b18c38
 2020-10-17 17:05:03 +02:00
SpiritCroc 863f07cbe4 Fix changing inactive theme 
Bug introduced in commit 65716c0ee8.

Fixes:
- Change inactive theme
- Switch to inactive theme -> still the old theme setting

Change-Id: I1b56144ffdb5e0f33efa67702e8aa05065285488
 2020-10-17 16:52:47 +02:00
SpiritCroc db7a82f567 Hide "invite" menu item 
We can invite users over the "Participants" menu item as well, and
inviting users isn't something we do too often probably.

Change-Id: I0c4c77371f0b81d39b3ae65992ef0362acf83a7c
 2020-10-17 16:47:34 +02:00
SpiritCroc 33d59b3ec6 Hide timeline_settings 
This menu item was added upstream, but we already have the menu item
show_room_info which does the same thing, and I prefer its wording to
upstream.

Change-Id: I065eeec4b3fdf4751978776566350823f2da5131
 2020-10-17 16:43:52 +02:00
SpiritCroc c5f59b9752 Fix mismerge 
Change-Id: Ieb568d343a568a2b29297fe9824430ab5e8a4a94
 2020-10-17 16:20:01 +02:00
SpiritCroc 6eff36c1a7 Fix duplicate resource build error 
Move drawable-anydpi-v24 xmls to drawable-v24

Change-Id: I48aa8efb013715802cc87da0c43509dbda4ac5c8
 2020-10-17 16:13:16 +02:00
SpiritCroc 0449e0ef83 Android Studio doesn't like this sha256sum here 
Change-Id: Ibfb56e49e33e1c049ca95af676973debf9b183e5
 2020-10-17 15:52:35 +02:00
SpiritCroc 6a3be2075e Add back upstream fastlane to upstream_fastlane for future merges 
Change-Id: I5bc7d0683b222a65e3fef127359c5441e5058ab1
 2020-10-17 15:43:39 +02:00
SpiritCroc bde0020305 Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings"""""""" 
This reverts commit c22f2b7a9b.

Change-Id: I4b7ceb45da0ee77301c6323aa2ca12b76ca46738
 2020-10-17 15:33:36 +02:00
SpiritCroc 835bde286c Automatic SchildiChat string correction 
Change-Id: I44a73d45a7445a11037cbf3d0443147144a7d0ed
 2020-10-17 15:28:34 +02:00
SpiritCroc cb2050b026 Automatic upstream merge postprocessing 
Change-Id: I2085547f6bc20a86dae82dfd4d9db047b110d80f
 2020-10-17 15:28:33 +02: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
SpiritCroc 0b082677cd [TMP] Automatic upstream merge preparation 
Change-Id: Iffad17224984f49a361e9abffb7cae217beabcff
 2020-10-17 15:09:01 +02:00
SpiritCroc 25b6357408 Revert "Automatic SchildiChat string correction" 
This reverts commit 797e5a0490.
 2020-10-17 15:09:01 +02:00
SpiritCroc c22f2b7a9b Revert "Revert "Revert "Revert "Revert "Revert "Revert "Resolve required manual intervention in german strings""""""" 
This reverts commit f9fc7abbd2.
 2020-10-17 15:09:00 +02:00
Benoit Marty 1b7158a61d Version++ 2020-10-16 17:34:10 +02:00
Benoit Marty 9298ca9c15 Merge branch 'release/1.0.9' 2020-10-16 17:33:01 +02:00
Benoit Marty 3c8f999468 Merge branch 'release/1.0.9' into develop 2020-10-16 17:32:58 +02:00
Benoit Marty ff84319e59 Prepare release 1.0.9 2020-10-16 17:09:31 +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 f3340f9789 Merge branch 'feature/bma/weblate_fix' into develop 2020-10-16 16:40:29 +02:00
Benoit Marty ca0af0f342 Fix bad cases 2020-10-16 16:38:33 +02:00
Benoit Marty aa91c41082 Fix lint issue 2020-10-16 16:36:09 +02:00
Benoit Marty 16579348f4
Merge pull request #2265 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2020-10-16 16:34:37 +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