SpiritCroc
2c22f1e926
Treat manually unread chats as notifications in bottom tabs
...
Change-Id: I34cea91674843d8d60285295b449d2722cb061e9
2021-02-09 17:48:00 +01:00
SpiritCroc
c2ce787310
Merge tag 'v1.0.16' into sc
...
Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6
Conflicts:
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
2021-02-04 17:10:15 +01:00
Benoit Marty
9b13381938
Merge pull request #2762 from vector-im/feature/bma/track
...
Improvements
2021-02-03 17:02:25 +01:00
Benoit Marty
bc22647b48
Merge pull request #2753 from vector-im/feature/bca/sso_reauth
...
Feature/bca/sso reauth
2021-02-03 16:12:54 +01:00
Benoit Marty
ad9873c565
Some cleanup
2021-02-03 14:52:58 +01:00
Valere
e976100f1a
Fix test compilation error
2021-02-03 14:48:43 +01:00
Valere
289a3ab21f
remove dev id for now
2021-02-03 14:36:38 +01:00
Valere
697b551b9b
Cleaning / Code review
2021-02-02 23:10:14 +01:00
Valere
0211197c47
SSO UIA for add 3pid + refactoring move RegistrationFlow to api
2021-02-02 22:25:49 +01:00
Benoit Marty
a820443c56
Fix copyright
2021-02-02 13:05:39 +01:00
Valere
2a3962265b
SSO UIA for deactivate account
2021-02-02 12:30:46 +01:00
Benoit Marty
e6fc605b08
Data for Worker overload ( #2721 )
2021-02-02 11:40:52 +01:00
Valere
8129cd0cd3
Cleaning + changelog
2021-02-02 09:32:04 +01:00
Valere
76b425ee8a
Cleaning
2021-02-01 16:39:14 +01:00
Valere
5b8215a356
Support SSO provider brand + UI fixes
2021-02-01 16:39:14 +01:00
Valere
9c7df25862
Relax rule for e2e by default
2021-02-01 16:39:14 +01:00
Valere
da16ec0af3
UIA fixes + better error support
2021-02-01 16:39:14 +01:00
Valere
1244d00b31
SSO UIA
2021-02-01 16:39:14 +01:00
Onuray Sahin
06be3e691d
Support $matrix_widget_id parameter.
2021-02-01 18:13:26 +03:00
Benoit Marty
c794843bb2
Inject the context in the constructor
2021-01-26 17:16:55 +01:00
Benoit Marty
d6a5b9fb48
fulfill assertion about eventId
2021-01-25 16:42:53 +01:00
Benoit Marty
57dba2f29a
Merge branch 'develop' into feature/ons/fix_url_preview_on_edit
2021-01-25 16:05:26 +01:00
Benoit Marty
f64db7f5f3
Fix test compilation
2021-01-25 16:03:31 +01:00
Benoit Marty
128d3845b9
Small rework
2021-01-25 15:19:01 +01:00
Benoit Marty
602ea3327b
URL preview: improve fix regarding message edition
2021-01-25 15:11:42 +01:00
Benoit Marty
e55178612c
Merge pull request #2665 from vector-im/feature/bca/dendrite_sync_fix
...
Fix Dendrite sync response support
2021-01-25 14:23:13 +01:00
Benoit Marty
5a0d62db6f
Cleanup (PR review)
...
Also add some doc and add missing `internal` keyword
2021-01-25 12:42:39 +01:00
Benoit Marty
b65fc4f46b
rename val
2021-01-22 17:59:56 +01:00
Benoit Marty
401b5e2b7a
Move private fun
2021-01-22 17:48:13 +01:00
Benoit Marty
a44d00a31c
Create data class.
2021-01-22 17:44:24 +01:00
Benoit Marty
267ae457ee
Use const
2021-01-22 17:38:17 +01:00
Benoit Marty
887da0a3d6
Improve code #2
2021-01-22 17:37:25 +01:00
Benoit Marty
07ffd3ded3
Improve code
2021-01-22 17:32:00 +01:00
Benoit Marty
25dbb3e9ea
Fix bad copy/paste
2021-01-22 17:26:10 +01:00
Benoit Marty
0a96841336
Merge branch 'develop' into develop
2021-01-22 17:20:36 +01:00
Benoit Marty
4dcd7846b0
Merge pull request #2616 from vector-im/feature/ons/android_11_migration
...
Migrate to Android 11, API 30.
2021-01-22 17:17:04 +01:00
Andrew Ferrazzutti
daf019b288
Identity: Recompute hashes after M_INVALID_PEPPER
...
When a new pepper is retrieved after an M_INVALID_PEPPER response,
recompute hashes with that pepper, and send those new hashes in the next
lookup attempt instead of reusing the original hashes.
Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-01-21 21:52:19 -05:00
Onuray Sahin
5eeb545ae2
Update url preview when the event is edited.
2021-01-21 15:20:19 +03:00
Benoit Marty
c75eb050df
Cleanup and fix test compilation
2021-01-20 16:32:41 +01:00
Benoit Marty
4709002429
Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
...
Migratiing to supend methods fixes the problem, I'm not sure why...
2021-01-20 15:19:48 +01:00
SpiritCroc
53c498b728
Merge tag 'v1.0.14' into sc
...
Change-Id: I0d3df2f8c5f4e611f3268c4c4d2784f7eac89bb5
Conflicts:
gradle/wrapper/gradle-wrapper.properties
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/media/UrlsExtractor.kt
vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
vector/src/main/res/xml/vector_settings_preferences.xml
2021-01-16 11:21:09 +01:00
ganfra
2c0b7ce0f4
Dagger: update to 2.31 and use new AssistedInject
2021-01-15 15:23:24 +01:00
Benoit Marty
d6ef3ea08e
Fix lint issues
2021-01-14 14:08:08 +01:00
Benoit Marty
844fe2c4cd
Merge branch 'develop' into feature/bca/crypto_store_outbound
2021-01-14 10:43:38 +01:00
Benoit Marty
69efb45fb7
Merge pull request #2659 from vector-im/feature/bma/fix_init_sync
...
Fix issue with delay set to 0
2021-01-14 10:41:10 +01:00
Benoit Marty
c88072e55f
Merge branch 'develop' into feature/bma/investigation
2021-01-14 10:38:56 +01:00
Weblate
de73539d2b
Merge branch 'origin/develop' into Weblate.
2021-01-13 15:00:03 +00:00
Valere
36b1a1471a
Fix Dendrite sync response support
2021-01-13 14:23:45 +01:00
Benoit Marty
7446b12827
Fix request too large Uri error when joining a room
2021-01-12 18:16:35 +01:00
Benoit Marty
2ea45185d4
Ensure the service is restarted with the correct intent
2021-01-12 16:26:52 +01:00