ariskotsomitopoulos
ac5caccdf9
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
# 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/database/model/EventEntity.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
# tools/check/forbidden_strings_in_code.txt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/res/menu/menu_timeline.xml
2022-01-07 13:29:43 +02:00
Benoit Marty
b852b9de9c
Merge pull request #4871 from vector-im/feature/nfe/qr_scanner_toolbar
...
Toolbar is added to a views with QR code scan
2022-01-06 20:55:06 +01:00
Adam Brown
f24c962a4a
Merge pull request #4668 from vector-im/feature/adm/i-already-have-an-account
...
FTUE Auth - I already have an account
2022-01-06 17:11:44 +00:00
fedrunov
f35ffb0a60
referencing layout with @+id changed to @id according to code quality rules
2022-01-06 17:57:16 +01:00
fedrunov
6bfd9d07a9
Toolbar is added to a views with QR code scan
2022-01-06 17:11:23 +01:00
Adam Brown
b40324a8ba
Merge pull request #4738 from vector-im/feature/adm/cloning-login-fragments-to-ftue
...
Cloning the `Login` fragments to `FtueAuth`
2022-01-06 13:59:46 +00:00
Benoit Marty
296929e179
Merge pull request #4790 from vector-im/feature/adm/emoji-recycling
...
Timeline recycling crash
2022-01-06 14:55:29 +01:00
Adam Brown
6fbf8faf53
using fragment constructor vai fragment module instead of hilt entry point
2022-01-06 10:03:13 +00:00
Adam Brown
ccd2d95f0f
removing duplicated layout file
2022-01-06 10:03:13 +00:00
Adam Brown
380f079ab7
taking the already have an account feature flag into account in the ftue auth splash
2022-01-06 10:03:13 +00:00
Adam Brown
e3c0b34651
adding support for the boolean features and adding a new flag for the already have an account
2022-01-06 10:03:13 +00:00
Adam Brown
768419b11a
using correct views instances - fixes missing loading
2022-01-06 10:03:13 +00:00
Adam Brown
d5373545f0
styling the debug trigger in the ftue splash
2022-01-06 10:03:13 +00:00
Adam Brown
2647e061a2
copying all of the login fragments into the ftue auth domain
2022-01-06 10:03:13 +00:00
Adam Brown
811613fa4d
adding I already have an account functionality to the ftue auth splash
2022-01-06 10:03:13 +00:00
Adam Brown
538f51e2d2
adds a debug menu entry point in the splash debug info
2022-01-06 10:03:13 +00:00
Adam Brown
7b3163e140
cloning the splash fragment into the onboarding
2022-01-06 10:03:13 +00:00
Adam Brown
8de892bc60
renaming the ftue domain to onboarding and ftue to ftue auth
2022-01-06 10:03:13 +00:00
Adam Brown
3e1801a5c4
clones the login view model domain to the ftue so that we can start overriding and merge login2 behaviour
2022-01-06 10:03:13 +00:00
Adam Brown
e091ea82da
porting the LoginActivty2 to a dynamic FTUE activity
...
- supports switching between a copied legacy flow (DefaultFTUE) and the WIP variant
- this will allow us to make iterative changes to the default ftue flow without affecting the legacy flow/forks
2022-01-06 10:03:13 +00:00
Adam Brown
603c2fa690
updating out of sync provider function name
2022-01-06 10:02:49 +00:00
Adam Brown
98b88c104a
adding all the ftue auth fragments to the fragment module
2022-01-06 10:02:48 +00:00
Adam Brown
8d819c76ab
copying all of the login fragments into the ftue auth domain
2022-01-06 09:44:59 +00:00
Adam Brown
355d8ebdc6
Merge pull request #4657 from vector-im/feature/adm/cloning-login-domain-to-ftue
...
Cloning the `LoginViewModel` domain to `Onboarding`
2022-01-06 09:43:46 +00:00
Adam Brown
22bab47dad
adding back the beforeSetText logic for markwon integraton and adding a nullable check to avoid attempt to cast a null to non null
2022-01-06 09:28:08 +00:00
Benoit Marty
1490854b4c
Merge pull request #4799 from vector-im/feature/adm/inconsistent-outgoing-call-output
...
Outgoing call ringtone using wrong audio device
2022-01-05 22:05:23 +01:00
Benoit Marty
17e485fde1
Merge pull request #4826 from vector-im/feature/bma/nick_color_final
...
Nick color
2022-01-05 22:01:03 +01:00
Benoit Marty
fd854a6172
Merge pull request #4856 from vector-im/feature/bca/posthog_e2e
...
Track decryption failures
2022-01-05 18:54:21 +01:00
Valere
b275546a8a
Code review + reduce grace period
2022-01-05 16:43:05 +01:00
Valere
e5431d9fb4
Track decryption failures
2022-01-05 16:43:05 +01:00
Benoit Marty
02a8fd231c
Fix compilation issue after develop being merged.
2022-01-05 16:35:07 +01:00
Benoit Marty
608e01abf1
Merge branch 'develop' into feature/bma/nick_color_final
2022-01-05 16:33:13 +01:00
Benoit Marty
fc7beb7e5f
Prefer usage of any or none rather indexOfFirst wherever it is possible
2022-01-05 15:24:20 +01:00
Benoit Marty
51c9c2f032
Optimize call flow
2022-01-05 14:56:17 +01:00
Benoit Marty
5efe1f4bd8
Merge pull request #4841 from vector-im/feature/bma/safe_start_activity
...
Small cleanup
2022-01-05 14:43:13 +01:00
Adam Brown
603ddf7eac
taking into account when the current call is not yet available and defaulting to the audio call mode
2022-01-05 10:35:00 +00:00
Adam Brown
98078da13d
renaming the ftue domain to onboarding and ftue to ftue auth
2022-01-05 10:32:31 +00:00
Adam Brown
1e5c057223
clones the login view model domain to the ftue so that we can start overriding and merge login2 behaviour
2022-01-05 10:31:30 +00:00
Adam Brown
6380ee9176
allowing nullable message content in order to reset the content when recycling and an item doesn't contain a message
2022-01-05 09:59:39 +00:00
Adam Brown
57e0ce2303
removing any existing text futures before setting new text
...
- tentatively fixes IllegalArgumentException when recycling the text views due to AppCompatTextView.consumeTextFutureAndSetBlocking attempting to consuming any futures, even if they may be invalid
2022-01-05 09:58:46 +00:00
Adam Brown
4daef6018e
extracting the emoji text setting to an extension
2022-01-05 09:58:08 +00:00
Benoit Marty
5fc1efb542
Merge pull request #4852 from vector-im/feature/bma/tooltip
...
Add tooltip to explain what are the actions behind the icons
2022-01-05 09:47:12 +01:00
Benoit Marty
d07dd154b8
Remove audio item from attachment picker.
...
Keep some related code for now
2022-01-04 18:50:32 +01:00
Benoit Marty
97459bc822
Update wording of tooltips (Gaelle's review)
2022-01-04 18:43:17 +01:00
Benoit Marty
10a63f8949
Fix code after #4837 has been merged
2022-01-04 16:22:06 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final
2022-01-04 16:13:23 +01:00
Benoit Marty
ecc4009689
Add tooltip to explain what are the actions behind the buttons
2022-01-04 16:00:06 +01:00
Benoit Marty
ed00f9f712
Merge pull request #4848 from vector-im/cgizard/translate_error_message_joining_room
...
Update error message when joining room
2022-01-04 15:27:49 +01:00
Benoit Marty
e724c2e26c
Merge pull request #4849 from vector-im/feature/bma/fix_lint
...
Fix lint after #4843
2022-01-04 15:24:56 +01:00
Benoit Marty
d52e61413d
Ask for user confirmation before deleting Widget
2022-01-04 14:32:03 +01:00
