mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity
12830 commits 161 branches 158 tags 270 MiB
Commit graph

4123 commits

Author SHA1 Message Date
Benoit Marty
ae8d1d1429 Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10 2022-01-10 15:10:08 +01:00
ariskotsomitopoulos
1b41a72e72 Fix Quote from within a thread 2022-01-10 14:14:11 +02:00
ariskotsomitopoulos
6503412928 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
 2022-01-10 13:26:57 +02:00
ariskotsomitopoulos
0fb26da355 PR Remarks 2022-01-10 11:26:03 +02:00
ariskotsomitopoulos
e541636802 Make TimelineSettings aware of rootThreadEventId and welcome a new Thread mode for the timeline creation 2022-01-10 11:20:31 +02:00
Valere
de08afdfad code review 2022-01-10 09:41:51 +01:00
Valere
6a34b999f2 New SDK Api for to device and event stream listener 2022-01-10 09:41:51 +01:00
ariskotsomitopoulos
50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos
ae81f61958 fix integration test 2022-01-07 16:28:58 +02:00
Benoit Marty
37f0ffab8b Fix test compilation issue 2022-01-07 14:46:40 +01:00
Benoit Marty
d14dadde27
Merge branch 'develop' into feature/dla/fix_reply_and_quote_newlines 2022-01-07 14:43:41 +01:00
Benoit Marty
bcebfff1a2
Merge pull request #4864 from vector-im/feature/aris/linter_github_actions_improvement 
Enhance Linter Github Actions Reporting
 2022-01-07 14:25:29 +01:00
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
ariskotsomitopoulos
41bf1ccc07 Remove adb timeout 2022-01-07 11:03:54 +02:00
Benoit Marty
b46b76c22a
Merge pull request #4753 from vector-im/feature/fre/tagged_events 
Support tagged events in Room Account Data (MSC2437)
 2022-01-06 21:06:44 +01:00
Florian Renaud
8d7b2ab5d8 Add missing json class annotation 2022-01-06 15:32:14 +01:00
ariskotsomitopoulos
abf8932747 fix typo 2022-01-06 12:25:19 +02:00
ariskotsomitopoulos
33a4eac7d2 - Fix github actions ktlint reports 
- Publish results on PR via commenting
- Support for all modules along with tests
- Code format & emoticons
 2022-01-06 00:26:47 +02:00
ariskotsomitopoulos
261030f51e - Fix integration tests (still not perfect while github actions are very very limited for that) 
- Split them in msdk and app test along with multiple smaller steps.
- Mark the not working tests with @Ignore so that they will not run neither local or on github actions
- Add user friendly comment on PR to view the results
 2022-01-05 23:42:57 +02: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
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
884fb629c3 ktlint 2022-01-04 18:21:03 +01:00
Florian Renaud
daadf72ffe Code review 2022-01-04 18:04:30 +01:00
Florian Renaud
f008abde4f Merge branch 'develop' into feature/fre/tagged_events 2022-01-04 17:23:04 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty
39ff9da3c1
Merge pull request #4846 from vector-im/feature/dla/fix-unread-message-indicator-no-messages 
Fix unread messages indicator on room list if no messages
 2022-01-04 15:57:26 +01:00
Benoit Marty
df957971a8 Add some logs to try to understand an error on the production app. Also propagate the exception if this is not a registration flow response. 2022-01-04 14:44:08 +01:00
David Langley
9f13a9df54 If latestPreviewableEvent is null we should return false(no messages in room). 2022-01-04 12:20:56 +00:00
ariskotsomitopoulos
84c537315c Github actions test 2022-01-04 00:38:50 +02:00
ariskotsomitopoulos
ef2c32e2c9 Github actions test 2022-01-04 00:32:39 +02:00
ariskotsomitopoulos
925c1671a6 Add more integrations tests for threads 2022-01-03 21:09:36 +02:00
ariskotsomitopoulos
3ef960c4c3 Update copyright 2022-01-03 19:45:48 +02:00
ariskotsomitopoulos
929cc29f77 Update copyright 2022-01-03 19:18:51 +02:00
ganfra
91215854f4 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2022-01-03 16:07:05 +01:00
ganfra
12b775c26d Timeline : clean after PR reviews 2022-01-03 16:06:48 +01:00
ariskotsomitopoulos
e482ef4262 First local thread integration test 2022-01-03 16:51:12 +02:00
Benoit Marty
b39caeb04d 2 new enums 2022-01-03 15:27:59 +01:00
Benoit Marty
98df733257 Split long line and use Kotlin style 2022-01-03 15:25:21 +01:00
ariskotsomitopoulos
c2183800d3 Github actions improvement test 2022-01-03 12:14:14 +02:00
ariskotsomitopoulos
f9e03aa99e Remove unused code 2022-01-03 11:33:38 +02:00
ariskotsomitopoulos
694b8de034 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
 2022-01-03 11:08:22 +02:00
