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

5395 Commits

Author SHA1 Message Date
SpiritCroc 3ea56d5e53 Remove temporary downstream translation 2020-08-22 11:38:16 +02:00
SpiritCroc d912c5a356 Automatic SchildiChat string correction 2020-08-22 11:33:19 +02:00
SpiritCroc 0802a86555 correct_strings.sh: Remove Triple-T files to avoid usage in F-Droid 2020-08-22 11:33:15 +02:00
SpiritCroc 984ba0724f Make correct_strings.sh automatically commit 2020-08-22 11:26:22 +02:00
SpiritCroc ce90a36891 Theme update as in upstream merge 2020-08-22 11:23:59 +02:00
SpiritCroc 7b4b5be759 Merge tag 'v1.0.5' into sc 
Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml
 2020-08-22 11:23:45 +02:00
SpiritCroc 7240e4562a Remove unused drawables since merge 2020-08-22 11:05:06 +02:00
SpiritCroc 27a6b3c79e Merge commit '11b5512cb86369a9c3b50e5b469a8182cce79f52' into sc 
Merge v1.0.5 pt. 6

Conflicts:
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
 2020-08-22 11:00:23 +02:00
SpiritCroc 28f65ec0e8 Merge commit 'e3bf4c1e7bce8c752b4fef54be9a76893561a24a' into sc 
Merge v1.0.5 pt. 5

Conflicts:
	README.md
	vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-08-22 10:54:14 +02:00
SpiritCroc 9c3089c2b9 Revert back to updated correct_strings.sh 2020-08-22 10:51:45 +02:00
SpiritCroc 589068cbf8 Revert "Update strings" 
This reverts commit 7c959176fd.
 2020-08-22 10:51:24 +02:00
SpiritCroc 8a2d1d5011 Merge commit '0127339eac46cd7032682eeae923eb5805099704' into sc 
Merge v1.0.5 pt. 4
 2020-08-22 10:30:50 +02:00
SpiritCroc 7ddae5726b Merge commit '05b849de13dcabb6a90b4ec9b28fe0c5a57ad3e4' into sc 
Merge v1.0.5 pt. 3
 2020-08-22 10:29:39 +02:00
SpiritCroc cbd22a1257 Merge commit 'a1f90abcd20d2100e02767a6fd2cfb9969f12a4d' into sc 
Merge v1.0.5 pt. 2

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
	vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
	vector/src/main/java/im/vector/app/core/utils/UserColor.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/RoomColor.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/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
	vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginHeaderItem.kt
	vector/src/main/java/im/vector/app/features/themes/BubbleThemeUtils.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-08-22 10:29:31 +02:00
SpiritCroc c2e1a33864 Merge commit '67fc2feacb8e2563cc25f61ed6da48cb4de57ed7' into sc 
Merge v1.0.5 pt. 1

Conflicts:
	vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
 2020-08-22 09:52:54 +02:00
Benoit Marty 19f9c94d60 Merge branch 'release/1.0.5' 2020-08-21 17:02:49 +02:00
Benoit Marty 81dece5516 Prepare release 1.0.5 2020-08-21 17:02:32 +02:00
Benoit Marty 52e66b09dc
Merge pull request #1977 from vector-im/feature/networkonmainthread 
Avoid NetworkOnMainThreadException when setting a user avatar
 2020-08-21 16:48:19 +02:00
Benoit Marty 06f4b95dc0
Merge branch 'develop' into feature/networkonmainthread 2020-08-21 16:48:11 +02:00
Benoit Marty de728f6c36
Merge pull request #1971 from tzeitlho/turn_fix 
Turn fix
 2020-08-21 16:28:52 +02:00
Benoit Marty a8c6678efc Avoid NetworkOnMainThreadException when setting a user avatar 2020-08-21 16:11:22 +02:00
Benoit Marty 35dbab2ff5
Merge pull request #1976 from vector-im/feature/post_weblate_merge 
Feature/post weblate merge
 2020-08-21 14:47:25 +02:00
Thomas Zeitlhofer a732d8856b change var -> val according to review comment 
Signed-off-by: Thomas Zeitlhofer <tz+github@ze-it.at>
 2020-08-21 14:28:18 +02:00
