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

4468 commits

Author SHA1 Message Date
Arnaud Ringenbach
15e3f258f3 Fix wildcard imports 2022-03-15 16:55:24 +01:00
Onuray Sahin
db0cfd4704
Merge pull request #5455 from vector-im/feature/ons/fix_poll_start_notifications 
Show notification for poll start events but not for responses
 2022-03-15 18:34:03 +03:00
Arnaud Ringenbach
56760ecddc Create SpanTemplateType and factorize template creation 2022-03-15 16:33:59 +01:00
Onuray Sahin
a47b589e72 Code review fixes. 2022-03-15 17:51:02 +03:00
Onuray Sahin
7fa43f0d1b Merge branch 'develop' into feature/ons/fix_poll_start_notifications 
* develop: (163 commits)
  Fix lint error.
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  ...
 2022-03-15 17:49:53 +03:00
ericdecanini
9806f1bf8f Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
 2022-03-15 15:48:17 +01:00
Aris Kotsomitopoulos
e0b93c2d2c
Merge pull request #5298 from vector-im/feature/aris/thread_live_thread_list 
Live Threads
 2022-03-15 15:14:26 +01:00
Arnaud Ringenbach
094ebe6764 Fix ktlint on TestPermalinkService 2022-03-15 14:57:59 +01:00
Arnaud Ringenbach
a68471afe3 Fix documentation on PermalinkService 2022-03-15 14:54:24 +01:00
Arnaud Ringenbach
c7aab7a3f6 Remove useless imports on TextPillsUtils 2022-03-15 14:52:13 +01:00
Arnaud Ringenbach
55fbed1a81 Remove useless PermalinkFactory import 2022-03-15 14:49:55 +01:00
Arnaud Ringenbach
ea4addf446 Fix TestPermalinkService header 2022-03-15 14:45:04 +01:00
Arnaud Ringenbach
5b04686827 Fix MarkdownParser unit tests 2022-03-15 14:27:17 +01:00
ariskotsomitopoulos
07eabf110d Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
 2022-03-15 14:23:48 +01:00
ariskotsomitopoulos
8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
 2022-03-15 14:21:04 +01:00
Onuray Sahin
b4df6e1ae8 Merge branch 'develop' into feature/ons/poll_tests 
* develop:
  Fix lint error.
  Fix lint error.
  Avoid stable prefix
  Support both unstable and stable prefixes.
 2022-03-15 16:16:17 +03:00
Onuray Sahin
1a76914828
Merge pull request #5345 from vector-im/feature/ons/fix_unstable_prefixes 
Support both unstable and stable prefixes
 2022-03-15 15:16:16 +03:00
Onuray Sahin
f4bdaf6151 Fix lint error. 2022-03-15 14:47:19 +03:00
Onuray Sahin
dd3178c36e Merge branch 'develop' into feature/ons/poll_tests 
* develop: (150 commits)
  Removes changelog file
  Fix PR comment
  Adds changelog file
  Refactors MessageBubbleView
  Updating changelog copy
  making use of the fake overrides for testing
  extracting the personalization complete emitting to a dedicated function
  making use of binding api instead of manual findviewbyid
  using consistent method naming for setting the capabilities override
  taking the personalization feature flag into account when calculating if personalization is supported - also removes a legacy loading workaround for the account creation step, we're navigating to a new screen AccountCreated so we have to stop the loading
  adding changelog entry
  using correct label for the avatar capability debug override
  forwarding to the profile picture flow when display name changing isn't supported but pictures are when personalising the profile
  formatting
  dynamically switching the onboarding flow based on the capabilities of the homeserver - when avatars can't be changed we complete the personlisation flow
  hiding the toolbar back button and handling system back as take the user home if the display name personalisation is not supported
  adding test around account creation via dummy
  dynamically changing the account created layout based on if the homeserver supports personalisation
  adding entry points for injecting and overriding the homeserver capabilities
  extracting method for the handling of the profile picture selection
  ...
 2022-03-15 14:39:51 +03:00
Arnaud Ringenbach
df794ee41f Move template creation to PermalinkService 2022-03-15 11:26:47 +01:00
Arnaud Ringenbach
4cf820cb12 Use client permalink base url on mentions if available 2022-03-15 10:34:04 +01:00
ariskotsomitopoulos
d7c486c55e Add fallback support rendering proposed in MSC3676 2022-03-14 16:04:08 +01:00
ariskotsomitopoulos
d894d8598c Format text 2022-03-14 12:44:25 +01:00
ariskotsomitopoulos
d215f03798 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-14 12:02:04 +01:00
ariskotsomitopoulos
c2ec7cfa0f Add more clear documentation 2022-03-14 11:54:29 +01:00
Maxime Naturel
291d7d7627 Fix some doc comment 2022-03-14 11:15:19 +01:00
Maxime Naturel
3d27d9d2d2 Fix filtering use case 2022-03-14 11:15:18 +01:00
Maxime Naturel
b72c357dd1 Removing unused imports 2022-03-14 11:15:18 +01:00
Maxime Naturel
0aaa650ac3 Using flow to show items counter 2022-03-14 11:15:17 +01:00
Maxime Naturel
c7dae341c0 (DRAFT) Room counter flow 2022-03-14 11:15:17 +01:00
ericdecanini
f24d8c2ada Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
 2022-03-13 20:13:03 +01:00
