jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,858 Commits 4 Branches 3 Tags 186 MiB
Commit Graph

5514 Commits

Author SHA1 Message Date
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
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
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
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
Onuray Sahin 91bb86d3c6 Code review fixes. 2022-10-17 14:16:29 +03: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
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
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 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
Onuray Sahin 1e1affbb7b Merge branch 'develop' into feature/ons/qr_code_login_ui 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	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/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
 2022-10-12 14:32:09 +03:00
Benoit Marty 1669316682 Remove dependency to arrow. Please use `org.matrix.android.sdk.api.util.Optional` instead. 2022-10-12 10:20:52 +02:00
Hugh Nimmo-Smith 1235db7895 Implementations of MSC3886 and MSC3903 2022-10-11 23:33:30 +01:00
Jorge Martin Espinosa def67b2e7d
Integrate WYSIWYG editor (#7288) 
* Add WYSIWYG lib dependency

* Replace EditText with RichTextEditor

* Add bold button, fix sending formatting messages issues

* Add missing inline formatting buttons, make scrollview horizontal

* Disable autocomplete for rich text editor

* Add formatted text to messages sent, replies, quotes and edited messages.

* Several fixes

* Add changelog

* Try to fix lint issues

* Address review comments.

* Exclude Epoxy KSP generated files from ktlint checks
 2022-10-11 17:05:47 +02:00
Maxime NATUREL 5649933b03 Removing some TODOs 2022-10-11 14:03:12 +02:00
Maxime NATUREL 9877e90df6 Adding use cases to get and set the extra matrix client Info 2022-10-11 14:01:43 +02:00
Eric Decanini 2fe636e93b
Adds Push Notification toggle to Device Manager (#7261) 
* 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

* Fixes post merge errors

* Fixes legal copies

* Removes unused imports

* Fixes lint errors

* Fixes test errors

* Fixes error

* Fixes error

* Fixes error

* Fixes error

* Fixes error
 2022-10-10 19:21:34 -04:00
ericdecanini 4af2e62150 Merge branch 'develop' into feature/eric/msc3881 2022-10-09 12:45:19 -04:00
ericdecanini cd2e693f0c Fixes legal copy 2022-10-09 09:48:36 -04:00
ericdecanini 11e251fc1d Fixes legal copy 2022-10-09 09:48:18 -04:00
ericdecanini d191bfeaf7 Fixes legal copy 2022-10-09 09:46:07 -04:00
Benoit Marty e9e2e5011b Fix test compilation. 2022-10-07 10:08:33 +02:00
Florian Renaud 4091d27311 Add "io.element.voice_broadcast_info" state event 2022-10-06 16:23:40 +02:00
Benoit Marty 15616ecc7c Fix compilation issue after rebase 2022-10-05 17:35:05 +02:00
Benoit Marty f2bbdc3906 API 33: fix compilation warnings 2022-10-05 17:35:05 +02:00
Benoit Marty 80c210e62d
Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons 
[Device Management] Show correct device type icons (PSG-775)
 2022-10-05 17:30:42 +02:00