Commit graph

34 commits

Author SHA1 Message Date
SpiritCroc
991a658221 Increment version
Change-Id: Ie455b8bc10071367f735a8cd1d1a0d1fd1323d16
2022-09-17 10:47:04 +02:00
SpiritCroc
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
Benoit Marty
8c884f45fb Ignore Instantiatable class warning 2022-09-09 16:50:55 +02:00
Benoit Marty
f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2
Use firebaseReceiver with FCM
2022-09-09 09:46:06 +02:00
sim
2527dbbeb2 Rename FirebaseReceiver to VectorFirebaseMessagingService 2022-09-08 15:37:18 +02:00
NIkita Fedrunov
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
NIkita Fedrunov
6badbe738d robots are not checking feature flag for newAppLayout 2022-09-08 12:09:33 +02:00
sim
9cf6dd7a88 Use firebaseReceiver with FCM 2022-09-07 18:02:26 +02:00
ericdecanini
37b216393e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 14:02:10 +02:00
Benoit Marty
bdfbbbb2e6
Merge pull request #7020 from vector-im/feature/nfe/app_layout_all_screens_test
fixed allscreens sanity test for enabled app layout flag
2022-09-07 13:57:17 +02:00
ericdecanini
b7efd6384c Changes vector feature preference key and function name for clarity 2022-09-06 16:07:12 +02:00
Benoit Marty
f604b1d384 Private val is better. 2022-09-06 15:00:55 +02:00
NIkita Fedrunov
4dc01fcfa6 changes according to CR 2022-09-06 14:51:11 +02:00
NIkita Fedrunov
1b651f2aa5 fixed lint 2022-09-06 06:59:10 +02:00
NIkita Fedrunov
67b7bc3d83 fixed allscreens sanity test for enabled app layout flag 2022-09-06 00:00:35 +02:00
Benoit Marty
59f55beab1 Moving manifest manifest.application$name attribute to the main manifest, to make it available for both fdroid and gplay variant. Fixes #6995. 2022-09-05 17:49:42 +02:00
Benoit Marty
bf25ef4369 There are no views to bind in this module. 2022-09-05 17:40:34 +02:00
Adam Brown
22ce829645 moving all the strings to a dedicated libray/strings module 2022-09-01 14:58:07 +01:00
Adam Brown
177049ba91 merging with develop 2022-08-31 09:16:01 +01:00
Adam Brown
244aa094ef adding fragment testing dependency as a possible solution for missing jacoco agent on CI 2022-08-31 09:16:01 +01:00
Adam Brown
18a9846071 moving application based tests to the vector-app module
- they require the VectorApplication to trigger
2022-08-31 09:16:01 +01:00
Adam Brown
d2ca4edc6d lifting the application launcher colour to the application module 2022-08-31 09:16:01 +01:00
Adam Brown
c7f945c8b5 lifting the application config and icon to the application module 2022-08-31 09:16:00 +01:00
Adam Brown
4d3e21d046 reusing lint file 2022-08-31 09:16:00 +01:00
Adam Brown
117948f3f1 renaming output apks to match the previous name 2022-08-31 09:16:00 +01:00
Adam Brown
615ab414ff moving imports around to match application/library split 2022-08-31 09:16:00 +01:00
Adam Brown
f67ec6d14e copying the vector lint config for the top level application 2022-08-31 09:16:00 +01:00
Adam Brown
ad398d8caa moving font certs file to the module that uses it 2022-08-31 09:16:00 +01:00
Adam Brown
32b32376c9 updating artifact paths to match new module location 2022-08-31 09:16:00 +01:00
Adam Brown
1ff340b018 lifting the manifest provider references to the app module manifest 2022-08-31 09:16:00 +01:00
Adam Brown
c29e96ab46 reording import 2022-08-31 09:16:00 +01:00
Adam Brown
ddaaa1aaeb avoid clashing buildconfig and moving placeholders to the modules which uses them 2022-08-31 09:16:00 +01:00
Adam Brown
2e81056b1e adding library support for the android-stem plugin 2022-08-31 09:16:00 +01:00
Adam Brown
f0bc18d5ca introducing vector-app module to act as the top level application 2022-08-31 09:16:00 +01:00