Commit Graph

13525 Commits

Author SHA1 Message Date
Maxime NATUREL bf502f4f3d Set the corresponding deviceType icon in list item and in overview view 2022-10-05 10:14:03 +02:00
Jorge Martín ed545c7e2b Try to fix flaky RoomMemberListControllerTest 2022-10-05 08:50:12 +02:00
Jorge Martín 0b7e52e60b Fix EventHtmlRendererTest 2022-10-05 07:46:05 +02:00
ericdecanini 034046701d Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881
# Conflicts:
#	vector/src/test/java/im/vector/app/test/fakes/FakeCryptoService.kt
2022-10-04 14:05:23 -04:00
Benoit Marty 4974fdf905
Merge pull request #6633 from Benjiko99/feature/incognito-keyboard
Add privacy setting to disable personalized learning by the keyboard
2022-10-04 18:22:22 +02:00
SpiritCroc af9548dfdd
Support inline images in the timeline (#5877)
* Support inline images in the timeline

Co-authored-by: Benoit Marty <benoitm@matrix.org>
2022-10-04 17:59:52 +02:00
Benoit Marty 2cb16d9f11
Merge pull request #6215 from networkException/fix-animated-only-fetching-thumbnail
Fix animated images only autoplaying sometimes
2022-10-04 17:44:25 +02:00
Benoit Marty ca6813b5d8
Merge pull request #6906 from bwi-de/develop
Clean up pin code key and biometrics key on logout
2022-10-04 16:19:03 +02:00
Benoit Marty 304fb09f57
Merge pull request #6757 from eidonia/bugfix/#5029-disbale-emoji-keyboard-not-applies-reply
[Bugfix #5029] disable emoji keyboard not applies to reply
2022-10-04 16:16:36 +02:00
Benoit Marty 8311138bf1
Merge pull request #6762 from rudmannn/develop
replace android:gravity for backward compatibility
2022-10-04 16:14:41 +02:00
Benoit Marty 17cd2a3302
Merge pull request #7266 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-reflect-1.7.20
Bump kotlin-reflect from 1.7.10 to 1.7.20
2022-10-04 16:06:25 +02:00
Onuray Sahin 6fbdd87dcf Create custom view for header section. 2022-10-04 17:05:42 +03:00
Jorge Martín 8d54a0d759 Remove Robolectric, make Robolectric test an instrumentation test 2022-10-04 14:15:54 +02:00
Yoan Pintas ef82cc6aa7
Merge pull request #7225 from vector-im/yostyle/fix_strandhogg_detection
Add Activities of android permission controller in the whitelist
2022-10-04 11:51:06 +02:00
Nikita Fedrunov 8eea2ef923
fixing bug when room list is not updated being on background (#7278) 2022-10-04 11:29:34 +02:00
Florian Renaud 8e3b9735c1
Merge pull request #7258 from vector-im/feature/fre/voice_broadcast_feature_flag
Voice Broadcast - Add a feature flag with the composer action
2022-10-04 11:25:33 +02:00
ericdecanini d14570dbea Replaces AppBuildConfig 2022-10-03 17:52:59 -04:00
Maxime NATUREL 07a2e3254a
Merge pull request #7110 from vector-im/feature/mna/devices-learn-more-bottom-sheet
[Device Management] Learn more bottom sheets (PSG-715)
2022-10-03 17:39:41 +02:00
Benoit Marty e282380ab8 Naming convention: Epoxy item classes have `Item`suffix 2022-10-03 16:48:34 +02:00
Benoit Marty 24fe677e50 Remove usage of @JvmField in Epoxy Items.
Fix error `error: annotation type not applicable to this kind of declaration`
2022-10-03 16:48:34 +02:00
Benoit Marty 8e375a7fb2 Fix issue with expected types. 2022-10-03 16:45:23 +02:00
Benoit Marty cba920f3e5 Enable Ksp for Epoxy Processor 2022-10-03 16:45:23 +02:00
Onuray Sahin 06c0d615a2 Create base classes. 2022-10-03 13:55:46 +03:00
Nikita Fedrunov 9f8c7688bf
added analytics for app layout (#7242) 2022-10-03 11:47:58 +02:00
Benoit Marty 8fd0107d84
Merge pull request #7256 from vector-im/feature/bma/fix_manifest_warning
Fix compilation warning when manifest are merged.
2022-10-03 11:16:25 +02:00
Valere 005e712396
Merge pull request #6703 from vector-im/feature/bca/crosssigning_reset_warning
warn on cross signing reset
2022-10-03 09:25:52 +02:00
Florian Renaud 2bc08069cc Add Voice Broadcast action in the composer 2022-10-03 09:25:03 +02:00
Florian Renaud 0b0ea64a4b Add Voice Broadcast feature flag 2022-10-03 09:25:02 +02:00
Onuray Sahin d0dd446af8
Merge pull request #7247 from vector-im/feature/ons/parse_user_agent
[Device Manager] Parse user agents (PSG-762)
2022-09-30 18:36:33 +03:00
Onuray Sahin ea8dc45796 Parse browser version. 2022-09-30 17:08:35 +03:00
Valere 59afe434f8 more tests 2022-09-30 16:00:34 +02:00
Valere ac0e5e9dec fix broken test, userId confustion
cleaning


cleaning


add tests


cleaning
2022-09-30 16:00:34 +02:00
Valere c8f0792997 warn on cross signing reset 2022-09-30 16:00:34 +02:00
Onuray Sahin bf4576d155 Code review fixes. 2022-09-30 13:21:44 +03:00
Jorge Martín 570bc57cc6 Restore `validateEpoxyModelUsage` annotation processing arg 2022-09-30 09:44:23 +02:00
Jorge Martín f5cb980020 Fix dependencies and code issues 2022-09-30 09:39:01 +02:00
dependabot[bot] 1db669d1c2
Bump kotlin-reflect from 1.7.10 to 1.7.20
Bumps [kotlin-reflect](https://github.com/JetBrains/kotlin) from 1.7.10 to 1.7.20.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-reflect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-29 23:21:58 +00:00
Onuray Sahin 0f8637bc7a Lint fix. 2022-09-29 17:57:22 +03:00
Onuray Sahin 81e8ddf832 Code review fixes. 2022-09-29 17:40:26 +03:00
Onuray Sahin 6d459a0bc9 Code review fixes. 2022-09-29 17:35:47 +03:00
SpiritCroc 1b8d2d2e4f Get updated BetterLinearLayoutManager to compile again
Change-Id: I93ec0f70defddd0f5df9e50909dfbc591f9bce11
2022-09-29 14:43:33 +02:00
Maxime NATUREL 28dee84aee Rename sessions screen learn more 2022-09-29 14:06:45 +02:00
Maxime NATUREL 20a24162f4 Updating texts + other sessions list screen learn more 2022-09-29 14:06:45 +02:00
Maxime NATUREL c356c8090b Removing other sessions section learn more 2022-09-29 14:06:45 +02:00
Maxime NATUREL acba3f2aa4 Updating learn more strings 2022-09-29 14:06:45 +02:00
Maxime NATUREL 5704dd4f43 Fix wrong import order 2022-09-29 14:06:44 +02:00
Maxime NATUREL 28b30e4e4f Fix after rebase issue 2022-09-29 14:06:44 +02:00
Maxime NATUREL e986d7805e Fixing after rebase issues 2022-09-29 14:06:44 +02:00
Maxime NATUREL d1bc7d591f Revert changes to translations 2022-09-29 14:06:44 +02:00
Maxime NATUREL 87e1b53c6e Fix coding style 2022-09-29 14:06:44 +02:00
Maxime NATUREL 51532687b9 Learn more in session overview screen 2022-09-29 14:06:44 +02:00
Maxime NATUREL 400b1b0697 Adding handle at top 2022-09-29 14:06:44 +02:00
Maxime NATUREL 97cdda45d6 Adding close button 2022-09-29 14:06:44 +02:00
Maxime NATUREL 648311e2b1 Show basic bottom sheet when pressing learn more link from other sessions section 2022-09-29 14:06:44 +02:00
Maxime NATUREL 1d11eae0cc Removing learn more link from security header 2022-09-29 14:06:44 +02:00
SpiritCroc 4b32e30cff Update LinearLayoutManager from upstream androidx
From https://android.googlesource.com/platform/frameworks/support

Current changes after 1.2.0:
09993fadf2b02004c3fb907266f20519fee154b7..1c6478826f160c1bb67cf5c219083fbc79d2da36

Particularly interesting from the commit history:
"Fixed anchor bug when stack from end."

Change-Id: I8dc69d8e9ac74a5c5e1ba5f59e0b6223b275f1eb
2022-09-29 13:54:15 +02:00
SpiritCroc 3e8b320fef Emoji verification: green instead of accent to accept
Change-Id: I4fe7e8e8ec8c11447cbcb97aa0feabfb3f92aa48
2022-09-29 12:50:16 +02:00
Onuray Sahin 38cd2be332 Fix broken tests. 2022-09-29 13:28:46 +03:00
Benoit Marty 214867ad0e
Merge pull request #7248 from vector-im/feature/bca/hotfix_1.5.1_merge
Feature/bca/hotfix 1.5.1 merge back from main
2022-09-29 11:58:36 +02:00
Maxime NATUREL 75a381ea0d
Merge pull request #7243 from vector-im/feature/mna/device-manager-signout-session
[Device management] Sign out a session (PSG-742)
2022-09-29 11:43:56 +02:00
Benoit Marty 11cdf8ea9c
Merge pull request #7223 from vector-im/feature/bca/fix_new_layout_list_flickering
Fix new layout flicker/leaks
2022-09-29 11:39:34 +02:00
Onuray Sahin 8663fe8c74 Add tests for unknown user agents. 2022-09-29 12:35:15 +03:00
Onuray Sahin 4c173a79ae Lint fixes. 2022-09-29 11:40:15 +03:00
Onuray Sahin c16b5d674c Add more user agent support. 2022-09-29 11:36:38 +03:00
Maxime NATUREL 082fa1e69e Adding confirmation dialog for all type of sessions 2022-09-29 10:27:13 +02:00
Valere 803eff9ad1 Fix not exhaustive when 2022-09-29 09:45:18 +02:00
Benoit Marty f4674b17d6 Fix compilation warning. The Jitsi library does not include these permissions anymore. 2022-09-29 09:44:46 +02:00
Valere 8132a7902b post merge code quality 2022-09-29 09:21:06 +02:00
Valere ce86e29122 Merge branch 'main' into develop 2022-09-28 18:16:39 +02:00
Onuray Sahin 5666383134 Add unit test for desktop and web user agents. 2022-09-28 18:19:25 +03:00
Maxime NATUREL e47bf2b200 Adding unit tests for reAuth needed case 2022-09-28 16:45:06 +02:00
Valere 5c442296ef Security fix CVE-2022-39246 CVE-2022-39248 2022-09-28 16:26:47 +02:00
SpiritCroc bee145f951 [merge] Add missed MessageActions shield
Change-Id: I3cf37f8ecac6c8b581c28f39fb4bc008435d34cb
2022-09-28 15:19:07 +02:00
Onuray Sahin 41643ffb53 Add unit test for iOS user agents. 2022-09-28 15:00:16 +03:00
Onuray Sahin 2bcf0c307d Add unit test for Android user agents. 2022-09-28 14:59:56 +03:00
Onuray Sahin 04a305b403 Refactor user agent parsing. 2022-09-28 14:32:20 +03:00
SpiritCroc 0b917fc935 [sec-merge related] Render encryption warnings for all layouts again
Change-Id: I3af2a350af2988803f7114d1652a85dd3f75681d
2022-09-28 11:58:01 +02:00
SpiritCroc 97d0dbcfb8 [merge] Fix NoticeItem compile
Change-Id: I536e759913715c0aa627fc60cda9a5453bc8a243
2022-09-28 10:52:17 +02:00
SpiritCroc 87eaf85224 Security patch v1.5.1
Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt

Change-Id: I0c8f5e098f92d0bf42e5ddc41bb6ad43c69bfdd2
2022-09-28 10:41:00 +02:00
Maxime NATUREL 68d9f672c5 Unit tests for after reAuth 2022-09-27 15:04:34 +02:00
Maxime NATUREL dafa98eb77 Unit tests for signout error cases 2022-09-27 15:04:34 +02:00
Maxime NATUREL 89cf8ee8ec Unit test for signout success 2022-09-27 15:04:34 +02:00
Maxime NATUREL da3d3308b4 Fix unit tests in ViewModel 2022-09-27 15:04:34 +02:00
Maxime NATUREL 68bee65e97 Confirm signout when it is current session 2022-09-27 15:04:34 +02:00
Maxime NATUREL 0fe5ee68f2 Unit tests for interception of signout process result 2022-09-27 15:04:34 +02:00
Maxime NATUREL 8d870b8220 Replace IsCurrentSessionUseCase by using DeviceFullInfo field 2022-09-27 15:04:34 +02:00
Maxime NATUREL 04ad2daa80 Unit tests for signout use case 2022-09-27 15:04:34 +02:00
Maxime NATUREL bf42220422 Unit tests for view navigator 2022-09-27 15:04:34 +02:00
Maxime NATUREL 0c708c0ad4 Fix after rebase property qualifier 2022-09-27 15:04:34 +02:00
Maxime NATUREL d6bb6efb1d Loading dialog during signout process 2022-09-27 15:04:34 +02:00
Maxime NATUREL b2b3ee1fe5 Adding button to trigger sign out 2022-09-27 15:04:33 +02:00
Maxime NATUREL 7e81aa6193 ReAuth process 2022-09-27 15:04:33 +02:00
Maxime NATUREL 5380c30780 Adding signout action and corresponding use cases 2022-09-27 15:04:33 +02:00
Onuray Sahin 3e66a6538e Implement use case to parse user agent. 2022-09-27 15:45:34 +03:00
Adam Brown d308b72868
Merge pull request #7129 from vector-im/feature/adm/screenshot-testing-example-test
Example screenshot test
2022-09-27 12:02:38 +01:00
Adam Brown 28f4e79b43 attempting to use 0% difference for screenshot verification
- this may cause false errors with the navigation/status bar https://github.com/cashapp/paparazzi/issues/453#issuecomment-1254001714
2022-09-27 10:16:45 +01:00
Benoit Marty 4d09f0888d
Merge pull request #7231 from pt2121/pt/12-flip-table
Add support for `/tableflip` command (#12)
2022-09-27 11:11:08 +02:00
yostyle 8dc71e07ed Add activities from Android API 33. 2022-09-27 00:24:33 +02:00
yostyle dc1abb7978 Add Activities of android permission controller in the whitelist 2022-09-27 00:24:33 +02:00
ganfra bf405394d8 Home room list: make some clean up 2022-09-26 19:36:50 +02:00
Adam Brown 08c79a798e
Merge pull request #7115 from vector-im/docs/unit-testing
[docs] Unit testing documentation
2022-09-26 16:51:42 +01:00
Prat T 3f9b9827bd
Add support for `/tableflip` command (#12)
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
2022-09-26 07:25:34 -07:00
Adam Brown be1e8a8ef8 adding and recording example paparazzi test 2022-09-26 14:14:03 +01:00
Onuray Sahin c70b6206d0 Add user agent into device info. 2022-09-26 14:39:23 +03:00
Adam Brown 59e7b70b03
Merge pull request #7128 from vector-im/feature/adm/screenshot-testing-setup
Paparazzi screenshot testing setup
2022-09-26 12:01:01 +01:00
Jorge Martín 90e4760ee7 Fix VoiceRecorderLTests by faking OggOpusEncoder 2022-09-26 11:32:29 +02:00
Adam Brown 0f19726fe2 creating custom tasks to record and verify screenshot
- introduces a 'screenshot' flag to include/exclude the screenshot tests from the default test runs
2022-09-26 10:26:38 +01:00
Adam Brown c66a38057e adding paparazzi screenshot testing lib setup 2022-09-26 10:26:38 +01:00
Adam Brown 2c1eef7a59
Merge pull request #7142 from vector-im/feature/adm/dialpad-lib
Manually including `im.dlg:android-dialer:1.2.5`
2022-09-26 10:14:56 +01:00
Maxime NATUREL 7a4bf83da0 Fix lint issue 2022-09-26 09:46:58 +02:00
Maxime NATUREL fd85ad0f1b Add Init action + corresponding initialized event 2022-09-26 09:46:58 +02:00
Maxime NATUREL e437c9e131 Updating info icon tint color 2022-09-26 09:46:58 +02:00
Maxime NATUREL 5de097e251 Adding warning info view 2022-09-26 09:46:58 +02:00
Maxime NATUREL bd9b843df7 Focus on edit text + open keyboard when landing on screen 2022-09-26 09:46:58 +02:00
Maxime NATUREL 5498a7e96e Adding unit tests for view model 2022-09-26 09:46:58 +02:00
Maxime NATUREL c96d671e6b Adding unit tests for navigator 2022-09-26 09:46:58 +02:00
Maxime NATUREL 4a3966d4f5 Improve rename session use case and add tests 2022-09-26 09:46:58 +02:00
Maxime NATUREL d7afea7b3a Rename session use case 2022-09-26 09:46:58 +02:00
Maxime NATUREL b134d35dd6 Adding save button and view actions 2022-09-26 09:46:58 +02:00
Maxime NATUREL 33cf3d3032 Setup a custom toolbar 2022-09-26 09:46:58 +02:00
Maxime NATUREL 7eab37e9d1 Small renaming of navigator method 2022-09-26 09:46:58 +02:00
Maxime NATUREL c3d359e58f Adding edit text into the screen 2022-09-26 09:46:58 +02:00
Maxime NATUREL 54aec63f6c Small improvement in code readability 2022-09-26 09:46:58 +02:00
Maxime NATUREL 82fabf4a85 Adding menu with rename action in session overview screen 2022-09-26 09:46:58 +02:00
Maxime NATUREL 3de96a3a0c Adding new method into navigator 2022-09-26 09:46:58 +02:00
Maxime NATUREL 1091ae41ad Default structure for the new code 2022-09-26 09:46:58 +02:00
Artjom König 2dda8af776
Merge branch 'vector-im:develop' into develop 2022-09-26 08:52:08 +02:00
ericdecanini 40c2e95a54 Adds PushersManagerTest 2022-09-25 11:58:02 -04:00
Tomáš Beňo 079a2f5351 Hide Incognito Keyboard setting on unsupported devices 2022-09-25 14:56:20 +02:00
Tomáš Beňo e5cf431cc7 Apply imeOptions to ComposerEditText without overriding previously set options 2022-09-25 14:42:07 +02:00
Tomáš Beňo 79e4a435da Add privacy setting to disable personalized learning by the keyboard 2022-09-25 13:23:32 +02:00
ericdecanini f724751c86 Adds new pusher fields to Notification Targets screen 2022-09-23 11:03:56 -04:00
Maxime NATUREL c9eaf30057 Updating the log in ssoAuthDone method to improve privacy 2022-09-23 16:39:41 +02:00
Maxime NATUREL 854a604fbe Fix missing loading ViewEvent 2022-09-23 16:39:41 +02:00
Maxime NATUREL 99c2088d0e Using UiaCancelledException on reAuth cancellation 2022-09-23 16:39:41 +02:00
Maxime NATUREL 0d7d841d73 Adding unit tests 2022-09-23 16:39:41 +02:00
Maxime NATUREL 892fd4445c Mutualize pending auth handling 2022-09-23 16:39:41 +02:00
SpiritCroc 00e5853081 [merge] Never show Element's release notes
Change-Id: I37d761d7602c16511c907a7d41e09c42c880afb6
2022-09-23 16:32:05 +02:00
SpiritCroc bb6595110b Merge tag 'v1.5.0' into merge-v1.5.0
Change-Id: Ifaa56941340ac1774d8b7bd470e32c5203d15f69

Conflicts:
	library/ui-styles/src/main/res/values/colors.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
	vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteEmojiDataItem.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/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/menu/menu_new_home.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-09-23 16:28:00 +02:00
ericdecanini 52171ef748 Changes deviceDisplayName on pusher to use device model name 2022-09-23 09:36:53 -04:00
Onuray Sahin 7cd30a1ed4 Merge branch 'develop' into feature/ons/device_manager_security_sessions 2022-09-23 16:16:49 +03:00
Benoit Marty 4fb7154f2b
Merge pull request #7187 from vector-im/dependabot/gradle/com.github.UnifiedPush-android-connector-2.1.0
Bump android-connector from 2.0.1 to 2.1.0
2022-09-23 15:13:59 +02:00
Benoit Marty 97b3b2363b Disable not passing VoiceRecorderLTests, for the time we are investigating the issue. 2022-09-23 14:09:44 +02:00
Valere 2ea357ddc0 Fix new layout flicker/leaks 2022-09-23 12:12:14 +02:00
ericdecanini 75935c824b Implements MSC3881 (enabled and device_id fields for Pusher API) 2022-09-22 20:35:04 -04:00
ganfra 40e304a4ff Merge branch 'main' into develop 2022-09-22 18:18:26 +02:00
ganfra 8d94643ff7 RoomList: revert changes on LiveData and fix previous issues (not updated list) 2022-09-22 18:17:55 +02:00
Benoit Marty 60bfd0dd42
Merge pull request #7159 from vector-im/feature/bma/fix_new_lint_warning
Fix lint warning
2022-09-22 17:35:10 +02:00
Benoit Marty f4c5cba020
Merge pull request #7126 from vector-im/feature/bma/arch_doc
Architecture doc
2022-09-22 16:41:17 +02:00
Benoit Marty 3600e374f2 Avoid code duplication 2022-09-22 16:34:07 +02:00
Benoit Marty 0559911f39 Fix non passing tests 2022-09-22 16:34:07 +02:00
Benoit Marty 7f5c712e88 No need to use `@SuppressLint("NewApi")` when `@ChecksSdkIntAtLeast` is used - more cleanup 2022-09-22 16:34:07 +02:00
Benoit Marty 658a09ea6a No need to use `@SuppressLint("NewApi")` when `@ChecksSdkIntAtLeast` is used. 2022-09-22 16:32:14 +02:00
Benoit Marty 5886245bbf Reverse condition for code clarity with `ChecksSdkIntAtLeast` 2022-09-22 16:32:14 +02:00
Benoit Marty 2bda97224c Cleanup 2022-09-22 16:32:14 +02:00
Benoit Marty c735ea5e3d Remove duplication between `KeysBackupBanner.State` and `ServerBackupStatusViewModel.BannerState` and move the some logic to the ViewModel 2022-09-22 16:32:14 +02:00
Benoit Marty b4494ee8ea Remove `DefaultSharedPreferences` since we now have @DefaultPreferences which provide a singleton.
Some fun has been moved to injectable classes due to this change. Not compiling, still work to do, but I prefer to split into 2 separate commits.
2022-09-22 16:32:14 +02:00
Benoit Marty 5736c8f648 Remove `DefaultSharedPreferences` since we now have @DefaultPreferences which provide a singleton.
Some fun has been moved to injectable classes due to this change. Not compiling, still work to do, but I prefer to split into 2 separate commits.
2022-09-22 16:32:14 +02:00
Benoit Marty 0324927b04 Create VectorLocaleProvider, to just read the current Locale from the SharedPreference 2022-09-22 16:32:14 +02:00
Benoit Marty d8436874e2 Fix `StaticFieldLeak` issue (context).
Make VectorLocal an injectable class.
2022-09-22 16:32:14 +02:00
Benoit Marty 7e8a39e6de Suppress `LaunchActivityFromNotification`. This is fine here, this is the notification for the diagnostic, we do not want to start an Activity. 2022-09-22 16:32:14 +02:00
Benoit Marty 832a472b57 Add `@ChecksSdkIntAtLeast` annotation, to be able to remove `AndroidVersionTestOverrider` 2022-09-22 16:32:14 +02:00
Benoit Marty bb2eb56ee6 Add `@ChecksSdkIntAtLeast` annotation. 2022-09-22 16:32:14 +02:00
Benoit Marty 1ff4a5f212 Ignore `AlwaysShowAction` lint issue. Also make it an error, so that developer has to explicitly disable the warning. 2022-09-22 16:32:14 +02:00
dependabot[bot] 2aa9382fba
Bump android-connector from 2.0.1 to 2.1.0
Bumps [android-connector](https://github.com/UnifiedPush/android-connector) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/UnifiedPush/android-connector/releases)
- [Commits](https://github.com/UnifiedPush/android-connector/compare/2.0.1...2.1.0)

---
updated-dependencies:
- dependency-name: com.github.UnifiedPush:android-connector
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-22 14:31:16 +00:00
Benoit Marty 151f6245db
Merge pull request #6929 from vector-im/feature/bma/android12
Target API 32 (Android 12)
2022-09-22 16:30:04 +02:00
Benoit Marty e98bfe5c9b
Merge pull request #7156 from vector-im/feature/mna/device-manager-verify-other-session
[Device management] Verify another session (PSG-722)
2022-09-22 11:46:28 +02:00
Benoit Marty 4e30bc86b8
Merge pull request #7139 from vector-im/feature/mna/device-manager-verify-current-session
[Device management] Verify current session (PSG-722)
2022-09-22 11:46:07 +02:00
ganfra feb33ce32b Translation: cleanup remaining TODOs 2022-09-21 19:43:47 +02:00
ganfra 03d843ac51 Rename device_manager strings 2022-09-21 18:04:32 +02:00
Benoit Marty b9c28ba4ce
Merge branch 'develop' into feature/bma/android12 2022-09-21 16:24:30 +02:00
Onuray Sahin 793138bf1b Revert changes of string keys. 2022-09-21 16:44:47 +03:00
Onuray Sahin 8de9ef8c7d Code review fixes. 2022-09-21 14:30:24 +03:00
Onuray Sahin 4ab798f88d Code review fixes. 2022-09-21 14:16:51 +03:00
Benoit Marty d31d833959
Merge pull request #7180 from vector-im/feature/fre/deferred_dm_labs_flag
Deferred DMs - Add and enable the feature by default in the labs settings
2022-09-21 12:17:19 +02:00
NIkita Fedrunov d8060a7922 review fixes 2022-09-21 11:28:21 +02:00
NIkita Fedrunov 602b378b65 cancel flow when order is changed 2022-09-21 10:43:08 +02:00
Florian Renaud fa8b56b1ad Restore tracking for deferred DMs 2022-09-21 09:36:07 +02:00
Florian Renaud dd92bb756a Add visibility setting field for lab setting 2022-09-21 09:36:07 +02:00
Florian Renaud e9d809d9c3 Move and enable deferred DMs into labs settings 2022-09-21 09:36:07 +02:00
ericdecanini 1a93bbf92f Renames roomsPagedList 2022-09-20 18:32:59 -04:00
ericdecanini fe1e74fa06 Fixes room list not getting updated when not in focus 2022-09-20 18:22:39 -04:00
Onuray Sahin 45cf7dcd63 Merge branch 'develop' into feature/ons/device_manager_security_sessions 2022-09-20 17:11:51 +03:00
Onuray Sahin 3ea054f8e1 Fix unit test. 2022-09-20 15:06:52 +03:00
Florian Renaud 8624199be3
Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout
Deferred DMs - Handle the local rooms within the new AppLayout
2022-09-20 10:53:51 +02:00
Maxime NATUREL 943ec7ee75 Reducing argument number in session info view update method 2022-09-20 10:46:10 +02:00
Maxime NATUREL 72637b465f Using viewState value to check if it is current session 2022-09-20 10:46:10 +02:00
Maxime NATUREL aa7f7d7111 Fix after rebase 2022-09-20 10:46:10 +02:00
Maxime NATUREL 17bb14c1dc Fixing coding style issues 2022-09-20 10:46:10 +02:00
Maxime NATUREL 921533e4b2 Getting the current session verification status to change verify button visibility 2022-09-20 10:46:10 +02:00
Maxime NATUREL 95d133e0e2 Moving some components inside the verification package 2022-09-20 10:46:10 +02:00
Maxime NATUREL a6cb25d0c3 Verification of another session 2022-09-20 10:46:10 +02:00
Maxime NATUREL 54a4dc7e9a Inverting some arguments to ease readability 2022-09-20 10:45:47 +02:00
Maxime NATUREL cf6b8d76a8 Removing non necessary session id arg from ViewAction 2022-09-20 10:45:46 +02:00
Maxime NATUREL e0c4706cf9 Removing non necessary session arg from ViewEvent 2022-09-20 10:45:46 +02:00
Maxime NATUREL 584c699409 Verify current session in Session overview screen 2022-09-20 10:45:46 +02:00
Maxime NATUREL 32b5606498 Fixing missing event to start verification process 2022-09-20 10:45:46 +02:00
Maxime NATUREL 35db958279 Adding unit tests for new action in DevicesViewModel 2022-09-20 10:45:46 +02:00
Maxime NATUREL d826327773 Adding unit tests for CheckIfCurrentSessionCanBeVerifiedUseCase 2022-09-20 10:45:46 +02:00
Maxime NATUREL 8cd7b0744a Verification process for the current Session 2022-09-20 10:45:46 +02:00
Maxime NATUREL 5759a0f7da Adding click listeners on verify button 2022-09-20 10:45:46 +02:00
Nikita Fedrunov b4f7302057
release notes screen now properly shown on update to a version with app layout labs flag enabled by default (#7175) 2022-09-19 22:35:15 +02:00
Nikita Fedrunov 6da6f6a7f4
add qr code option to home screen menu (#7177) 2022-09-19 22:34:56 +02:00
Florian Renaud b4ca16735d
Merge pull request #7125 from vector-im/feature/fre/start_dm_loading
Deferred DM - Add a loading wheel while creating the DM
2022-09-19 17:04:56 +02:00
Florian Renaud 8999b40c1a Add action for local rooms deletion 2022-09-19 15:58:14 +02:00
Florian Renaud df3fd6f691 Remove unused import 2022-09-19 15:58:14 +02:00
Florian Renaud 14d2aec506 Start DM - Handle the local rooms within the new AppLayout 2022-09-19 15:58:14 +02:00
Nikita Fedrunov 830e5ffa9f
room summary now has constant height (#7145) 2022-09-19 15:22:16 +02:00
Onuray Sahin 2ad0cd46bb Fix unit tests. 2022-09-19 16:18:30 +03:00
Onuray Sahin ec9843fb53 Fix unverified session detection logic. 2022-09-19 15:38:02 +03:00
Onuray Sahin 7db222af0c Render security recommendation sessions. 2022-09-19 15:37:13 +03:00
Onuray Sahin 740b69d48c Make other sessions view dynamic. 2022-09-19 13:42:30 +03:00
Benoit Marty e2d131fc4f Move xml resource in the module where they are used to avoid lint false positive `UnusedResources` issues. 2022-09-19 11:56:40 +02:00
Onuray Sahin 32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03:00
Florian Renaud e2f0e14133 Start DM - Add loading wheel while creating the room 2022-09-19 09:38:05 +02:00
bmarty 925fffac45 Sync Emojis 2022-09-19 00:03:51 +00:00
SpiritCroc cffa41da95 Disable firebase appdistribution
We don't want to use it.
And we do not want the REQUEST_INSTALL_PACKAGES permission from that.

Change-Id: I82aeab98116bebeface33667e604300df0a71fa7
2022-09-17 10:29:54 +02:00
Benoit Marty 842a9bbd55 Add dataExtractionRules, applicable to Android 12. Exclude everything from being backed up. Also properly support Android 11. 2022-09-16 23:01:29 +02:00
Benoit Marty 88482c9b2e Reduce level API check, this seems not necessary. 2022-09-16 23:00:39 +02:00
Benoit Marty 536b9cf926 Move `@Suppress("DEPRECATION")` closer to the deprecated usage. Will help to detect other deprecated API usage. 2022-09-16 23:00:39 +02:00
Benoit Marty 24e4f94e61 Stop using deprecated method. 2022-09-16 23:00:39 +02:00
dependabot[bot] d9ee51a212 Bump emoji2 from 1.1.0 to 1.2.0
Bumps emoji2 from 1.1.0 to 1.2.0.

---
updated-dependencies:
- dependency-name: androidx.emoji2:emoji2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-16 23:00:39 +02:00
Benoit Marty 73e061e472
Merge pull request #7130 from vector-im/feature/bma/fix_verification
Fix empty verification bottom sheet
2022-09-16 19:00:39 +02:00
Benoit Marty a919989fd4
Merge pull request #7132 from vector-im/bugfix/eric/dismiss-new-chat
Adds dismissal to new chat bottom sheet actions
2022-09-16 18:14:08 +02:00
Adam Brown 0385f387d9 using value notion instead of key for the elements in the circular cache 2022-09-16 16:34:42 +01:00
Onuray Sahin 6823258abb Add test for view navigation. 2022-09-16 17:41:51 +03:00
Adam Brown 739a513f89 moving external library modules to an external directory 2022-09-16 15:15:32 +01:00
Adam Brown 5058f942af manually including the im.dlg:android-dialer:1.2.5
- avoids using appcompat
- avoids using an artifact without a source repository
2022-09-16 15:15:32 +01:00
Onuray Sahin 61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml
2022-09-16 15:25:09 +03:00
Onuray Sahin eb5253ab1a Refactor duplicated code. 2022-09-16 14:51:40 +03:00
Onuray Sahin e87d4db72c Refactor duplicated code. 2022-09-16 14:42:20 +03:00
Adam Brown 11e6ca1784 moving the jitsi exclude directly to the dependency so that other modules also get the exclusion
- also excludes the support dependency from the barcode scanner
2022-09-16 12:16:03 +01:00
Adam Brown be9c9f1640 formatting 2022-09-16 11:37:39 +01:00
Adam Brown 4e99217164 excluding jitsi's android-scalablevideoview fork's support library
- The library exports a jetified artifact but doesn't remove the support library dependency /home/adam/dev/element/element-android/vector/build.gradle
2022-09-16 11:37:39 +01:00
Adam Brown c61df899b4 removing unused dependency 2022-09-16 11:37:39 +01:00
Adam Brown ca92ad267d excluding compile time legacy support annotations from dependencies 2022-09-16 11:37:38 +01:00
Onuray Sahin e2313ad1cd Implement unit tests. 2022-09-16 13:05:06 +03:00
Adam Brown b05d52bb6d
Merge pull request #6788 from vector-im/feature/adm/app-level-variant-v2
`:vector-app` level variants
2022-09-16 10:36:58 +01:00
Florian Renaud 0ce72057dc
Merge pull request #7123 from vector-im/bugfix/fre/start_dm_room_list_glitch
Start DM - Fix glitch in the room list
2022-09-15 16:55:47 +02:00
Onuray Sahin fd9dca9621 Fix existing tests. 2022-09-15 17:39:08 +03:00
SpiritCroc 1746121b54 Add settings menu item to new app layout options menu
It's not clear on first sight that you have to click your avatar for
that.

Change-Id: I94a6d1eac74eb2eecefc17f3b5ece19cd2dbce20
2022-09-15 16:31:18 +02:00
SpiritCroc 3c8eb0e0e5 Respect spaces back navigation preference in new app layout
Change-Id: I1c11b0621160317c868de125a9ffe9ef4e303c28
2022-09-15 16:28:57 +02:00
SpiritCroc 401a7f5f7d Add new app layout debug quick setting
Change-Id: Ib188f7093e2fd640734b0fdeefb4d90a8fd1dd48
2022-09-15 16:20:11 +02:00
Adam Brown 60b164a447 using fully qualified path to test activity, fixes missing reference 2022-09-15 15:17:11 +01:00
ericdecanini 13b1722060 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
2022-09-15 10:05:13 -04:00
Eric Decanini 01e1d74c72
Merge pull request #7103 from vector-im/bugfix/eric/landscape-bottom-sheet-peek
[New Layout] Adds peek height (min height) to new layout bottom sheets
2022-09-15 10:03:11 -04:00
Adam Brown e9d15b46d8 lifting the activity alias entry to the application module
- fixes the androidTests expecting a shortcuts xml
2022-09-15 14:50:08 +01:00
Adam Brown 1d50bbdbda fixing manifest imports and giving androidTest its own dedicated manifest 2022-09-15 14:50:08 +01:00
Adam Brown 3a38898961 lifting fdroid and gplay variants to the application module 2022-09-15 14:50:08 +01:00
Adam Brown 373a0ca4fb split commit to make debug changes to avoid files being seen as new! 2022-09-15 14:50:08 +01:00
Adam Brown 5d533d4ec9 lifting debug build type to the application module 2022-09-15 14:50:08 +01:00
Adam Brown a947a53e14 lifting the release build type to the application module 2022-09-15 14:50:08 +01:00
Adam Brown b72a174edf lifting nightly to the application module 2022-09-15 14:50:08 +01:00
Florian Renaud 6c9ae331e3 transform list to iterable 2022-09-15 15:16:51 +02:00
Onuray Sahin 3e0f76a362 Code review fix. 2022-09-15 15:38:37 +03:00
Onuray Sahin e3ee59f6c1 Refactor naming of strings. 2022-09-15 15:34:59 +03:00
Onuray Sahin 81cc8ab98b Code review fixes. 2022-09-15 15:14:46 +03:00
SpiritCroc 3719a89015 Debug info on screen: show displayIndex also when rendering hidden events
Change-Id: If5382964e9969cdf0e04deb18fa9c951967356d3
2022-09-15 12:57:16 +02:00
Benoit Marty 3ddaf0c51f Ensure `MatrixItem.UserItem` is not null at other places 2022-09-15 11:29:38 +02:00
ericdecanini 283686a9d8 Adds dismiss to new chat bottom sheet actions 2022-09-14 17:22:55 -04:00
Nikita Fedrunov 1d3c191153
scroll recents carouse to start when item added/moved to start (#7120) 2022-09-14 22:55:01 +02:00
Nikita Fedrunov 7631c7ac9f
room leaving prompt dialog now waits user to confirm leaving before do so (#7124) 2022-09-14 22:54:40 +02:00
Benoit Marty 92d7391232 `state.otherUserMxItem` cannot be null anymore.
Ensure the User is retrieved from the network, or fallback to a default User object.
2022-09-14 20:25:43 +02:00
Benoit Marty 6d2a9ec9d5 Prefer using `state.otherUserId` over nullable `state.otherUserMxItem?.id` 2022-09-14 19:05:38 +02:00
Benoit Marty 8623b85ac8 Add support to `/devtools` command 2022-09-14 17:49:55 +02:00
Benoit Marty 970abb4dde Rename file. 2022-09-14 16:53:38 +02:00
Florian Renaud 3b1599763c Start DM - Fix glitch by not showing the local rooms in the room list 2022-09-14 16:41:09 +02:00
ericdecanini 50b042ee98 Merge remote-tracking branch 'origin/develop' into bugfix/eric/landscape-bottom-sheet-peek
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
2022-09-14 09:46:43 -04:00
ericdecanini f4b5cfc71f Makes bottom sheets inherit VectorBaseBottomSheetDialogFragment 2022-09-14 09:46:00 -04:00
SpiritCroc ae3b771238 Add option to mark read chats while having open without reading
Change-Id: I75a136b1bdfd3e6667bb43b43ff8fcaab275e7d9
2022-09-14 15:39:32 +02:00
SpiritCroc 14b36b22d6 Hide suggestions menu entry also in new app layout
Change-Id: If836edc81457ff07d35cb2a22d8d12ba4e6047ce
2022-09-14 15:39:28 +02:00
ericdecanini e0f327e8f6 Removes unneeded code in BottomSheetDialog.kt 2022-09-14 09:37:42 -04:00
SpiritCroc 6e32e0f90f Fix some theming for Element's new layout
Change-Id: I9027d81a31f2a6a5393936ecf506099d38735b27
2022-09-14 10:37:56 +02:00
SpiritCroc 5c276966f4 [merge] Fix new layout crash
Change-Id: I662d6e394db1fb95181e7aa25ed82045495d8b41
2022-09-14 10:37:52 +02:00
SpiritCroc 49a9d17521 [merge] Re-enable new Element app layout
Change-Id: Ic777c319916e7474735f8afca86d8044b64e3910
2022-09-14 10:37:48 +02:00
Maxime NATUREL fb3fdf097c Reusing some existing strings 2022-09-14 10:31:22 +02:00
Maxime NATUREL a1bdfd1a5c Using shouldBeNull() method in unit tests 2022-09-14 10:31:22 +02:00
Maxime NATUREL 279820224c Long press on the whole content item 2022-09-14 10:31:22 +02:00
Maxime NATUREL 6cd0fbb614 Unit tests for the ViewModel 2022-09-14 10:31:22 +02:00
Maxime NATUREL c1dfa925c0 Unit tests for use cases to check visibility of sections 2022-09-14 10:31:22 +02:00
Maxime NATUREL 4205b4a777 Unit tests for session overview navigator 2022-09-14 10:31:22 +02:00
Maxime NATUREL 4cd81f194c Copy content to clipboard on long click on an item 2022-09-14 10:31:22 +02:00
Maxime NATUREL ecb7d77582 Hiding the last content item divider 2022-09-14 10:31:22 +02:00
Maxime NATUREL 30effb781b Fixing margins in list items 2022-09-14 10:31:22 +02:00
Maxime NATUREL 92888b666c Adding extra top margin between sections 2022-09-14 10:31:22 +02:00
Maxime NATUREL bf88c16c9d Show basic details info 2022-09-14 10:31:21 +02:00
Maxime NATUREL 94d1649ec9 Creation of header and content items 2022-09-14 10:31:21 +02:00
Maxime NATUREL c7099f53c1 Using camelCase syntax for view ids 2022-09-14 10:31:21 +02:00
Maxime NATUREL 51fba85a3a Using buildString{} inline method to improve readability 2022-09-14 10:31:21 +02:00
Maxime NATUREL 3970c2ec31 Using setTextOrHide() extension method inside SessionInfoView 2022-09-14 10:31:21 +02:00
Maxime NATUREL 15cf8b63a0 Using unwrap() extension method 2022-09-14 10:31:21 +02:00
Maxime NATUREL 9553fe0648 Using a ScrollView for the Session overview screen 2022-09-14 10:31:21 +02:00
Maxime NATUREL a661f9c3fb Navigation from session overview to session details 2022-09-14 10:31:21 +02:00
Maxime NATUREL 4a89fcea14 Adding basic structure for the new screen 2022-09-14 10:31:21 +02:00
Benoit Marty 8dbfafb324
Merge pull request #7102 from vector-im/feature/eric/double-space-click-fix
Fixes Crash On Double Click Of Space FABs
2022-09-14 10:15:08 +02:00
ericdecanini 34303c4a62 Removes inject constructor in NewChatBottomSheet 2022-09-13 16:27:29 -04:00
ericdecanini 85f16e8dfa Adds API 30 compatible method 2022-09-13 16:21:36 -04:00
Onuray Sahin 2763ebdd5a Merge branch 'develop' into feature/ons/device_manager_filter
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
2022-09-13 17:20:44 +03:00
Onuray Sahin b5c6f60ee6 Scroll to top on filter type changed. 2022-09-13 16:35:30 +03:00
Onuray Sahin 42ade670da Navigate to session details on click. 2022-09-13 13:47:38 +03:00
Onuray Sahin 0ec67c1ab8 Implement clear filter. 2022-09-13 13:10:03 +03:00
ericdecanini 8fc201121d Adds min height to new chat 2022-09-12 17:44:59 -04:00
ericdecanini 662d77cb7e Adds min height to space sheet 2022-09-12 17:40:22 -04:00
ericdecanini 8177d9777c Fixes crash on double click of space fabs 2022-09-12 12:26:57 -04:00
Benoit Marty 7f766eef2a
Merge pull request #7092 from pt2121/pt/5424-qr
Fix add by QR code layout (#5424)
2022-09-12 17:28:17 +02:00
Benoit Marty 6ac4d58636
Merge pull request #7098 from vector-im/sync-emojis
Sync Emojis
2022-09-12 17:24:58 +02:00
Benoit Marty ec0770434d
Merge pull request #7035 from vector-im/feature/bma/space_response_model
Space response model
2022-09-12 17:24:10 +02:00
Nikita Fedrunov da83a85f74
new app layout's room list overhaul (#7101) 2022-09-12 16:47:32 +02:00
bmarty 0c4707c315 Sync Emojis 2022-09-12 00:06:34 +00:00
SpiritCroc b7faa69834 [merge] Fix PromptSimplifiedModeFragment crash
Change-Id: I6b9cbb7f6950cf22c7dba3799e1b80b7df85f0b7
2022-09-11 19:44:36 +02:00
SpiritCroc 414881eb56 [merge] Fix mismerge causing spaceless launch to not load any rooms
Change-Id: Idde4f17babde5522e853c0f0bd7fdba2ed6f946d
2022-09-11 16:44:21 +02:00
SpiritCroc 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
SpiritCroc 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
SpiritCroc 8da289a0e7 [merge] Move strings that automatic merge missed
Change-Id: I5751d23bff3b119b45dcf0c939cf0f513af5e771
2022-09-11 09:50:18 +02:00
SpiritCroc 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
Prat T 73eb63a35e
Fix add by QR code layout (#5424)
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
2022-09-10 10:53:34 -07:00
SpiritCroc e314922280 [merge] Fix various crashes
Change-Id: I0e10d09e84771d79b8d54cd9b1239162cc19ceda
2022-09-10 15:55:49 +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
SpiritCroc c6c106399a Automatic revert to unchanged upstream strings, pt.1
Change-Id: I69b561bc7fd50532d7a39387c79794ba2a4b5fdb
2022-09-10 09:31:51 +02:00
Benoit Marty e19647f6ca Firebase provides Map<String, String?> 2022-09-09 16:33:57 +02:00
Benoit Marty bdff23a74d update doc 2022-09-09 15:59:34 +02:00
Benoit Marty d9ad9859ec Format 2022-09-09 15:59:34 +02:00
Benoit Marty 7c4527fba6 Fix test - no need to use Moshi to parse FCM Push data. 2022-09-09 15:59:34 +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
Onuray Sahin 11079afa6b Keep initial filter type on bottom sheet. 2022-09-08 19:25:11 +03:00
Onuray Sahin 41ca662dcc Update device list according to the filter type. 2022-09-08 18:28:17 +03:00
sim a17a4fe4b1 Add logs for invalid push data 2022-09-08 17:16:55 +02:00
sim 3e12907b26 Parse pushData in the push receiver 2022-09-08 16:25:48 +02:00
NIkita Fedrunov 4222c7c7c4 changed to only restart home activity when resumed with different app layout flag state 2022-09-08 16:24:34 +02:00
NIkita Fedrunov cb36ef766c restart app when app layout flag is changed 2022-09-08 16:14:57 +02:00
sim bc5309b5d7 Rename VectorMessagingReceiver to VectorUnifiedPushMessagingReceiver 2022-09-08 15:40:06 +02:00
sim dbea1726ec Rename VectorMessagingHelper to VectorPushHandler 2022-09-08 15:38:52 +02:00
sim 2527dbbeb2 Rename FirebaseReceiver to VectorFirebaseMessagingService 2022-09-08 15:37:18 +02:00
Benoit Marty 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
Onuray Sahin ab4ebc7f11 List devices. 2022-09-08 13:47:07 +03:00
sim 65654e7e8a Lint 2022-09-08 12:21:11 +02:00
sim f65074b3c5 Update pusher with FCM new token only if using FCM 2022-09-08 11:46:34 +02:00
Maxime NATUREL 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
sim 48498020a0 Ensure FCM always have the good gateway 2022-09-08 11:23:15 +02:00
sim 3267cbbf78 Lint 2022-09-08 11:15:41 +02:00
sim 94e2a0a3e3 Ensure FCM token is always retrieved 2022-09-08 10:58:08 +02:00
Benoit Marty 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
Benoit Marty 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
sim 7bdcacf489 Merge branch 'misc/refactor-uphelper' into fix/fcm-push2 2022-09-08 10:49:53 +02:00
sim 6ba963b552 Fix gateway 2022-09-08 10:49:49 +02:00
sim 0b9b8251f9 Do not intent to VectorMessagingReceiver from FirebaseReceiver
Use VectorMessagingHelper to directly call onMessage
2022-09-08 10:34:56 +02:00
Maxime NATUREL 45b138e53d Using orFalse() extension method on nullable boolean 2022-09-08 09:48:45 +02:00
Maxime NATUREL c45f536855 RefreshDevicesOnCryptoDevicesChangeUseCase unit tests 2022-09-08 09:48:45 +02:00
Maxime NATUREL 047384c08c Fix some coding style issues 2022-09-08 09:48:45 +02:00
Maxime NATUREL 3566b10e3c DevicesViewModel unit tests 2022-09-08 09:48:45 +02:00
Maxime NATUREL 438f302787 GetDeviceFullInfoListUseCase unit tests 2022-09-08 09:48:45 +02:00
Maxime NATUREL 07d9e35842 GetCurrentSessionCrossSigningInfoUseCase unit tests 2022-09-08 09:48:45 +02:00
Maxime NATUREL 27031ab267 RefreshDevicesUseCase unit tests 2022-09-08 09:48:45 +02:00
Maxime NATUREL 06d447247a Updating existing unit tests 2022-09-08 09:48:45 +02:00
Maxime NATUREL 0eae1bd505 Listen verification + refresh devices use cases 2022-09-08 09:48:45 +02:00
Maxime NATUREL 39a0b3b1ba Moving recently created use cases inside v2 package 2022-09-08 09:48:45 +02:00
Maxime NATUREL 712d39b9dd Inject new ViewModel in the fragment V2 + add use cases 2022-09-08 09:48:43 +02:00
Maxime NATUREL 4a6a39b3c4 Declare MarkAsManuallyVerified action 2022-09-08 09:48:03 +02:00
Maxime NATUREL e3c41a07e5 Empty ViewModel V2 2022-09-08 09:48:03 +02:00
Maxime NATUREL 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
sim 00a04b807e Lint 2022-09-07 18:22:34 +02:00
sim 9cf6dd7a88 Use firebaseReceiver with FCM 2022-09-07 18:02:26 +02:00
Onuray Sahin 643f99b8e0 Merge branch 'feature/mna/clean-vm-for-dm-v2' into feature/ons/device_manager_filter
* feature/mna/clean-vm-for-dm-v2:
  RefreshDevicesOnCryptoDevicesChangeUseCase unit tests
  Adding changelog entry
  Fix some coding style issues
  DevicesViewModel unit tests
  GetDeviceFullInfoListUseCase unit tests
  GetCurrentSessionCrossSigningInfoUseCase unit tests
  RefreshDevicesUseCase unit tests
  Updating existing unit tests
  Listen verification + refresh devices use cases
  Moving recently created use cases inside v2 package
  Inject new ViewModel in the fragment V2 + add use cases
  Declare MarkAsManuallyVerified action
  Empty ViewModel V2

# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
2022-09-07 18:31:30 +03:00
Benoit Marty 59e6fa98c9
Merge pull request #7000 from pt2121/pt/6529-room
Suggest @room when @channel, @everyone, or @here is typed in composer
2022-09-07 15:49:18 +02:00
Onuray Sahin 8dcbd3710d Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter
* feature/mna/session-overview-screen: (57 commits)
  Fix missing mapper in CryptoStoreHelper for tests
  Fix unused string warning
  Update unit tests
  Rendering inactive status in SessionInfoView
  Adding comment with examples of some parametrized strings
  Fix post rebase
  Fixing wrong copyright title
  Adding last seen details + fix observation of wrong deviceId in ViewModel
  Adding learn more link in verification status details
  Unit tests for computing trust level of device
  Unit tests for GetCurrentSessionCrossSigningInfoUseCase
  Updating existing unit tests
  Navigation from other session item
  Show info in overview screen
  Renaming CurrentSessionView into SessionInfoView to be more generic
  Introducing some reusable usecases
  Adding unit tests for viewModel
  Adding unit tests for mapper
  Adding unit tests for the new use case
  Adding use case to get full device info for a given device id
  ...

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
2022-09-07 16:33:35 +03:00
Benoit Marty a5046d43c8 Fix ReleaseNotesActivity displayed after login.
Ensure the state is up to date, when we will request it later with withState{}
2022-09-07 14:51:37 +02:00
ericdecanini 3b2fa0d563 Merge remote-tracking branch 'origin/develop' into bugfix/eric/new-layout-open-invite 2022-09-07 14:03:54 +02:00
ericdecanini 4a31dc403f Removes unused import 2022-09-07 14:03:48 +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 3c6efd673e Allows you to open an invite by clicking the invite cell 2022-09-07 11:58:47 +02:00
Benoit Marty c408621bd5
Merge pull request #7054 from vector-im/feature/bma/fix_invite_to_room_in_space
Fix invite to room in space
2022-09-07 11:53:34 +02:00
Benoit Marty 80507dac00
Merge pull request #7024 from vector-im/bugfix/eric/new-layout-recents-padding
New Layout - Fixes padding of recents item selectable background
2022-09-07 11:00:36 +02:00
Benoit Marty 199195dcbd
Merge pull request #7039 from vector-im/feature/eric/new-layout-update-icons
New Layout - Replace space icon (and release notes image)
2022-09-07 10:57:23 +02:00
ericdecanini 64c8789ef2 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 10:35:44 +02:00
Eric Decanini da88b37ec7
Merge pull request #7040 from vector-im/bugfix/eric/new-layout-missing-header
New Layout - Adds missing space list header
2022-09-07 10:31:31 +02:00
Benoit Marty 2ba00b3845 If we need the FragmentManager, let's require to have a FragmentActivity. 2022-09-07 10:14:29 +02:00
Benoit Marty fe484e84f4 Fix clicking on invite does not work. Fix #7053
We need the FragmentManager to display a bottom sheet.
2022-09-07 10:01:31 +02:00
Maxime NATUREL 2592bc3772 RefreshDevicesOnCryptoDevicesChangeUseCase unit tests 2022-09-07 09:44:48 +02:00
Maxime NATUREL c65bbd91d9 Fix some coding style issues 2022-09-07 09:44:43 +02:00
Maxime NATUREL 88a5c42a4a DevicesViewModel unit tests 2022-09-07 09:44:40 +02:00
Maxime NATUREL 6394c7efde GetDeviceFullInfoListUseCase unit tests 2022-09-07 09:44:37 +02:00
Maxime NATUREL 7511d21a6f GetCurrentSessionCrossSigningInfoUseCase unit tests 2022-09-07 09:44:34 +02:00
Maxime NATUREL 32f7767aa5 RefreshDevicesUseCase unit tests 2022-09-07 09:44:30 +02:00
Maxime NATUREL 07df58f4df Updating existing unit tests 2022-09-07 09:44:27 +02:00
Maxime NATUREL 69cb5738a4 Listen verification + refresh devices use cases 2022-09-07 09:44:24 +02:00
Maxime NATUREL fa1ef06952 Moving recently created use cases inside v2 package 2022-09-07 09:44:21 +02:00
Maxime NATUREL 3a73e72b16 Inject new ViewModel in the fragment V2 + add use cases 2022-09-07 09:44:18 +02:00
Maxime NATUREL 801eef3ce7 Declare MarkAsManuallyVerified action 2022-09-07 09:44:14 +02:00
Maxime NATUREL 7248692273 Empty ViewModel V2 2022-09-07 09:44:09 +02:00
Benoit Marty c5d3eaffb9
Merge pull request #7041 from vector-im/feature/bma/debug_release_note
Debug release note
2022-09-07 09:40:48 +02:00
Maxime NATUREL 2148270773 Update unit tests 2022-09-07 09:32:48 +02:00
Maxime NATUREL 6e9b2baf6f Rendering inactive status in SessionInfoView 2022-09-07 09:32:48 +02:00
Maxime NATUREL 52d05b373c Fix post rebase 2022-09-07 09:32:47 +02:00
Maxime NATUREL 1ad585e154 Adding last seen details + fix observation of wrong deviceId in ViewModel 2022-09-07 09:32:47 +02:00
Maxime NATUREL d12bb09273 Adding learn more link in verification status details 2022-09-07 09:32:47 +02:00
Maxime NATUREL fde7072bc7 Unit tests for computing trust level of device 2022-09-07 09:32:47 +02:00
Maxime NATUREL 38a04c3655 Unit tests for GetCurrentSessionCrossSigningInfoUseCase 2022-09-07 09:32:47 +02:00
Maxime NATUREL 3f30cf0bee Updating existing unit tests 2022-09-07 09:32:47 +02:00
Maxime NATUREL 78c2b10b89 Navigation from other session item 2022-09-07 09:32:47 +02:00