mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-23 11:16:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
20661 commits 161 branches 157 tags 267 MiB
Commit graph

5640 commits

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