Onuray Sahin
a12f918dd5 Add poll test for users try to change their votes after poll is ended. 2022-03-11 19:19:20 +03:00
Benoit Marty
c89554c3f6
Merge pull request #5443 from vector-im/task/eric/stable-hierarchy-endpoint 
Changes room hierarchy endpoint to stable
 2022-03-11 17:05:13 +01:00
Onuray Sahin
7c6167ace9 Add poll test for ended polls. 2022-03-11 18:59:27 +03:00
Benoit Marty
fa104adefc Fix all warnings in file E2eeSanityTests.kt 2022-03-11 15:35:21 +01:00
Onuray Sahin
8b08d3db25 Fix poll test for users vote different options. 2022-03-11 11:36:06 +03:00
dependabot[bot]
2d5638baaf
Bump libphonenumber from 8.12.44 to 8.12.45 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.44 to 8.12.45.
- [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.44...v8.12.45)

---
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>
 2022-03-10 23:09:19 +00:00
ericdecanini
7226864cc9 Improves code formatting in ResolveSpaceInfoTask 2022-03-10 21:41:17 +01:00
ericdecanini
fe3c9cc09f Reverts to fix by removing event timestamp condition 2022-03-10 19:15:12 +01:00
ariskotsomitopoulos
f31b130b49 Fix unit tests 2022-03-10 19:11:14 +02:00
ariskotsomitopoulos
34cfdfb6fe Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-10 18:48:41 +02:00
Benoit Marty
becdd1ce29 Fix test compilation after method renaming 
Also rename in the comment
 2022-03-10 17:01:45 +01:00
ariskotsomitopoulos
a758ad71e6 Add is_falling_back support for rich thread replies 
Enhance thread awareness handler so normal replies with thread disabled will be visible in te appropriate thread
Fix conflicts
 2022-03-10 17:51:02 +02:00
ericdecanini
628a160c3a Reverts timestamp condition but changes timing of setting closedTime 2022-03-10 16:32:42 +01:00
ericdecanini
080844dc9d Removes event timestamp condition for sdk poll voting 2022-03-10 16:28:22 +01:00
Onuray Sahin
cd29b1aa4b Add poll test for users vote different options. 2022-03-10 17:40:16 +03:00
Benoit Marty
66f76fbea3
Merge pull request #5450 from SpiritCroc/fix-5448 
Fix missing messages when forward paging with chunks > 50 messages
 2022-03-10 15:08:58 +01:00
Onuray Sahin
a5441fdf22 Add poll test for someone else chose the same option. 2022-03-10 16:51:23 +03:00
ericdecanini
a5af4783cc Renames mapToSpaceChildInfoList to mapSpaceChildren in DefaultSpaceService 2022-03-10 14:41:44 +01:00
Onuray Sahin
f029759f9a Add poll test for changing previous answer. 2022-03-10 15:47:40 +03:00
Onuray Sahin
1b348401bd Add poll test for a single vote. 2022-03-10 15:31:32 +03:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all 
Remove unused resources
 2022-03-10 13:03:27 +01:00
Onuray Sahin
fd3e5128c7 Test initial poll event. 2022-03-10 14:30:03 +03:00
ericdecanini
a891f59397 Replaces lateinit var with passing params 2022-03-10 12:02:25 +01:00
ariskotsomitopoulos
21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
 2022-03-10 12:55:13 +02:00
ariskotsomitopoulos
fd30d38603 Fix line length 2022-03-10 12:51:40 +02:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi 
Refactoring for safer olm and megolm session usage
 2022-03-10 11:13:07 +01:00
ariskotsomitopoulos
45ee9f85e5 Check if the server supports MSC3440 using the stable flag from /versions api 2022-03-10 12:07:05 +02:00
ariskotsomitopoulos
03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02:00
Adam Brown
d3fc3791bc Merge branch 'main' into develop 2022-03-09 21:33:16 +00:00
ariskotsomitopoulos
92c1bc944d Fix realm crash on v1.4.4 2022-03-09 20:03:42 +02:00
ericdecanini
2f706d6fae Replaces children state event room id with space id 2022-03-09 18:42:35 +01:00
ericdecanini
f76f73f8ad Refactors DefaultSpaceService querySpaceChildren 2022-03-09 18:36:56 +01:00
Adam Brown
60bc3b09b7 updating to version 1.4.6 in prep for next release cycle 2022-03-09 16:03:00 +00:00
ericdecanini
bbc6e8bbce Replaces caught Exception with HttpException 2022-03-09 16:41:18 +01:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Benoit Marty
7d78c8819c Ignore some other lint warnings 2022-03-09 14:40:59 +01:00
Benoit Marty
cbdc28dd9b
Merge pull request #5457 from vector-im/michaelk/ignore_flaky_test 
Ignore flaky VerificationTest
 2022-03-09 12:18:55 +01:00