Benoit Marty
95b1ae9488
Merge branch 'develop' into maths 2021-12-31 16:41:06 +01:00
Benoit Marty
454baf8beb
Merge branch 'develop' into feature/issue-2610-override-nick-color-via-user-account-data 2021-12-31 13:02:24 +01:00
Benoit Marty
5407c84b2f
Merge pull request #4783 from vector-im/feature/adm/unable-to-change-avatar 
Unable to change avatar due to `NetworkOnMainThread`
 2021-12-30 12:30:18 +01:00
Benoit Marty
6a73c9315a
Merge pull request #4809 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.40 
Bump libphonenumber from 8.12.39 to 8.12.40
 2021-12-30 10:30:27 +01:00
Benoit Marty
3abba1932f
Workaround to fetch all the pending toDevice events from a Synapse homeserver (#4614) 
Workaround to fetch all the pending toDevice events from a Synapse homeserver

Co-authored-by: Valere <valeref@matrix.org>
 2021-12-30 10:28:52 +01:00
ariskotsomitopoulos
0e30f4e817 Fix code quality issues 2021-12-25 23:35:40 +02:00
ariskotsomitopoulos
9ef4e1e83f Fix code quality issues 2021-12-25 13:42:53 +02:00
dependabot[bot]
863b201793
Bump libphonenumber from 8.12.39 to 8.12.40 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.39 to 8.12.40.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.39...v8.12.40)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-23 23:07:37 +00:00
ariskotsomitopoulos
581f71e89d Remove unused code 2021-12-23 17:22:27 +02:00
ariskotsomitopoulos
f06397023a Add support when there no threads messages to init timeline. Init as the normal one and hide them on the app side. That is also helpful to work to load all the threads when there is no server support 2021-12-23 17:19:36 +02:00
ariskotsomitopoulos
5a7d12a9a5 Enhance RoomEventFilter with MSC3440 2021-12-21 20:04:50 +02:00
ariskotsomitopoulos
7048080ee0 Merge branch 'develop' into feature/aris/threads 2021-12-21 13:24:03 +02:00
ariskotsomitopoulos
ed48eb38c9 Apply ktlinFormat 2021-12-21 13:23:17 +02:00
Adam Brown
7714445d24 moving the updateAvatar work to the io dispatcher 
- fixes some devices/OS's from attempting to run okhttp on the main thread
 2021-12-21 09:33:25 +00:00
Adam Brown
18b38fe21e making the file upload file creation all happen on the IO dispatcher 2021-12-21 09:33:25 +00:00
ganfra
55c0f1fcb3 Update versions to 1.3.13 2021-12-20 15:35:09 +01:00
ganfra
c6a118fc1f Update versions to 1.3.12 2021-12-17 19:05:17 +01:00
Florian Renaud
3bd2b77af3 Fix package name 2021-12-17 15:55:26 +01:00
Florian Renaud
706c5b2b32 Add tagged events model 2021-12-17 15:54:20 +01:00
Florian Renaud
f9b69fff9e Add tagged event entry in room account data types 2021-12-17 15:39:25 +01:00
ariskotsomitopoulos
cc7e3ea78c Improve init thread query 2021-12-17 01:25:50 +02:00
ariskotsomitopoulos
5723465106 Fix local notification badge number 2021-12-17 01:23:09 +02:00
ariskotsomitopoulos
a60f6e996a Enhance thread awareness to support stickers 2021-12-17 00:46:47 +02:00
ariskotsomitopoulos
a187e0ec33 Enhance thread awareness to recognise the type of messages that are not able to be send as a reply such as images, videos, audios, stickers 2021-12-16 22:03:42 +02:00
ariskotsomitopoulos
638d56c707 Fix update from develop/prod to threads 2021-12-16 17:10:29 +02:00
David Langley
e7bb030d52 full markdown should work in replies, was hardcoded to simple irrespective of prefrence. 2021-12-16 14:10:49 +00:00
David Langley
bc6ca2449e Add advanced parser annotation 2021-12-16 13:13:40 +00:00
David Langley
a3a8a5b0b5 Extract reply formatting 2021-12-16 12:47:06 +00:00
ariskotsomitopoulos
3acdccb339 Disable polls from within threads but allow users to vote if the poll is a root thread message 2021-12-15 16:31:58 +02:00
ariskotsomitopoulos
20357ce5c4 - Fix remaining conflicts with develop 
- Disable thread awareness when threads are enabled
 2021-12-15 14:38:08 +02:00
David Langley
13dc2d5b76 Fix documentation. 2021-12-15 10:03:14 +00:00
David Langley
bef238f851 Add simple parser for use with just quotes/replies 2021-12-14 20:40:44 +00:00
ariskotsomitopoulos
cd95fc41e4 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.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/send/LocalEchoEventFactory.kt
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
#	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/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
#	vector/src/main/res/layout/fragment_room_detail.xml
 2021-12-14 20:18:54 +02:00
