6e32e0f90f
Fix some theming for Element's new layout
...
Change-Id: I9027d81a31f2a6a5393936ecf506099d38735b27
2022-09-14 10:37:56 +02:00
5c276966f4
[merge] Fix new layout crash
...
Change-Id: I662d6e394db1fb95181e7aa25ed82045495d8b41
2022-09-14 10:37:52 +02:00
49a9d17521
[merge] Re-enable new Element app layout
...
Change-Id: Ic777c319916e7474735f8afca86d8044b64e3910
2022-09-14 10:37:48 +02:00
b7faa69834
[merge] Fix PromptSimplifiedModeFragment crash
...
Change-Id: I6b9cbb7f6950cf22c7dba3799e1b80b7df85f0b7
2022-09-11 19:44:36 +02:00
414881eb56
[merge] Fix mismerge causing spaceless launch to not load any rooms
...
Change-Id: Idde4f17babde5522e853c0f0bd7fdba2ed6f946d
2022-09-11 16:44:21 +02:00
083bc6df0e
Better fallback for inline images without alt description text
...
Use same text as for plain images sent
Change-Id: I675558618332f4a0053db5b3f40195b046b5682c
2022-09-11 11:06:45 +02:00
f0537e1c92
[merge] Don't hide space settings
...
All these settings work in the old layout, dunno why upstream disabled
these now for the old layout.
Change-Id: I92091454ce5263f1e11915e839b77b1cf3071aa2
2022-09-11 09:57:07 +02:00
8da289a0e7
[merge] Move strings that automatic merge missed
...
Change-Id: I5751d23bff3b119b45dcf0c939cf0f513af5e771
2022-09-11 09:50:18 +02:00
4ce1137d8e
Fix pills appearing twice for nested inline images
...
Do not add pills if we have a nested image span.
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/148
Change-Id: I1d070502cdd493be8d07ac43b23cd8981aa0dd2e
2022-09-11 09:17:49 +02:00
e314922280
[merge] Fix various crashes
...
Change-Id: I0e10d09e84771d79b8d54cd9b1239162cc19ceda
2022-09-10 15:55:49 +02:00
bc1f3cb24d
Merge tag 'v1.4.36' into merge-v1.4.36
...
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5
Conflicts:
library/ui-strings/src/main/res/values-bg/strings_sc.xml
library/ui-strings/src/main/res/values-cs/strings_sc.xml
library/ui-strings/src/main/res/values-de/strings_sc.xml
library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
library/ui-strings/src/main/res/values-es/strings_sc.xml
library/ui-strings/src/main/res/values-et/strings_sc.xml
library/ui-strings/src/main/res/values-eu/strings_sc.xml
library/ui-strings/src/main/res/values-fa/strings_sc.xml
library/ui-strings/src/main/res/values-fr/strings_sc.xml
library/ui-strings/src/main/res/values-hu/strings_sc.xml
library/ui-strings/src/main/res/values-it/strings_sc.xml
library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
library/ui-strings/src/main/res/values-nl/strings_sc.xml
library/ui-strings/src/main/res/values-pl/strings_sc.xml
library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
library/ui-strings/src/main/res/values-ro/strings_sc.xml
library/ui-strings/src/main/res/values-ru/strings_sc.xml
library/ui-strings/src/main/res/values-sk/strings_sc.xml
library/ui-strings/src/main/res/values-sv/strings_sc.xml
library/ui-strings/src/main/res/values-tr/strings_sc.xml
library/ui-strings/src/main/res/values-vi/strings_sc.xml
library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
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/session/room/summary/RoomSummaryUpdater.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
vector/build.gradle
vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.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/MessageImageVideoItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.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/VectorSettingsAdvancedSettingsFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
vector/src/main/res/xml/vector_settings_labs.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
c6c106399a
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I69b561bc7fd50532d7a39387c79794ba2a4b5fdb
2022-09-10 09:31:51 +02:00
e19647f6ca
Firebase provides Map<String, String?>
2022-09-09 16:33:57 +02:00
bdff23a74d
update doc
2022-09-09 15:59:34 +02:00
d9ad9859ec
Format
2022-09-09 15:59:34 +02:00
7c4527fba6
Fix test - no need to use Moshi to parse FCM Push data.
2022-09-09 15:59:34 +02:00
f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2
...
Use firebaseReceiver with FCM
2022-09-09 09:46:06 +02:00
a17a4fe4b1
Add logs for invalid push data
2022-09-08 17:16:55 +02:00
3e12907b26
Parse pushData in the push receiver
2022-09-08 16:25:48 +02:00
4222c7c7c4
changed to only restart home activity when resumed with different app layout flag state
2022-09-08 16:24:34 +02:00
cb36ef766c
restart app when app layout flag is changed
2022-09-08 16:14:57 +02:00
bc5309b5d7
Rename VectorMessagingReceiver to VectorUnifiedPushMessagingReceiver
2022-09-08 15:40:06 +02:00
dbea1726ec
Rename VectorMessagingHelper to VectorPushHandler
2022-09-08 15:38:52 +02:00
2527dbbeb2
Rename FirebaseReceiver to VectorFirebaseMessagingService
2022-09-08 15:37:18 +02:00
de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs
...
New Layout - Labs Flag (to replace feature flag)
2022-09-08 14:35:38 +02:00
65654e7e8a
Lint
2022-09-08 12:21:11 +02:00
f65074b3c5
Update pusher with FCM new token only if using FCM
2022-09-08 11:46:34 +02:00
62dbab907d
Merge pull request #7044 from vector-im/feature/mna/clean-vm-for-dm-v2
...
[Devices Management] Refactor some code to improve testability (PSG-701)
2022-09-08 11:44:56 +02:00
48498020a0
Ensure FCM always have the good gateway
2022-09-08 11:23:15 +02:00
3267cbbf78
Lint
2022-09-08 11:15:41 +02:00
94e2a0a3e3
Ensure FCM token is always retrieved
2022-09-08 10:58:08 +02:00
5dd26a43dd
Merge pull request #7059 from vector-im/bugfix/eric/new-layout-open-invite
...
New Layout - Allows you to open an invite by clicking its cell
2022-09-08 10:51:19 +02:00
a743cf28c6
Merge pull request #7061 from vector-im/feature/bma/no_ReleaseNotesActivity_on_login
...
Fix ReleaseNotesActivity displayed after login.
2022-09-08 10:50:50 +02:00
7bdcacf489
Merge branch 'misc/refactor-uphelper' into fix/fcm-push2
2022-09-08 10:49:53 +02:00
6ba963b552
Fix gateway
2022-09-08 10:49:49 +02:00
0b9b8251f9
Do not intent to VectorMessagingReceiver from FirebaseReceiver
...
Use VectorMessagingHelper to directly call onMessage
2022-09-08 10:34:56 +02:00
45b138e53d
Using orFalse() extension method on nullable boolean
2022-09-08 09:48:45 +02:00
c45f536855
RefreshDevicesOnCryptoDevicesChangeUseCase unit tests
2022-09-08 09:48:45 +02:00
047384c08c
Fix some coding style issues
2022-09-08 09:48:45 +02:00
3566b10e3c
DevicesViewModel unit tests
2022-09-08 09:48:45 +02:00
438f302787
GetDeviceFullInfoListUseCase unit tests
2022-09-08 09:48:45 +02:00
07d9e35842
GetCurrentSessionCrossSigningInfoUseCase unit tests
2022-09-08 09:48:45 +02:00
27031ab267
RefreshDevicesUseCase unit tests
2022-09-08 09:48:45 +02:00
06d447247a
Updating existing unit tests
2022-09-08 09:48:45 +02:00
0eae1bd505
Listen verification + refresh devices use cases
2022-09-08 09:48:45 +02:00
39a0b3b1ba
Moving recently created use cases inside v2 package
2022-09-08 09:48:45 +02:00
712d39b9dd
Inject new ViewModel in the fragment V2 + add use cases
2022-09-08 09:48:43 +02:00
4a6a39b3c4
Declare MarkAsManuallyVerified action
2022-09-08 09:48:03 +02:00
e3c41a07e5
Empty ViewModel V2
2022-09-08 09:48:03 +02:00
6c2bf35d60
Merge pull request #7005 from vector-im/feature/mna/session-overview-screen
...
[Devices Management] Session overview screen (PSG-691, PSG-693)
2022-09-08 09:18:31 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
sim
NIkita Fedrunov
Maxime NATUREL
Maxime NATUREL