ericdecanini
047e767f34 Adds coroutinesTest to matrix sdk gradle 2022-03-09 12:18:46 +01:00
Benoit Marty
02ba09900f
Merge pull request #5434 from vector-im/feature/nfe/space_unread_count_dm 
include dms number in space unread number badge
 2022-03-09 11:16:07 +01:00
ericdecanini
63cd79dc4f Removes debug logs 2022-03-09 10:53:18 +01:00
Benoit Marty
20c1886fed Support both unstable and stable prefixes. 
Author: Onuray
 2022-03-09 10:40:43 +01:00
ericdecanini
fb374b7374 Fixes wrong path parameter in getSpaceHierarchy 2022-03-09 09:57:20 +01:00
Valere
96b51744b6 Fix ktlint 2022-03-08 23:19:21 +01:00
ericdecanini
31f300c724 Adds error print stack trace 2022-03-08 21:32:13 +01:00
ericdecanini
54828f76cf Adds slash to v1 prefix path 2022-03-08 17:26:01 +01:00
ericdecanini
0892525c84 Adds debug logs 2022-03-08 17:19:11 +01:00
ericdecanini
82b5fc9557 Removes unused imports 2022-03-08 16:50:49 +01:00
ariskotsomitopoulos
a53d5bdba2 Remove eventType from /relations api for threads 2022-03-08 16:41:38 +02:00
ericdecanini
eb46067c08 Changes caught exception type to Throwable 2022-03-08 15:40:13 +01:00
Michael Kaye
67c9584215 Ignore flaky VerificationTest 2022-03-08 14:08:30 +00:00
ariskotsomitopoulos
8c6902aa23 Fix reply within thread edition 2022-03-08 14:50:27 +02:00
ericdecanini
e5299d716c Fixes legal comments 2022-03-08 13:15:26 +01:00
ericdecanini
0af6ae6075 Adds logic for using stable and unstable hierarchy endpoints 2022-03-08 13:10:18 +01:00
Onuray Sahin
7a1d3aa3f2 Filter poll response events in latest event query. 2022-03-08 14:07:14 +03:00
ericdecanini
bc3b8d0a16 Adds testing for fallback api 2022-03-08 11:51:17 +01:00
Michael Kaye
ab3f3fba68 Attempt to prevent the deprecated warning/error about Provider usage. 2022-03-08 10:38:23 +00:00
Michael Kaye
fb05731bb9 If no identity server configured, log at info, not warn. 2022-03-08 10:12:13 +00:00
SpiritCroc
768262094c Fix missing messages when forward paging with chunks > 50 messages 
- offsets() was not limiting in the right direction when loading
  messages forwards
- after fixing offsets(), more recent messages would not be loaded due
  to the isLastForward() check, so better prioritize the SUCCESS
  LoadMoreResult over the REACHED_END here
 2022-03-08 10:54:27 +01:00
ariskotsomitopoulos
557fd7eacf Replace thread timeline and thread summaries EventInsertType from INCREMENTAL_SYNC to PAGINATION 2022-03-08 10:13:56 +02:00
ericdecanini
3b0a565822 Changes room hierarchy endpoint 2022-03-07 16:51:40 +01:00
Michael Kaye
1569c2f3c7 Missing import of at-Ignore annotation. 2022-03-07 14:46:01 +00:00
Michael Kaye
f32da28285 Ignore ThreadMessagingTest as it seems to cause other integration tests to fail. 2022-03-07 13:14:38 +00:00
NIkita Fedrunov
a3dcee55e4 include dms number in space unread number badge 2022-03-07 08:35:53 +01:00
ariskotsomitopoulos
d19dd91d67 Format code 2022-03-05 20:49:11 +02:00
ariskotsomitopoulos
bce5bc8389 Fix wrong versioning regex pattern 
Add MSC3440 support using /version/ and /capabilities
 2022-03-05 17:13:02 +02:00
Valere
3c931d6f6d Save valid backup key before downloading keys 2022-03-04 19:21:19 +01:00
Valere
db84c679b4 Code review cleaning 2022-03-04 19:21:19 +01:00
Valere
99a07af9de Better comment 
Co-authored-by: poljar <poljar@termina.org.uk>
 2022-03-04 19:21:19 +01:00
Valere
31d3fe38aa Better comment 
Co-authored-by: poljar <poljar@termina.org.uk>
 2022-03-04 19:21:19 +01:00