mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-21 16:55:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
19420 commits 160 branches 159 tags 271 MiB
Commit graph

12007 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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