Commit Graph

11795 Commits

Author SHA1 Message Date
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
Onuray Sahin 32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03:00
bmarty 925fffac45 Sync Emojis 2022-09-19 00:03:51 +00: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
Onuray Sahin 6823258abb Add test for view navigation. 2022-09-16 17:41:51 +03: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
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
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
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
ericdecanini e0f327e8f6 Removes unneeded code in BottomSheetDialog.kt 2022-09-14 09:37:42 -04: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