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
c43461e58f
[merge] Fix icon_gen.sh
...
Change-Id: I17dc3080d664cb3bef0560804c514e4400caa0b4
2022-09-11 12:42:25 +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
5751862c35
[merge] alternative_package.sh: Fix fcm
...
Change-Id: I20bd57f80d59eed36438e4a29634d43ee57b854b
2022-09-11 10:55:16 +02:00
4f6ea312f5
[merge] Fix alternative_package.sh
...
Change-Id: I9e16dd607e4fa927a454666dfe8a3d31b4b26f49
2022-09-11 10:12:20 +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
387d2e12bb
Inline images: Use alt text in room previews and notifications
...
Change-Id: I6649794d31582c3f5e6ab3e151a866663d4645ee
2022-09-11 09:41:52 +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
f1b4db73e4
Automatic SchildiChat string correction
...
Change-Id: If64f2437f0ee0cab81023272dbd30cd218992d63
2022-09-10 15:36:26 +02:00
05f8e43dce
Automatic upstream merge postprocessing
...
Change-Id: I81defeb0ee4582d805d897eb02ac632b9134386f
2022-09-10 15:36:25 +02:00
715eefe184
[merge] Update merge helpers for moved resources
...
Change-Id: I09de3d8c78e69386fe6020e8d1aa0f4d1b7aa9b6
2022-09-10 15:36:20 +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
bcf7e069f1
[TMP] Automatic upstream merge preparation
...
Change-Id: Icbdfae25a816938d002a288ab96e2d2f9d410026
2022-09-10 09:31:51 +02:00
c6c106399a
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I69b561bc7fd50532d7a39387c79794ba2a4b5fdb
2022-09-10 09:31:51 +02:00
484c418687
Merge remote-tracking branch 'weblate/sc' into merge-v1.4.36
...
Change-Id: I83544f38202d2b546be390166a86297ddabe12b1
2022-09-10 09:31:25 +02:00
6cada8f6a3
Merge branch 'release/1.4.36' into main
2022-09-10 08:13:58 +02:00
59d3ff1671
fastlane
2022-09-10 08:13:43 +02:00
58b94aef2d
Manually improve CHANGES.md
2022-09-10 08:11:58 +02:00
4de62d84b4
towncrier
2022-09-10 08:04:20 +02:00
4b63f4b9bf
Merge pull request #7085 from vector-im/feature/bma/fix_push
...
Feature/bma/fix push
2022-09-09 18:03:10 +02:00
8c884f45fb
Ignore `Instantiatable` class warning
2022-09-09 16:50:55 +02:00
e19647f6ca
Firebase provides Map<String, String?>
2022-09-09 16:33:57 +02:00
ca2805fb7f
Merge pull request #7083 from vector-im/dependabot/gradle/flipper-0.163.0
...
Bump flipper from 0.162.0 to 0.163.0
2022-09-09 16:05:56 +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
b501770fa9
Merge pull request #7058 from vector-im/fix/mna/run-sonar-only-when-token-available
...
CI: only run sonarqube task when token is known
2022-09-09 11:41:06 +02:00
f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2
...
Use firebaseReceiver with FCM
2022-09-09 09:46:06 +02:00
ff9add5a0c
Re-adding env variables section inside the sonarqube job
2022-09-09 09:25:36 +02:00
b60c279c06
Re-adding "always()" expression in the condition
2022-09-09 09:25:36 +02:00
41f75eed50
Adding changelog entry
2022-09-09 09:25:36 +02:00
398f9427df
Only run sonarqube task if tokens are not empty to avoid failure
2022-09-09 09:25:36 +02:00
b4d72d2219
Bump flipper from 0.162.0 to 0.163.0
...
Bumps `flipper` from 0.162.0 to 0.163.0.
Updates `flipper` from 0.162.0 to 0.163.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.162.0...v0.163.0 )
Updates `flipper-network-plugin` from 0.162.0 to 0.163.0
- [Release notes](https://github.com/facebook/flipper/releases )
- [Commits](https://github.com/facebook/flipper/compare/v0.162.0...v0.163.0 )
---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-08 23:09:02 +00:00
a17a4fe4b1
Add logs for invalid push data
2022-09-08 17:16:55 +02:00
614383c08d
Merge pull request #7081 from vector-im/bugfix/nfe/app_layout_feature_flag_restart
...
restart HomeActivity when app layout flag is changed
2022-09-08 16:54:08 +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
2ab0343e4f
sanity test now reads properties value to determine app layout feature status + small fix for tests
2022-09-08 12:37:25 +02:00
65654e7e8a
Lint
2022-09-08 12:21:11 +02:00
6badbe738d
robots are not checking feature flag for newAppLayout
2022-09-08 12:09:33 +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
SpiritCroc
Benoit Marty
Benoit Marty
Maxime NATUREL
Maxime NATUREL
dependabot[bot]
sim
NIkita Fedrunov