mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 10:25:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
19268 commits 6 branches 120 tags 229 MiB
Commit graph

19268 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
17721c5534 Automatic upstream merge postprocessing 
Change-Id: I2822bf81750670f6383ee70f9a87e256c4732a50
 2022-07-29 16:55:33 +02:00
SpiritCroc
9b44975635 Merge tag 'v1.4.30' into sc 
Change-Id: Ia43ff3781ad84699eb36fba937f7213d47fc0510

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.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/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultLiveLocationShareStatusItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-07-29 16:55:28 +02:00
SpiritCroc
6ab85cc7bc [TMP] Automatic upstream merge preparation 
Change-Id: I19731ba36867ffda85f7faf5cab3f10573fcee6e
 2022-07-29 15:17:20 +02:00
SpiritCroc
6aac16aeb2 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ia6fc39919f9b73c5da97e8be22c365ac9ef72125
 2022-07-29 15:17:20 +02:00
pixelcode
f93faaf394 Translated using Weblate (German) 
Currently translated at 98.0% (149 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-07-29 15:08:52 +02:00
Hiajen
6e8c8633b4 Translated using Weblate (German) 
Currently translated at 94.0% (143 of 152 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2022-07-29 15:08:52 +02:00
Adam Brown
a812b77e7d Merge branch 'release/v1.4.30' 2022-07-29 09:00:19 +01:00
Adam Brown
7b208316e4 generating 1.4.30 changelog 2022-07-29 08:57:57 +01:00
Benoit Marty
24e78fef74
Merge pull request #6677 from vector-im/feature/bma/fix_room_shortcut 
Shortcuts must first start MainActivity to ensure the session is restored.
 2022-07-28 20:39:41 +02:00
Benoit Marty
a2e8506600 Fix and suppress lint issue. RestrictedApi is for the usage of ShortcutInfoCompat.Builder. 2022-07-28 19:03:05 +02:00
Benoit Marty
eee418d1fd Migrate previous pinned Shortcut to the new Intent 2022-07-28 18:26:44 +02:00
Benoit Marty
6e0ca3958b Shortcuts must first start MainActivity to ensure the session is restored. 2022-07-28 16:19:28 +02:00
Adam Brown
5daf82a32a
Merge pull request #6671 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-07-28 13:52:53 +01:00
Adam Brown
bc856fd16c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.3% (2311 of 2327 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2022-07-28 12:14:17 +00:00
Weblate
e9472d64f2 Merge branch 'origin/develop' into Weblate. 2022-07-28 11:12:31 +00:00
phardyle
ba25e6d6fb Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.9% (2314 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-07-28 11:11:42 +00:00
Adam Brown
b409431b0f
Merge pull request #6666 from vector-im/feature/adm/missing-space-rooms 
`Home` always showing all rooms
 2022-07-28 12:10:36 +01:00
Adam Brown
e4640f14d2 adding sdk changelog 2022-07-28 11:06:30 +01:00
Adam Brown
8ef0850752 removing unused import 2022-07-28 11:05:28 +01:00
Adam Brown
09d840506e replacing inverted takeIf chain with positive when conditions 2022-07-28 11:04:35 +01:00
Maxime NATUREL
d60683d991
Merge pull request #6664 from vector-im/fix/mna/cancel-infinite-animation 
Cancel infinite animations in TypingMessageDotsView
 2022-07-28 11:48:26 +02:00
Adam Brown
2d8ef9925d adding changelog entry 2022-07-28 10:23:14 +01:00
Adam Brown
e8476882fc providing a type for the NoFilter to avoid the ambiguity of the nullable param 2022-07-28 10:22:11 +01:00
Adam Brown
1ba8d29333 fixing rooms from other spaces being included in home due to wrong filter param 
- we were passing null which meant no filter was being applied
 2022-07-28 10:10:01 +01:00
Maxime NATUREL
a0534d8fcc
Merge pull request #6636 from vector-im/feature/mna/ended-state-map-live-location 
[Location Share] - Expanded map state when no more live location shares (PSG-629)
 2022-07-28 10:53:31 +02:00
Maxime NATUREL
0f6d5aec88 Adding changelog entry 2022-07-28 10:11:35 +02:00
Maxime NATUREL
fbd1009ebc Fixing missing cancel on infinite ObjectAnimators 2022-07-28 10:00:07 +02:00
Johan Smits
0fccedd68f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2315 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2022-07-28 06:32:57 +00:00
Auri B. P
f366211436 Translated using Weblate (Catalan) 
Currently translated at 100.0% (2315 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
 2022-07-28 06:32:54 +00:00
Przemysław Romanik
2f1ce94efb Translated using Weblate (Polish) 
Currently translated at 90.1% (64 of 71 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pl/
 2022-07-28 06:32:54 +00:00
phardyle
01555d5cb4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2315 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2022-07-28 06:32:52 +00:00
Przemysław Romanik
e612421be3 Translated using Weblate (Polish) 
Currently translated at 99.0% (2293 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2022-07-28 06:32:52 +00:00
LinAGKar
36f13aa520 Translated using Weblate (Swedish) 
Currently translated at 100.0% (71 of 71 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
 2022-07-28 06:32:49 +00:00
LinAGKar
128ff1f8eb Translated using Weblate (Swedish) 
Currently translated at 100.0% (2315 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-07-28 06:32:47 +00:00
phardyle
4522deb1ef Translated using Weblate (Chinese (Simplified)) 
Currently translated at 98.5% (70 of 71 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
 2022-07-28 06:32:44 +00:00
phardyle
aea0d2f2ca Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.9% (2314 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2022-07-28 06:32:42 +00:00
Dinh Quang Tuyen
066d96912b Translated using Weblate (Vietnamese) 
Currently translated at 88.9% (2060 of 2315 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
 2022-07-28 06:32:28 +00:00
ganfra
050c23b578
Merge pull request #6656 from vector-im/feature/fga/revert_6404 
Revert #6404
 2022-07-27 17:49:10 +02:00
Adam Brown
01bc275311
Merge pull request #6651 from vector-im/feature/adm/enable-ftue 
FTUE - Enable onboarding FTUE flows
 2022-07-27 16:38:35 +01:00
ganfra
e9f5208efd Revert "replyTo are not updated if the original message is edited (#6404)" 
This reverts commit 99a906fe9b.
 2022-07-27 16:39:13 +02:00
Adam Brown
64c875e017
add ticket reference for TODO 2022-07-27 14:05:39 +01:00
Adam Brown
0fcf7c7079
Merge pull request #6641 from vector-im/feature/adm/ftue-soft-exit-email-verification 
FTUE - Allow editing email during email verification
 2022-07-27 14:00:20 +01:00
Adam Brown
8639b69e73 removing unused imports 2022-07-27 13:21:17 +01:00
Jorge Martín
58ea816cae Ignore tests with broken mocks in APIs < 30. It looks like a mockk issue. 2022-07-27 14:02:18 +02:00
Jorge Martín
b468a9da33 Improve lock screen implementation. 2022-07-27 14:02:18 +02:00
Adam Brown
91e4536f37 adding changelog entry 2022-07-27 12:54:26 +01:00
Adam Brown
28362b53f8 enabling the ftue feature flags 2022-07-27 12:18:10 +01:00
Adam Brown
fe0c2fc57f adding UI test support for the ftue onboarding feature flags 2022-07-27 12:17:59 +01:00
Adam Brown
746191163a updating test verification interaction, there's no skip and we can press back instead 2022-07-27 12:17:03 +01:00
Adam Brown
067a030f19
Merge pull request #6649 from vector-im/feature/adm/auth-testing-results 
FTUE - Test session feedback
 2022-07-27 12:09:35 +01:00