David Langley
96062b7daa Enable on replies and quotes even if preference is disabled to fix newline issues. 2021-12-14 17:10:54 +00:00
ariskotsomitopoulos
6a33c41091 Fix stickers in unencrypted rooms 2021-12-14 17:45:07 +02:00
ariskotsomitopoulos
2aa24f0a0d Fix threads sort order, newest first 2021-12-14 16:30:59 +02:00
David Langley
20b5742227 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_reply_and_quote_newlines 2021-12-14 13:46:45 +00:00
Benoit Marty
fa65cc59fe Version++ 2021-12-14 14:46:08 +01:00
ariskotsomitopoulos
5ceed4096e Fix threads sort order, newest first 2021-12-14 15:44:38 +02:00
ariskotsomitopoulos
d56281dca7 - Enhance local notification to work with read receipt & the latest chunk 
- Local notification mentioning system
- Fix/Improve thread list filtering
 2021-12-14 13:35:08 +02:00
Benoit Marty
fa060051ed
Merge pull request #3970 from vector-im/feature/ons/fallback_keys 
Fallback keys implementation
 2021-12-13 23:36:20 +01:00
Onuray Sahin
f028f9836b Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (49 commits)
  Update changelog.d/4592.bugfix
  Remove jcenter from here, let's see what the CI will say
  Common struct for each maven repo
  Rename the file to group them
  Add changelog file
  Revert PR 4592 for devtools
  Enhance include groups implementation by decoupling them to a separate file
  Cleanup
  Legals: improve API to get homeserver terms
  Legals: update setting icon
  Auto-review
  Add a help section in the settings.
  Changelog
  Color for links
  Use same height than the loading item to avoid dynamic resizing
  Legals: only display external URLs.
  Legals: Move the 2 copyrights items to the new legal screen
  Add some space between the 2 TextViews, and improve the layout
  Legals: Move the 3 element links to the new legal screen
  Rename some classes
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
 2021-12-13 17:44:21 +03:00
Valere
76960f8b67
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt 
Co-authored-by: poljar <poljar@termina.org.uk>
 2021-12-10 16:12:14 +01:00
Valere
38a8e8b003
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt 
Co-authored-by: poljar <poljar@termina.org.uk>
 2021-12-10 16:11:58 +01:00
Onuray Sahin
9b2a3cf445 Code review fixes. 2021-12-10 17:57:57 +03:00
Benoit Marty
bf7907a119 Legals: improve API to get homeserver terms 2021-12-10 15:35:46 +01:00
Benoit Marty
411fd31d4c Legals: Trick to get the homeserver policy 2021-12-10 15:34:25 +01:00
ariskotsomitopoulos
57ef0b59ab Disable local echo for normal messages while there is a duplication 2021-12-09 20:29:13 +02:00
ariskotsomitopoulos
b1d4031a76 Add/Fix local echo to threads timeline 2021-12-09 16:33:11 +02:00
Onuray Sahin
be9e592aa5 Do not allow to vote the same option twice. 2021-12-09 16:08:59 +03:00
Onuray Sahin
b2e599ea2b Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (21 commits)
  Remove automation for new Delight board
  Remove automation for old Delight board
  Bump gradle from 7.0.3 to 7.0.4
  Bump realm-gradle-plugin from 10.8.1 to 10.9.0
  Bump libphonenumber from 8.12.38 to 8.12.39
  Bump mavericks from 2.4.0 to 2.5.0
  removing no longer possible branches
  adding a consistent padding to allow message types to avoid touching the side gutter
  Upgrade OLM to v3.2.7 and get it from our maven repository.
  removing manual send status spacing - it's no longer needed as the send status is always present (but invisible)
  removing manual end alignment for voice messages as send status gutter is now always present
  forcing the send spacing to always be taking into account - ensures all message lengths are consistent
  capping the preview image url based on the height - stops large screens eg tablets from attempting to fill the screen
  matching iOS max line rules for the preview description
  using themed colours for the close button
  limiting title to avoid overlapping with close icon
  flattening preview url view layout with custom view to reduce view hierarchy
  adding changelog entry
  updating url preview to match new designs
  removing now longer needed Mode argument
  ...

# Conflicts:
#	vector/src/main/res/layout/item_timeline_event_base.xml
 2021-12-09 15:38:15 +03:00
Onuray Sahin
04a7590804 Code review fixes. 2021-12-09 15:09:12 +03:00
ganfra
1280687640 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-09 12:36:59 +01:00
ganfra
bf287d1827 Timeline: clean up 2021-12-09 12:35:23 +01:00
ganfra
1e2e9e1070 Timeline: change a bit when postPagination is triggered 2021-12-09 12:26:40 +01:00