Benoit Marty 80f7ffd7a6 Fix Potential Plurals - 3 2020-08-21 14:19:06 +02:00
Benoit Marty d86536c949 Fix Potential Plurals (removing unused resource) - 2 2020-08-21 13:07:37 +02:00
Benoit Marty f84ea0ad5b Fix Potential Plurals - 1 2020-08-21 12:55:15 +02:00
Benoit Marty 28ed6cb3b6 Fix typos reported by Lint 2020-08-21 12:47:39 +02:00
Benoit Marty 927c3e7e94 Update element web url (Fixes #1974) 2020-08-21 12:31:06 +02:00
Benoit Marty 5416f4194c Fix lint issue 2020-08-21 12:27:57 +02:00
Benoit Marty b09c1e3cbf Format strings 2020-08-21 12:23:25 +02:00
Benoit Marty 66ac03a021
Merge pull request #1975 from RiotTranslateBot/weblate-element-android-element-app 
Update from Weblate
 2020-08-21 12:16:25 +02:00
Weblate 43d0a11cba Merge branch 'origin/develop' into Weblate. 2020-08-21 09:30:51 +00:00
notramo a27b22a972 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/hu/
 2020-08-21 09:30:37 +00:00
Priit Jõerüüt 338c569c0b Translated using Weblate (Estonian) 
Currently translated at 89.8% (1649 of 1836 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-08-21 09:30:37 +00:00
Lua f7db14fb02 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/pt_BR/
 2020-08-21 00:42:34 +00:00
Lua cfd0e00c0c Translated using Weblate (Portuguese) 
Currently translated at 44.5% (817 of 1836 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt/
 2020-08-21 00:42:34 +00:00
Priit Jõerüüt 7c4afd922c Translated using Weblate (Estonian) 
Currently translated at 87.4% (1605 of 1836 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-08-21 00:42:34 +00:00
Thomas Zeitlhofer bd1a0361be Changelog entry for turnserver related fix 
Signed-off-by: Thomas Zeitlhofer <tz+github@ze-it.at>
 2020-08-20 19:46:20 +02:00
Thomas Zeitlhofer a7ee7d5bad Renew turnserver credentials when ttl runs out 
The previous implementation caches the turnserver response indefinitely.
This breaks VoIP calls as soon as the ttl of the received turnserver
credentials runs out. So, take care to renew the turnserver credentials
by allowing the cache to expire.

Fixes: d8cf44fdc9 ("Simple cache of turn server response")
Signed-off-by: Thomas Zeitlhofer <tz+github@ze-it.at>
 2020-08-20 19:43:52 +02:00
Benoit Marty 29e4a64475
Merge pull request #1970 from vector-im/feature/highlight 
Highlighted Event when opening a permalink from another room
 2020-08-20 19:04:15 +02:00
Benoit Marty f07bf43ada
Merge branch 'develop' into feature/highlight 2020-08-20 19:04:03 +02:00
Onuray Sahin 80551fc0c2
Fix IllegalArgumentException: Receiver not registered: NetworkInfoReceiver (#1961) 
Fix IllegalArgumentException: Receiver not registered: NetworkInfoReceiver (#1961)

Co-authored-by: Onuray Sahin <onurays@element.io>
 2020-08-20 18:31:03 +02:00
Benoit Marty 2acda2c5da
Merge pull request #1962 from vector-im/feature/membership_state_event 
A Kick appears has "someone has made no change" (Fixes #1959)
 2020-08-20 18:29:23 +02:00
Benoit Marty 9582b9c0fb
Merge pull request #1965 from vector-im/feature/share 
Share button in rooms gives room ID link without via parameters (#1927)
 2020-08-20 18:28:30 +02:00
Benoit Marty cbe093fe77 Highlighted Event when opening a permalink from another room (Fixes #1033) 2020-08-20 18:20:53 +02:00
Benoit Marty 112a7913d4 Improve (unused) code 2020-08-20 17:57:48 +02:00
Benoit Marty cab447e44e Add missing copyright 2020-08-20 17:50:43 +02:00
Benoit Marty fde2bdf304 Create a PermalinkFactory to avoid injecting the service in SDK classes 2020-08-20 17:41:01 +02:00
Benoit Marty 2c90e33ceb Move package 2020-08-20 17:33:55 +02:00
Benoit Marty af10344b6b Share button in rooms gives room ID link without via parameters (#1927) 
Following the algorithm described in #1927
Create a PermalinkService
 2020-08-20 17:33:55 +02:00