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