mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-23 09:55:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
21909 commits 161 branches 158 tags 270 MiB
Commit graph

5850 commits

Author SHA1 Message Date
Maxime NATUREL
9338ec9805 Mutualizing decryption of event 2022-12-14 11:49:41 +01:00
Maxime NATUREL
8b7c8e3351 Task to ensure aggregation of all poll responses when receiving ending poll event 2022-12-14 11:27:08 +01:00
Maxime NATUREL
8c88140b3c Updating Room API to clarify usage 2022-12-14 11:27:08 +01:00
Maxime NATUREL
fe5e4d6830
Merge pull request #7757 from vector-im/fix/mna/poll-end-not-recognized 
[Poll] Poll end event is not recognized (PSG-948 and PSG-949)
 2022-12-13 17:08:01 +01:00
Maxime NATUREL
851276978f Remove unused import 2022-12-13 15:47:30 +01:00
Maxime NATUREL
96e29d4d10 Renaming the name of the test file be consistent 2022-12-13 15:46:14 +01:00
Maxime NATUREL
71df1e61d4 Remove non necessary call when getting the targeted event id 2022-12-13 15:45:46 +01:00
Nikita Fedrunov
3dadebe505
threads are enabled by default end forced to enabled for existing users (#7775) 2022-12-13 14:02:45 +01:00
Valere
d05e10e10a
crypto migration tests (#7645) 
Crypto migration tests

Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-12-13 11:38:49 +01:00
Onuray Sahin
250bd9c620
Merge pull request #7754 from vector-im/feature/ons/remove_client_information_account_data 
Delete unused client information from account data (PSG-871)
 2022-12-13 11:10:41 +03:00
Hugh Nimmo-Smith
34ee399f94
Merge pull request #7737 from vector-im/bugfix/hughns/qr-server-change 2022-12-12 18:21:39 +00:00
Onuray Sahin
9954045d30
Merge pull request #7740 from vector-im/feature/ons/remove_account_data 
Handle account data removal (PSG-865, PSG-867)
 2022-12-12 19:31:16 +03:00
Hugh Nimmo-Smith
21cbe52740 Lint 2022-12-12 16:30:34 +00:00
Hugh Nimmo-Smith
1930047ce1 Fix issue of QR not being offered where domain is entered instead of homeserver 2022-12-12 16:30:34 +00:00
Onuray Sahin
8c6c2dd5c2 Code review fixes. 2022-12-12 16:36:40 +03:00
Onuray Sahin
746fb7719a Code review fixes. 2022-12-12 13:39:56 +03:00
Maxime NATUREL
dba8aaea16
Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields 
Revert usage of stable fields in live location sharing and polls
 2022-12-09 17:32:53 +01:00
Maxime NATUREL
bd91db66f8 Fixing retrieve of related event id in the end poll event during aggregation 2022-12-09 14:07:06 +01:00
Onuray Sahin
8206b534f9 Create a task to delete an event data with a given type. 2022-12-09 14:52:27 +03:00
Onuray Sahin
3d68233723 Support retrieving account data whose key starts with a string. 2022-12-09 14:51:23 +03:00
Maxime NATUREL
220b1d86c0 Reverting usage of some stable fields whereas related MSCs have not landed into the specs yet 2022-12-08 17:42:51 +01:00
Onuray Sahin
b09a00efda Code review fixes. 2022-12-08 17:11:09 +03:00
Hugh Nimmo-Smith
7bbd91f2a9 Handle error whilst download key for self 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith
3a2a916c2f Clarify comment 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith
73fd93148a Download device keys for self prior to verification checks 
Fixes https://github.com/vector-im/element-android/issues/7676
 2022-12-08 13:27:49 +00:00
Onuray Sahin
055bf6d302 Revert unused companion object. 2022-12-07 21:41:22 +03:00
Florian Renaud
1a3ca7b1a0 Filter event types from decrypted content 2022-12-07 18:11:51 +01:00
Florian Renaud
6e5461f300 Stop filtering events with reference relationship when computing latest previewable event 2022-12-07 18:11:51 +01:00
Florian Renaud
4d6c04baf9 Add provider for custom event types 2022-12-07 18:11:51 +01:00
Florian Renaud
fdb8743ad3 Create provider package 2022-12-07 18:11:51 +01:00
Onuray Sahin
f4429d4c9c Handle sync response to delete user and room account data. 2022-12-07 18:58:14 +03:00
Onuray Sahin
765202e05a Add helper functions to delete user and room account data. 2022-12-07 18:17:43 +03:00
Valere
01533db4e0
Merge pull request #7713 from vector-im/feature/bca/to_device_tracing 
add to device tracing id
 2022-12-07 16:16:20 +01:00
Onuray Sahin
d244f7324c Add api functions to delete account data. 2022-12-07 18:12:25 +03:00
valere
63d2886415 use msgid in logs for consistency 2022-12-06 16:07:24 +01:00
valere
8646cc441d do not add tracing ids to verification events 2022-12-06 15:30:06 +01:00
Benoit Marty
ae93c07597 Do not propagate failure if saving the filter server side fails. This will be retried later. 2022-12-06 15:01:47 +01:00
valere
139eb1708c fix uncheck cast warning 2022-12-06 08:17:31 +01:00
valere
2ed212aa11 Fix copyright 2022-12-05 18:30:38 +01:00
valere
f2952f2dee add to device tracing id 2022-12-05 18:15:55 +01:00
Maxime NATUREL
637961bbb1 Update related account data event on notification method change 2022-12-05 09:43:56 +01:00
Maxime NATUREL
14b21dc039 Adding use cases to create and delete notifications settings in account data 2022-12-05 09:43:56 +01:00
Benoit Marty
52477aa9d5 version++ 2022-11-30 11:03:58 +01:00
Florian Renaud
49199bd5e2
Merge pull request #7611 from vector-im/feature/fre/voice_broadcast_deletion 
Be less restritive when pruning redacted events
 2022-11-28 13:57:40 +01:00
Florian Renaud
dd81584076 Ad default value to MessageStickerContent.body in case of redaction 2022-11-28 12:12:49 +01:00
Nikita Fedrunov
5aeca1f81a
saving sync filter changed (#7627) 2022-11-28 09:48:28 +01:00
Florian Renaud
a8f3bb1d4e Remove to-device events from event type filtering for redaction 2022-11-25 14:42:46 +01:00
Florian Renaud
5a43b76488 Log a warning if the event content is not pruned 2022-11-25 14:42:45 +01:00
Florian Renaud
2477632e2b Fix exception when getting models on some redacted event 
An exception was triggered because the excepted model body was null for redacted events
 2022-11-25 14:42:45 +01:00
Florian Renaud
0209cc4969 Prune redacted events which are not explicitly restricted 2022-11-25 14:42:45 +01:00
Florian Renaud
eb12b1c99b Use StableUnstableId object for some event types 2022-11-25 14:42:45 +01:00
Nikita Fedrunov
9349b1ae15
read receipt migration added (#7640) 2022-11-25 14:24:14 +01:00
Nikita Fedrunov
18bcc83a46
added read receipts for threads (#7474) 2022-11-25 09:49:06 +01:00
Valere
035b1ebedc
Merge pull request #7594 from vector-im/feature/bca/better_edit_validation 
Better edit (replace handling)
 2022-11-24 17:22:41 +01:00
Valere
bec8b5f71e code review 2022-11-24 12:45:35 +01:00
Valere
c06eca6936 Migration test and cleaning 2022-11-24 12:45:35 +01:00
Valere
ca907df94b kdoc fix 2022-11-24 12:45:35 +01:00
Valere
2819957585 fix edit display flicker with local echo 2022-11-24 12:45:35 +01:00
Valere
e5d3206b6f code review 2022-11-24 12:45:35 +01:00
Valere
d759f26db6 fix fake awaitTx 2022-11-24 12:45:35 +01:00
Valere
8b47bf004e Fix broken polls states 2022-11-24 12:45:35 +01:00
Valere
3746ede49a Fix test 2022-11-24 12:45:35 +01:00
Valere
e66a0541be Add changelog, some cleaning 2022-11-24 12:45:35 +01:00
Valere
891709ef41 better replace handling 2022-11-24 12:45:35 +01:00
Benoit Marty
ebbfca4ffd Detekt: Use require() instead of throwing an IllegalArgumentException. [UseRequire] 2022-11-24 11:06:00 +01:00
Maxime NATUREL
14de485c67
Merge pull request #7566 from vector-im/fix/mna/missing-translation-reply-to 
Missing translations on "replyTo" messages (PSG-978)
 2022-11-18 14:39:18 +01:00
Benoit Marty
65d898e3de version++ 2022-11-17 12:57:08 +01:00
Benoit Marty
5d3228d97b toModel was not catching com.squareup.moshi.JsonDataException properly (discovered when joining a Jitsi conf added as a Widget) 2022-11-17 12:28:58 +01:00
Jorge Martin Espinosa
10775ab2f3
Editing: default to MessageContent.body when no formattedBody is present (#7592) 
* Editing: default to `MessageContent.body` when no `formattedBody` is present

* Update docs
 2022-11-16 12:13:07 +00:00
Jorge Martin Espinosa
a476544761
Fix some quoted messages having 'null' message bodies (#7532) 
* Fix some quoted messages having 'null' message bodies
 2022-11-14 11:01:29 +00:00
Maxime NATUREL
4a65e1153a Fix retrieve of the question for poll events 2022-11-14 10:18:42 +01:00
Maxime NATUREL
57e90aee83 Removing description parameter in startLiveLocation method of SDK to avoid translated strings in beacon events 2022-11-10 15:40:50 +01:00
Maxime NATUREL
235b629130 Use case to process formatted body of reply to events 2022-11-10 15:29:58 +01:00
Maxime NATUREL
744b03a806
Merge pull request #7523 from vector-im/feature/mna/push-toggle-current-session 
Push notifications toggle: align implementation for current session (PSG-971)
 2022-11-10 13:44:49 +01:00
Amit Kumar
c07b110b99
Add spannable tracking around SyncResponseHandler (#7514) 
* Add spannable tracking around SyncResponseHandler

* Update LICENSE header

* Refactor handleResponse and MetricsExtensions

* Update changelog.d

* Improve code docs and comments

* Check if Sentry is enabled before tracking
 2022-11-10 16:13:09 +05:30
Maxime NATUREL
ab90da0e51 Adding isReply extension method for RelationDefaultContent 2022-11-10 10:05:01 +01:00
Maxime NATUREL
24a5cfa9e5 Listen for pusher or account data changes to update the local setting 2022-11-10 10:00:27 +01:00
Benoit Marty
d07c6da3ac Add a test for incomplete word. 2022-11-09 15:31:27 +01:00
Benoit Marty
823e7bf212 Fix search tests. 2022-11-09 15:26:39 +01:00
Maxime NATUREL
fc24beaa68
Merge pull request #7456 from vector-im/feature/mna/session_manager_multi_signout 
[Session manager] Multi-session signout (PSG-857)
 2022-11-08 14:21:14 +01:00
NIkita Fedrunov
0c40acb186 temporary workaround for a failing sync due to unexpected enableUnreadThreadNotifications param 2022-11-07 16:16:51 +01:00
Maxime NATUREL
1d2b8e76a2 Adding min size annotation to task params 2022-11-07 11:13:23 +01:00
Maxime NATUREL
76e2b6b39f Removing some TODOs 2022-11-07 11:09:42 +01:00
Maxime NATUREL
bb262f0c41 Adding new "delete_devices" request API 2022-11-07 11:09:41 +01:00
Florian Renaud
ac0d823c88
Merge pull request #7519 from vector-im/bugfix/fre/unencrypted_media_event_json_type 
Fix bad content types when sending unencrypted media event with additional content data
 2022-11-04 10:40:18 +01:00
Maxime NATUREL
4621488f21
Merge pull request #7476 from vector-im/fix/mna/push-toggle-check-support 
[Session manager] Hide push notification toggle when there is no server support (PSG-970)
 2022-11-04 09:19:04 +01:00
Florian Renaud
c0ba2f2f48 Fix bad content types when sending unencrypted media 2022-11-03 11:28:45 +01:00
ganfra
404383e683 Update versions 2022-11-02 17:58:10 +01:00
Maxime NATUREL
52a77e074f Renaming const for feature value 2022-11-02 09:37:10 +01:00
Maxime NATUREL
1acb42f61d Adding use case to check support for new enabled field support 2022-11-02 09:37:10 +01:00
Amit Kumar
b6746653f1
Add metrics plugin to track device download keys task (#7438) 
* Add metrics tracking plugin for download device keys

* Add support for multiple metrics plugin

* Update copyright license header in matrix-sdk-android

* Add tests for MetricExtension

* Update changelog

* Improve MetricsExtension and reformatting
 2022-11-02 13:43:57 +05:30
Eric Decanini
29d3856ef2
Merge pull request #7424 from vector-im/feature/eric/msc3773 
Implements MSC3773 (Thread Notifications)
 2022-10-26 10:44:32 -04:00
Benoit Marty
c8d08e21a8 Small refactor 2022-10-26 12:36:58 +02:00
Benoit Marty
e8046da0ba Use GpsTagConstants.ALL_GPS_TAGS to remove all tags related to GPS. 2022-10-26 12:34:03 +02:00
Benoit Marty
3632e6dc8a Replace library org.apache.sanselan:sanselan:0.97-incubator with org.apache.commons:commons-imaging:1.0-alpha3 2022-10-26 12:32:27 +02:00
ericdecanini
dffb9d3d9d Fixes lint error 2022-10-24 21:39:31 -04:00
ericdecanini
3673e720fa Code improvements 2022-10-24 10:31:55 -04:00
ericdecanini
35be56a44a Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-10-24 10:28:21 -04:00
ByeongsuPark
75d589bedd Add trim to username input on sign-in 
Add trim to username input on the app side and SDK side
Signed-off-by: ByeongsuPark <byeongsu@soongsil.ac.kr>
 2022-10-22 00:52:43 +09:00
Nikita Fedrunov
113d0ff540
thread read receipts and unread notifications support is added to hom… (#7386) 2022-10-21 15:06:20 +02:00
ericdecanini
1086ed367e Fixes thread notifications instantly disappearing 2022-10-20 19:42:06 -04:00
Florian Renaud
d44d81ed46
Merge pull request #7419 from vector-im/feature/fre/voice_broadcast_live_listening 
Voice broadcast - live listening
 2022-10-20 23:52:57 +02:00
Benoit Marty
ed0d255495 Quick improvement on the doc. 2022-10-20 14:03:42 +02:00
Florian Renaud
e9c81ca98f VoiceBroadcastPlayer - Live listening 2022-10-20 12:51:08 +02:00
ericdecanini
dc7bff10c1 Merge remote-tracking branch 'origin/feature/nfe/threads_notifications_and_receipts' into feature/eric/msc3773 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-10-19 17:03:20 -04:00
ericdecanini
2379ce673b Adds filter event to opt in to thread notifications 2022-10-19 17:02:32 -04:00
Benoit Marty
9122d96fc6 Merge remote-tracking branch 'origin/develop' into develop 2022-10-19 17:17:33 +02:00
Benoit Marty
36eb538a93 Version++ 2022-10-19 17:17:21 +02:00
Johannes Marbach
451f5f824a
Merge pull request #7369 from vector-im/feature/hughns/qr_code_login 
Implement logic for sign in with QR
 2022-10-19 17:10:19 +02:00
Hugh Nimmo-Smith
4f652f1026 Request changes from review 2022-10-19 09:12:09 +01:00
Benoit Marty
f5fe5cce62
Merge pull request #7372 from vector-im/feature/bma/fix_getUser_null 
Handle properly when getUser returns null - prefer using getUserOrDefault
 2022-10-19 08:40:44 +02:00
Florian Renaud
fbf242756e Allow additional content when sending an event 2022-10-18 21:08:08 +02:00
ericdecanini
ed9ecb7fc9 Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773 2022-10-18 11:03:41 -04:00
Hugh Nimmo-Smith
67be8c3c40 The one that got away 2022-10-18 12:44:05 +01:00
Florian Renaud
16c27ba174 Voice Broadcast - Get voice messages events related to a given VB 2022-10-18 13:41:05 +02:00
Florian Renaud
5f35926ce6 Voice Broadcast - Hide related voice message events 2022-10-18 13:41:04 +02:00
Florian Renaud
ce14270fab Introduce MessageAudioEvent 2022-10-18 13:41:04 +02:00
Hugh Nimmo-Smith
f7e0a19833 Remove redundant annotations 2022-10-18 12:29:48 +01:00
Hugh Nimmo-Smith
811d6d87ae Reuse getDecimalCodeRepresentation from SAS instead of duplicating code 2022-10-18 12:23:21 +01:00
Hugh Nimmo-Smith
a83fb8bf83
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-10-18 12:09:17 +01:00
Hugh Nimmo-Smith
8530f8f280
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-10-18 12:09:06 +01:00
Hugh Nimmo-Smith
0d1df3f66e
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-10-18 12:08:09 +01:00
NIkita Fedrunov
6f5fefba56 lint 2022-10-18 10:44:20 +02:00
Hugh Nimmo-Smith
376cd1cb36 Missing throws 2022-10-18 09:34:28 +01:00
Hugh Nimmo-Smith
57a8dd4a1f Whitespce 2022-10-18 09:31:13 +01:00
Hugh Nimmo-Smith
a1d2944c32 Always check master key when provided by verifying device 2022-10-18 09:08:40 +01:00
Hugh Nimmo-Smith
f297117df2 Use mutex 2022-10-18 08:48:28 +01:00
Hugh Nimmo-Smith
8a62dfb34a Lint 2022-10-18 00:35:43 +01:00
Florian Renaud
fb9c747a20 Reformat and add trailing commas 2022-10-17 22:33:43 +02:00
Florian Renaud
33a021c8ed Add sdk entry to attach reference to the outgoing events 2022-10-17 22:33:42 +02:00
Florian Renaud
dbc61971df Reduce duplicated code 2022-10-17 22:33:42 +02:00
Hugh Nimmo-Smith
6d17d51fe9 remove nullability 2022-10-17 17:36:35 +01:00
Hugh Nimmo-Smith
8f4d998362 Lint 2022-10-17 17:33:43 +01:00
Hugh Nimmo-Smith
d3e61a23a9 Fix generator 2022-10-17 17:29:45 +01:00
NIkita Fedrunov
eec99e65bd thread read receipts and unread notifications support is added to homeserver capatibilities 2022-10-17 18:09:45 +02:00
Hugh Nimmo-Smith
c3669318c1 Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login 2022-10-17 16:37:35 +01:00
Hugh Nimmo-Smith
1863e4c3ef Use unstable prefixes 2022-10-17 16:34:51 +01:00
Onuray Sahin
b2dc0b33b5 Implement try again button action. 2022-10-17 18:32:35 +03:00
Hugh Nimmo-Smith
3d37e0b2a5 Fix enum JsonClass generateAdapter = false 2022-10-17 16:19:03 +01:00
Hugh Nimmo-Smith
623277e31f Lint 2022-10-17 16:13:49 +01:00
Hugh Nimmo-Smith
e877feed6e Add @JsonClass to all enums 2022-10-17 16:06:08 +01:00
Hugh Nimmo-Smith
29065b819f Remove unused class 2022-10-17 16:03:47 +01:00
Hugh Nimmo-Smith
e01ee619d3 Refactor error handling and report E2EE errors 2022-10-17 16:02:25 +01:00
Onuray Sahin
47c87141b2
Merge pull request #7338 from vector-im/feature/ons/qr_code_login_ui 
QR Code Login UI
 2022-10-17 17:20:07 +03:00
Benoit Marty
997341b962
Merge pull request #7282 from vector-im/feature/bma/remove_original_event 
Stop using `original_event` field
 2022-10-17 14:43:22 +02:00
Hugh Nimmo-Smith
d616251f26 Fix merge 2022-10-17 13:41:27 +01:00
Hugh Nimmo-Smith
e89774e160 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-17 13:26:35 +01:00
Hugh Nimmo-Smith
eb30ef166a Improve 404 handling 2022-10-17 12:32:40 +01:00
Hugh Nimmo-Smith
1976451c81 Lint 2022-10-17 12:23:14 +01:00
Onuray Sahin
91bb86d3c6 Code review fixes. 2022-10-17 14:16:29 +03:00
Hugh Nimmo-Smith
fb86ab70a2 Comments and error mapping 2022-10-17 12:05:32 +01:00
Hugh Nimmo-Smith
4306c57236 Thread safe use of OlmSAS 2022-10-17 12:01:12 +01:00
Hugh Nimmo-Smith
506fa729ea Cleanup 2022-10-17 11:50:56 +01:00
Hugh Nimmo-Smith
48de8f4e34 Fix bad merge 2022-10-17 11:48:35 +01:00
Hugh Nimmo-Smith
33be5c257d Refactor into dedicated files and companion objects 2022-10-17 11:24:48 +01:00
Hugh Nimmo-Smith
ed6bc01bef Resolve TODO 2022-10-17 10:54:28 +01:00
Hugh Nimmo-Smith
d979b50b2c Logging cleanup 2022-10-17 10:52:24 +01:00
Benoit Marty
b7570a3c5e Fix compilation error 2022-10-17 11:31:48 +02:00
Benoit Marty
0cdc21649e Fix unused import 2022-10-17 11:27:40 +02:00
dependabot[bot]
93a346392b
Bump gradle from 7.2.2 to 7.3.1 (#7364) 
* Bump gradle from 7.2.2 to 7.3.1

Bumps gradle from 7.2.2 to 7.3.1.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Try to fix build issue caused by KSP workaround

* Add missing dependency

* Suppress false positive in linter

* Suppress more false positives, fix 2 possible leaks

* Fix tests

* Ignore flaky test

* Use namespaces instead of packagenames in AndroidManifest files

* Reorder dependency groups

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
 2022-10-17 09:14:28 +02:00
Hugh Nimmo-Smith
fdc55965ca Linting 2022-10-14 17:23:26 +01:00
Hugh Nimmo-Smith
dc9b41d19a Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 17:12:08 +01:00
Jorge Martin Espinosa
f1acb4712c
Fix editing formatted messages in plain text editor (#7360) 
* Fix editing formatted messages in plain text editor

* Update changelog.d/7359.sdk

Co-authored-by: Benoit Marty <benoitm@matrix.org>

Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-10-14 15:15:12 +00:00
Onuray Sahin
6c10a9bf2d Code review fixes. 2022-10-14 18:10:18 +03:00
Hugh Nimmo-Smith
6426ff40d3 Linting 2022-10-14 14:18:50 +01:00
Hugh Nimmo-Smith
411b766890 Refactor to camelcase 2022-10-14 14:17:19 +01:00
Hugh Nimmo-Smith
4325600d27 Merge branch 'feature/ons/qr_code_login_ui' into feature/hughns/qr_code_login 2022-10-14 13:57:04 +01:00
Hugh Nimmo-Smith
e439b72e48 Handle master key trust during E2EE set up 2022-10-14 13:46:57 +01:00
Onuray Sahin
5953346b3d Merge branch 'develop' into feature/ons/qr_code_login_ui 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
 2022-10-14 15:17:55 +03:00
Benoit Marty
032fa37b64 Create UserDataSource.getUserOrDefault(). 2022-10-14 12:13:21 +02:00
Benoit Marty
5a2d74443d Let GetProfileInfoTask store result into DB, except when we want to do bulk insertion. 2022-10-14 12:07:52 +02:00
Hugh Nimmo-Smith
c00ce91214 Linting 2022-10-14 01:11:25 +01:00
Hugh Nimmo-Smith
c18439f99b Refactor code into api from internal 2022-10-14 01:07:19 +01:00
Hugh Nimmo-Smith
5abb786b6b Fix copyright on SDK 2022-10-14 00:59:31 +01:00
Hugh Nimmo-Smith
370652c04b Revert "Revert "Implementations of MSC3886 and MSC3903"" 
This reverts commit 489dfd7354.
 2022-10-13 22:37:19 +01:00
Hugh Nimmo-Smith
6399032312 Fix bad merge 2022-10-13 22:23:26 +01:00
Hugh Nimmo-Smith
7bc0bd3b57 Reduce logging 2022-10-13 22:15:07 +01:00
Hugh Nimmo-Smith
dd47297dfd QR login + E2EE set up 2022-10-13 22:14:55 +01:00
Hugh Nimmo-Smith
bc0843eddf Another default value fix 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
ac80ae5632 Set default value for optional params 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
ca7a6efade Add missing binding 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
e2f3dde5c1 Use correct var name 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
1e60f3c25b Make initialDeviceName optional 2022-10-13 22:13:56 +01:00
Hugh Nimmo-Smith
d0898a2b89 Linting 2022-10-13 22:13:30 +01:00
Hugh Nimmo-Smith
88238c0f04 Support for login by m.login.token during QR code sign in 2022-10-13 22:13:03 +01:00
Hugh Nimmo-Smith
489dfd7354 Revert "Implementations of MSC3886 and MSC3903" 
This reverts commit 1235db7895.
 2022-10-13 21:48:27 +01:00
Hugh Nimmo-Smith
e554b43bc6 Merge branch 'feature/ons/qr_code_login_ui' of https://github.com/vector-im/element-android into feature/ons/qr_code_login_ui 2022-10-13 21:27:09 +01:00
Onuray Sahin
fb2776dca4 Cherry pick previous commits. 2022-10-13 20:33:52 +03:00
Hugh Nimmo-Smith
81f2197199 Another default value fix 2022-10-13 16:11:41 +01:00
Hugh Nimmo-Smith
c6e7185f8b Set default value for optional params 2022-10-13 16:08:50 +01:00
Hugh Nimmo-Smith
8c86b3d297 Add missing binding 2022-10-13 16:02:57 +01:00
Hugh Nimmo-Smith
b5b32b7fda Use correct var name 2022-10-13 15:58:19 +01:00
Hugh Nimmo-Smith
5bff9ceec4 Make initialDeviceName optional 2022-10-13 15:35:45 +01:00
Hugh Nimmo-Smith
09da74b029 Linting 2022-10-13 15:19:39 +01:00
Hugh Nimmo-Smith
8645f74c77 Support for login by m.login.token during QR code sign in 2022-10-13 15:11:15 +01:00
Benoit Marty
92a2420952
Merge pull request #7293 from vector-im/feature/bma/android13 
Android 13
 2022-10-13 13:52:52 +02:00
Eric Decanini
963c0e5a50
Local Notification Settings Event (#7300) 
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Links notification settings toggle to pusher service

* Adds changelog file

* Adds error handling to VectorSettingsNotificationPreferenceFragment

* Removes comment in FakePushersService

* Adds parsing for LocalNotificationSettings event

* Adds changelog file

* Fixes post merge errors

* Fixes imports and improves string name

* Fixes legal copies

* Fixes kdoc punctuation

* Fixes string error

* Removes unused imports

* Moves LocalNotificationSettingsContent

* Fixes lint errors

* Fixes test errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Adds lost tests

* Adds PusherEntity migration

* Fixes session overview layout overlap

* Fixes switch being enabled by default

* Adds device id and unstable prefix
 2022-10-12 23:11:27 -04:00
Benoit Marty
beb334babe
Merge pull request #7335 from vector-im/feature/bma/upgrade_arrow 
Remove Arrow-kt dependency
 2022-10-12 16:26:02 +02:00
Maxime NATUREL
6626732b3b
Merge pull request #7276 from vector-im/feature/mna/device-manager-account-data 
[Device Management] Save matrix_client_information events on login/registration (PSG-769, PSG-771)
 2022-10-12 15:41:40 +02:00
Eric Decanini
9857fa6ca4
Makes "Enable Notifications for this session" respond to enabled value in pusher (#7281) 
* Adds push notifications switch

* Adds functionality to Push notification toggle

* Adds DefaultPushersServiceTest for togglePusher

* Adds DefaultTogglePusherTaskTest

* Adds SessionOverviewViewModelTest for toggling pusher

* Hides pusher toggle if there are no pushers of the device

* Adds changelog file

* Edits changelog file

* Fixes copyrights

* Unregisters checkedChangelistener in onDetachedFromWindow for switch view

* Links notification settings toggle to pusher service

* Adds changelog file

* Adds error handling to VectorSettingsNotificationPreferenceFragment

* Removes comment in FakePushersService

* Fixes post merge errors

* Fixes imports and improves string name

* Fixes legal copies

* Fixes kdoc punctuation

* Fixes string error

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Adds lost tests

* Adds PusherEntity migration

* Fixes session overview layout overlap

* Fixes switch being enabled by default

* Binds entire view to toggle switch
 2022-10-12 09:27:55 -04:00