mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 11:28:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
16558 commits 7 branches 124 tags 230 MiB
Commit graph

4801 commits

Author SHA1 Message Date
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
SpiritCroc
56cae372b4 Add Schildi-dbg settings 
To control more invasive debugging

Change-Id: I7ee2980388db8999a76992ee7fffc70d8383a283
 2022-03-15 11:19:53 +01:00
SpiritCroc
c214c2233f [TMP] Update timeline debugging 
And clean up some debugging that's probably not needed anymore

Change-Id: I3b154280487f02479f7c40b543da43ca39e9e2e3
 2022-03-15 10:57:34 +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
SpiritCroc
d0909c1790 [TMP] Show inconsistencies toast for developers investigating this 
Change-Id: I06165bddcae980db60750ef77925c7b65704f3a2
 2022-03-12 10:38:02 +01:00
SpiritCroc
647dd4398e Fix modifying the wrong events in TimelineChunk 
I was observing cases where builtEvents[modificationIndex] was not
having the same eventId as the udpatedEntity in.
In particular, I observed both cases that
- there was no item in the list yet with the same eventId as the updated
  one
- there was an item with the same eventId already in the list, but at a
  different position.

Whenever this happened, the timeline would render missing, duplicated,
or swapped messages in the timeline.

Instead of relying on the modificationIndex to be the same for both the
change set and builtEvents, look up the proper index by eventId.

Change-Id: Ic03bdcc8210ec87b786795848f31e9085096b903
 2022-03-12 09:32:25 +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
SpiritCroc
8d04a48157 Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward 
Imagine scenario:

[this] -> [chunkToCheck] -> [lastForwardChunk]

Then, both `isLastForward` checks will not return, and also the `chunkToCheck.doesNextChunksVerifyCondition { it == this }` will return false.
Since both chunks are connected to the last forward chunk, `isMoreRecent()` will still return `true`, which is wrong in this case.
So do not only check if chunkToCheck has this as any of the next chunks, but also the other way round.

Change-Id: I98727d85837e9b38a42297568df82f957b3a2dca
 2022-03-11 11:29:43 +01:00
SpiritCroc
24133ba7b5 isReadMarkerMoreRecent(): use helper to properly compare chunks 
Change-Id: I878b8145d3a9c85ea815f369e5d8f810343c8f62
 2022-03-11 11:29:39 +01:00
SpiritCroc
6ba02629ec Fix ChunkEntity.isMoreRecentThan() if both chunks linked to last forward 
Imagine scenario:

[this] -> [chunkToCheck] -> [lastForwardChunk]

Then, both `isLastForward` checks will not return, and also the `chunkToCheck.doesNextChunksVerifyCondition { it == this }` will return false.
Since both chunks are connected to the last forward chunk, `isMoreRecent()` will still return `true`, which is wrong in this case.
So do not only check if chunkToCheck has this as any of the next chunks, but also the other way round.
 2022-03-11 11:27:05 +01:00
SpiritCroc
0564942b0c isReadMarkerMoreRecent(): use helper to properly compare chunks 2022-03-11 11:21:59 +01:00
Onuray Sahin
8b08d3db25 Fix poll test for users vote different options. 2022-03-11 11:36:06 +03:00
SpiritCroc
12e4853c59 [TMP] More missing message debugging 
Change-Id: Ia6ad08fa6a51365ba6f4e5a880f9ce804f3026c5
 2022-03-11 08:50:17 +01: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
SpiritCroc
f5afdefe2f Merge tag 'v1.4.4' into sc 
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/bg_unread_notification.xml
	vector/src/main/res/drawable/ic_add_reaction_small.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-03-10 13:26:09 +01: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
SpiritCroc
7bfd3c8dca [TMP] Add some debugging to detect timeline inconsistencies 
Note: may affect performance a little when loading the timeline, so
better revert when we are confident we have fixed the issue.

Change-Id: Ic4d31e47948984371a02ce51af7a8d56cb120234
 2022-03-10 12:36:00 +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
SpiritCroc
2498da3631 Fix updating unread marker if not to latest chunk 
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.

Change-Id: I175b335cf90328f676238ca23e45aa0f91b269c9
 2022-03-09 18:07:38 +01:00
SpiritCroc
6c4e404ba1 Fix updating unread marker if not to latest chunk 
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.
 2022-03-09 18:02:53 +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
SpiritCroc
430963ae28 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

Change-Id: I48011adc57ff2d48bb7be37cb4dda8bd8f745bf8
 2022-03-08 18:29:21 +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
Valere
7616e2d14c better comment 
Co-authored-by: poljar <poljar@termina.org.uk>
 2022-03-04 19:21:19 +01:00
Valere
5d952feef9 code review cleaning 2022-03-04 19:21:19 +01:00
Valere
ada83d0ba6 fix test 2022-03-04 19:21:19 +01:00
Valere
714e1d79b7 clean log level 2022-03-04 19:21:19 +01:00
Valere
6546f98858 use mutex on suspend and not synchronized 2022-03-04 19:21:19 +01:00
Valere
49d33f3a4b avoid duplicate userId on key download 2022-03-04 19:21:19 +01:00
Valere
87de51b184 Use loggerTag 2022-03-04 19:21:19 +01:00
Valere
b7bf39b99a resurrect unwedge test + cleaning 2022-03-04 19:21:19 +01:00
Valere
078ed1b2d1 dispatch network calls to io 2022-03-04 19:21:19 +01:00
Valere
f238739438 Clean ensure olm, fix unwedging, better logs 2022-03-04 19:21:19 +01:00
Valere
2d9beb67b4 extract test to dedicated class 2022-03-04 19:21:19 +01:00
Valere
122e785f14 clean test 2022-03-04 19:21:19 +01:00
Valere
2f665dd08f cleaning 2022-03-04 19:21:19 +01:00
Valere
11e888162c test forward better key 2022-03-04 19:21:19 +01:00
Valere
9eb0473d74 better logs 2022-03-04 19:21:19 +01:00
Valere
ade16a0aa1 protect race on prekey + logs 2022-03-04 19:21:19 +01:00
Valere
9b3c5d2153 Improve inbound group session cache + mutex 2022-03-04 19:21:19 +01:00
Valere
c97de48474 Added e2ee sanity tests 2022-03-04 19:21:19 +01:00
Valere
24c51ea41a Clean megolm import code 2022-03-04 19:21:19 +01:00
Valere
87d930819a Fix test compilation 2022-03-04 19:21:19 +01:00
Valere
9df5f17132 protect olm account access 2022-03-04 19:21:19 +01:00
Valere
33f9bc52cb Protect olm session from concurrent access 2022-03-04 19:21:19 +01:00
Valere
10ea166b2a Extract olm cache store 2022-03-04 19:21:19 +01:00
SpiritCroc
2f5df9133f Merge tag 'v1.4.2' into sc 
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.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/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
 2022-03-04 11:42:30 +01:00
ClaireG
2a9e582db5
Merge pull request #5405 from vector-im/cgizard/ISSUE-5402 
[Create private room] Picture doesn't not displayed
 2022-03-03 22:40:26 +01:00
ariskotsomitopoulos
daafddbe71 fix Realm crash 2022-03-03 19:10:40 +02:00
ariskotsomitopoulos
39bd437f75 Temp fix Realm crash 2022-03-03 17:04:08 +02:00
ariskotsomitopoulos
e4282e5f29 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/DefaultRelationService.kt
 2022-03-03 13:56:59 +02:00
ariskotsomitopoulos
719e254bb4 Format Code 2022-03-03 13:51:41 +02:00
ariskotsomitopoulos
33b170077e force refresh home server capabilities 2022-03-03 13:49:53 +02:00
ariskotsomitopoulos
623e9257a5 Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics 2022-03-03 12:56:12 +02:00
Benoit Marty
dd0d2e8101
Merge pull request #5383 from vector-im/dependabot/gradle/com.google.android.gms-oss-licenses-plugin-0.10.5 
Bump oss-licenses-plugin from 0.10.4 to 0.10.5 - REQUIRE HUMAN INTERVENTION
 2022-03-03 11:55:00 +01:00
SpiritCroc
20ba02db57 [TMP] Raise sync logging level 
So we get these in rageshakes

Change-Id: I1efb8dd759cd03607ade0611c92a87df1b20c7f3
 2022-03-03 08:55:34 +01:00
Benoit Marty
4396390409 Fix lint error (false positive, but anyway, not used) 2022-03-02 22:14:54 +01:00
ariskotsomitopoulos
214e0efcd9 Add Markdown support to thread summaries and thread list 2022-03-02 13:47:08 +02:00
Tiago Loureiro
ad8809196f Fix overflow on media cache size 2022-03-01 13:12:46 -03:00
Filip Rakić
1216dde9c5 ignore KeysBackup tests 2022-03-01 13:16:01 +01:00
Benoit Marty
9cc35644a3
Merge pull request #5379 from vector-im/feature/aris/cleanup_threads_build_config 
Cleanup enabling threads from buildConfig
 2022-02-28 21:10:20 +01:00
Benoit Marty
71aac37ec7
Merge pull request #5330 from vector-im/feature/fga/more_realm_fixing 
Feature/fga/more realm fixing
 2022-02-28 21:02:10 +01:00
ariskotsomitopoulos
ae98185c9d Cleanup enabling threads from buildConfig 2022-02-28 17:39:40 +02:00
ariskotsomitopoulos
e59f2bba0a Add analytics to threads 2022-02-28 17:13:06 +02:00
ariskotsomitopoulos
eda723c230 Remove fetching thread summaries when homeserver do not support MSC3440 2022-02-28 12:35:27 +02:00
dependabot[bot]
ca56865dd1
Bump libphonenumber from 8.12.43 to 8.12.44 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.43 to 8.12.44.
- [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.43...v8.12.44)

---
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-02-24 23:10:16 +00:00
Benoit Marty
ca8b69e377
Use correct copyright 2022-02-24 14:20:48 +01:00
ariskotsomitopoulos
8b254212af Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-02-24 12:45:08 +02:00
ganfra
f7c79a6de2 Realm: fix remaining frozen result 2022-02-23 18:02:02 +01:00
ganfra
beeee7c84b Realm: avoid opening realm if not necessary in ReadReceiptsSummaryMapper 2022-02-23 18:01:19 +01:00
ganfra
fb2ed9a7ac Rename getTimeLine to getTimeline to align naming. Also create TimelineEventDataSource. 2022-02-23 18:00:31 +01:00
Erik Johnston
7997435003 Also record next_batch 2022-02-23 11:23:05 +00:00
Erik Johnston
6105d7bea9
Log since token when doing an incremental sync 
This aids debugging when `/sync` does something weird server side. Since we already log a line each time we do an incremental sync this shouldn't cause a problem.
 2022-02-23 10:22:03 +00:00
Benoit Marty
cc77afbf66 Version++ 2022-02-22 21:33:20 +01:00
Benoit Marty
ed80fe517d Revert recent change to fix a crash 
`readReceiptsSummaryEntity.realm` is null
 2022-02-22 21:06:41 +01:00
ariskotsomitopoulos
79c97ac512 Formating code 2022-02-22 20:59:22 +02:00
ariskotsomitopoulos
f7f363ce25 Fix wrong copyrights 2022-02-22 20:52:01 +02:00
ariskotsomitopoulos
2054c577f3 Fix quality check errors 2022-02-22 17:41:54 +02:00
ganfra
4cc80162ca Clean and add Changelog 2022-02-22 14:23:45 +01:00
ganfra
80d19fa497 Realm transactions: use Realm.WRITE_EXECUTOR (and use in Create/Join Room tasks) 2022-02-22 13:00:22 +01:00
ariskotsomitopoulos
9953d0d0ed Resolve realm migration conflicts 2022-02-22 13:57:43 +02:00
ganfra
d27acfa64f Read receipts: use RoomMember instead of User and avoid creating realm instance each time 2022-02-22 12:45:54 +01:00
ganfra
fcca75ee23 Realm: remove usage of freeze as it was not necessary (unique thread) 2022-02-22 12:45:10 +01:00
ariskotsomitopoulos
deb86d2e87 Resolve real migration conflicts 2022-02-22 13:18:09 +02:00
ariskotsomitopoulos
79a231f1dc Merge branch 'develop' into feature/aris/thread_live_thread_list 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-02-22 12:52:55 +02:00
Benoit Marty
95c00a1cce Udpate comment 2022-02-21 17:52:26 +01:00
ariskotsomitopoulos
2b740a1ab6 Implement permalink support for /relations live thread timeline 2022-02-21 17:23:17 +02:00
ariskotsomitopoulos
f4f48b919e Improve home server capabilities for threads 2022-02-21 12:14:51 +02:00
SpiritCroc
ecd28447c9 Merge tag 'v1.4.0' into sc 
Change-Id: If953d524434cd8a7073a16014f4ec6850b72a226

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/media/PreviewUrlData.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/drawable/ic_filter.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_notice_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/menu/menu_timeline.xml
 2022-02-19 10:55:47 +01:00
ariskotsomitopoulos
83088bbe5a Introduce live thread summaries using the enhanced /messages API from MSC 3440 
Add capabilities to support local thread list to not supported servers
 2022-02-18 17:21:10 +02:00
Valere
48fffc3dcf Code review 2022-02-18 10:08:44 +01:00
Valere
3702ccd2ba Defensive coding to ensure encryption when room was once e2e 2022-02-18 10:01:09 +01:00
Benoit Marty
d1d26a98af
Merge pull request #5237 from vector-im/feature/mna/5123-room-tag-suggestion 
#5123: @room tag suggestion
 2022-02-17 15:40:54 +01:00
Benoit Marty
ac9f138fc0
Merge pull request #5185 from vector-im/feature/adm/decouple-matrix-creation 
Decoupling Matrix creation from Application
 2022-02-17 15:35:09 +01:00
Maxime Naturel
0a87486f65 Removing TODO 2022-02-17 14:19:17 +01:00
Maxime Naturel
10d196596c Unmocking check of permission to notify room 2022-02-17 11:23:00 +01:00
Maxime Naturel
49596dcea3 Mocking check of permission to notify room 2022-02-17 11:23:00 +01:00
Maxime Naturel
fb2401d0b1 Fixing parsing of outcoming messages for @room chip (missing incoming messages) 2022-02-17 11:23:00 +01:00
Maxime Naturel
82ac302843 Fixing avatar name when there is no room picture 2022-02-17 11:22:59 +01:00
Maxime Naturel
d8e28d7be9 Adding autocomplete for @room (missing correct first letter of avatar) 2022-02-17 11:22:59 +01:00
Maxime Naturel
38fdfb27e4 Creating sealed wrapper class for member items 2022-02-17 11:22:59 +01:00
Maxime Naturel
2d38786d02 Adding TODOs 2022-02-17 11:22:59 +01:00
Adam Brown
343b8bf08d
Incrementing schema version - fixes pre-release launch crash (#5245) 
* updating the schema version to 25 to reflect the latest migration
* adding changelog entry
 2022-02-16 12:29:08 +00:00
Adam Brown
5b851f1cb7 suppressing deprecated warning on an unused method 2022-02-14 16:33:35 +00:00
Adam Brown
8e0f5802f9 Merge branch 'feature/adm/decouple-matrix-creation' of github.com:vector-im/element-android into feature/adm/decouple-matrix-creation 2022-02-14 16:05:00 +00:00
Adam Brown
95df3e7e2b deprecating the Matrix.initialize and Matrix.getInstance entry points in favour of clients controlling their own instances 2022-02-14 16:04:47 +00:00
Adam Brown
d05af1cb04 providing more alternatives when Matrix.getInstance fails 2022-02-14 15:54:05 +00:00
ariskotsomitopoulos
830c38f50b format ktlint 2022-02-14 16:53:29 +02:00
ariskotsomitopoulos
e9e5d680a1 Fix realm migration from 25 to 26 2022-02-14 16:51:56 +02:00
ariskotsomitopoulos
f98b595d85 Merge branch 'develop' into feature/aris/threads_live_timeline 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt
 2022-02-14 16:13:51 +02:00
Adam Brown
2eb417ab05
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-02-14 13:41:40 +00:00
Adam Brown
2f7f86b8bb
Update matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2022-02-14 13:41:27 +00:00
ariskotsomitopoulos
27bc43c24c Fix realm migration 2022-02-14 15:33:51 +02:00
Benoit Marty
43d6a29ff3
Merge pull request #5208 from vector-im/feature/adm/personalisation-capabilities 
MSC3283 - Supporting additional homeserver capabilities
 2022-02-14 14:27:26 +01:00
ariskotsomitopoulos
f1b11df781 Merge branch 'develop' into feature/aris/threads_live_timeline 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-02-14 15:17:55 +02:00
ariskotsomitopoulos
83d937b842 format ktlint 2022-02-14 15:10:30 +02:00
ariskotsomitopoulos
49b7726ac8 - Integrate /relations API to create a live thread timeline 2022-02-14 15:09:01 +02:00
Adam Brown
fd2d9287e7 creating separate creator for the matrix instance to avoid ambiguous non singleton/duplicated singleton usages 
- also documents the static methods
 2022-02-14 12:46:16 +00:00
Adam Brown
fed549f647 reusing refresh extension 2022-02-14 12:05:57 +00:00
Adam Brown
4519dec7eb scheduling a refresh of the homeserver capabilities on introduction of new fields 2022-02-14 12:05:44 +00:00
Benoit Marty
36d841b884
Merge pull request #5196 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.43 
Bump libphonenumber from 8.12.42 to 8.12.43
 2022-02-14 11:19:41 +01:00
Adam Brown
d19e6d290f
Merge pull request #5209 from vector-im/michaelk/reduce_debug_logging_loop 
Reduce verbosity of CleanupSession debug logs.
 2022-02-11 16:28:26 +00:00
ganfra
f1376eac82
Merge pull request #5204 from vector-im/feature/fga/reactions_ui_improvements 
Feature/fga/reactions UI improvements
 2022-02-11 15:17:44 +01:00
Adam Brown
d8d6358d15 adding support for the homeserver display name and avatar capabilities 
- MSC3283 https://github.com/matrix-org/synapse/pull/11933
- includes session database migration
 2022-02-11 12:48:42 +00:00
Adam Brown
a5f4413f6c using a generic boolean capability model for booleans 2022-02-11 11:52:41 +00:00
Adam Brown
5af56f6b5d
Merge pull request #5134 from vector-im/feature/bma/realmMigrations 
Refactor realm migrations
 2022-02-11 11:50:50 +00:00
Michael Kaye
f44f37629a Reduce verbosity of CleanupSession debug logs. 
Currently we wait up to 10s for this operation to complete.

Replacing the two log lines with three, lets us halve the number of logs printed every 10ms,
but always print exactly one log line each iteration of the loop. Rather than:

```
02-10 19:58:48.880  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.880  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.890  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.890  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.900  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.900  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.910  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (29 - 0)
02-10 19:58:48.910  3140  3140 D CleanupSession: Waiting 10ms
02-10 19:58:48.920  3140  3140 D CleanupSession: Wait for all Realm instance to be closed (0 - 0)
```

We'll print:

```
02-10 19:58:48.880  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.890  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.900  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.910  3140  3140 D CleanupSession: Waiting 10ms for all Realm instance to be closed (29 - 0)
02-10 19:58:48.920  3140  3140 D CleanupSession: Finished waiting for all Realm instance to be closed (0 - 0)
```

The above example took 40ms to finish and saved 4 log lines; you can see how it adds up if you take 10000ms to finish.
 2022-02-11 09:06:47 +00:00
ganfra
f08b10b2c5
Merge pull request #5199 from vector-im/feature/dla/fix_timeline_from_virtual_rooms 
Rooms with virtual rooms do not render the merged timeline with call events.
 2022-02-10 19:20:01 +01:00
ganfra
9f44ec1d70 Reactions: fix ui echo ordering 2022-02-10 18:56:39 +01:00
David Langley
eb90268cf5 Updates getAccountDataEvents function to match it's description. 2022-02-10 10:30:47 +00:00
fedrunov
06b5563ff6
join and leave methods moved from MembershipService to RoomService an… (#5183) 2022-02-10 10:05:03 +01:00
dependabot[bot]
002332496a
Bump libphonenumber from 8.12.42 to 8.12.43 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.42 to 8.12.43.
- [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.42...v8.12.43)

---
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-02-09 23:11:56 +00:00
ganfra
c28a20dce3 Bump versions to 1.4.2 2022-02-09 12:55:33 +01:00
Adam Brown
2d80c6bc4e avoiding using the matrix getInstance internally within the sdk to allow us to inject a consistent instance 2022-02-08 14:02:39 +00:00
Aris Kotsomitopoulos
077c0eea98
Revert "AGP 7.1.0" 2022-02-04 12:20:20 +02:00
Benoit Marty
eed4bf175f Realm migrations are not objects anymore 
SchemaVersion is now a val
 2022-02-03 21:05:54 +01:00
Benoit Marty
8a4ecf616a Split the classes RealmMigration into smaller classes 2022-02-03 21:05:54 +01:00
ganfra
2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Benoit Marty
dba9a47c63
Merge pull request #5127 from vector-im/feature/ons/generic_location_pin 
Support generic location pin
 2022-02-03 16:02:38 +01:00
Benoit Marty
aa12a73a05 Version++ 2022-02-03 15:51:04 +01:00
Benoit Marty
105118f831 Merge hotfix 1.3.18 to develop 2022-02-03 15:48:51 +01:00
Benoit Marty
5b3d999aaa Version 1.3.18 2022-02-03 15:43:13 +01:00
Benoit Marty
09cbd146e8 Improve missing state event detection to missing state events only one joined rooms (ignore LEFT room) 
Should reduce the number of initial sync
Co-authors: ganfra and billcarsonfr
 2022-02-03 14:53:17 +01:00
Benoit Marty
664bccf8a5 ktlint 2022-02-03 00:27:10 +01:00
Benoit Marty
c66849834a
Merge pull request #5051 from vector-im/feature/bma/cleanup 
Remove some usage of MatrixCallback
 2022-02-03 00:25:54 +01:00
ganfra
85af3767b7 Sync: avoid deleting root event of CurrentState on gappy sync 2022-02-02 18:07:39 +01:00
Onuray Sahin
c2daab4211 Code review fixes. 2022-02-02 19:33:34 +03:00
Adam Brown
e2d8c73761 fixing push notifications being skipped 
- reworking the isEventRead logic to always check if the new event exists locally, there's a race condition between eventFastLane and syncs where we end up mark unseen events as read if our last local message in a room is from ourselves
- this may also fix some  events being instantly marked as read when being received
 2022-02-02 12:32:42 +00:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
Onuray Sahin
a131d28b3e Merge branch 'develop' into feature/ons/generic_location_pin 
* develop: (146 commits)
  exhaustive not needed anymore
  Invert if condition and split long line
  Use kotlin string builder
  Same issue but in the test
  Format
  Fix a crash: java.util.IllegalFormatPrecisionException https://github.com/matrix-org/element-android-rageshakes/issues/33398
  add changelog file for threads feature
  add changelog file for threads feature
  Formatting
  Improve hidden events for threads
  Add TODO for the next Weblate sync
  ktlint format
  PR remarks
  Fix a lint false positive? Anyway this was not used. Restricted API ../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
  It seems that now lint rule `MissingQuantity` is an error and not a warning by default.
  Whitelist group 'org.webjars' on MavenCentral to fix lint execution
  Fix conflicts
  Formating & remove unused comments
  Fix error in unit test
  ktlint format
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
 2022-02-02 14:35:30 +03:00
Onuray Sahin
37d35c9a7f Support generic location pin. 2022-02-02 14:25:54 +03:00
Benoit Marty
7a44f16372 More cleanup 2022-02-02 11:38:09 +01:00
Benoit Marty
4893429d73 Remove usage of MatrixCallback 2022-02-02 11:38:09 +01:00
Benoit Marty
2bf36c74e3 Use kotlin string builder 2022-02-02 10:46:31 +01:00
Benoit Marty
581dbda2c1 Format 2022-02-02 10:34:08 +01:00
Benoit Marty
cd1171eb9d Fix a crash: java.util.IllegalFormatPrecisionException 
https://github.com/matrix-org/element-android-rageshakes/issues/33398
 2022-02-02 10:33:19 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads 
Threads P0 Release
 2022-02-01 15:58:32 +02:00
Benoit Marty
79b4c76a09
Merge pull request #5082 from vector-im/feature/bma/agp_7_1_0 
AGP 7.1.0
 2022-02-01 13:57:15 +01:00
ariskotsomitopoulos
fcc095a239 PR remarks 2022-02-01 12:13:10 +02:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
Benoit Marty
c8ddb2e85e Fix a lint false positive? Anyway this was not used. 
Restricted API
../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
 2022-02-01 00:30:30 +01:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
7dad08654b Revert "Downgrade the version to 1.3.17 to prepare a corrective release." 
This reverts commit 2efa67e587.
 2022-01-31 14:53:43 +01:00
Benoit Marty
2efa67e587 Downgrade the version to 1.3.17 to prepare a corrective release. 2022-01-31 14:48:54 +01:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash 
Fix location crash
 2022-01-31 14:42:53 +01:00
Adam Brown
9119cf059f adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications 2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3 ktlint format 2022-01-31 13:56:17 +02:00
Benoit Marty
8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00
ariskotsomitopoulos
3253a252fb Introduce ThreadsService by splitting TimelineService 2022-01-31 12:58:19 +02:00
SpiritCroc
45a5b8ca94 [merge] Further merge fixups 
Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812
 2022-01-29 15:56:13 +01:00
SpiritCroc
a9d5700d2b Merge tag 'v1.3.16' into sc 
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.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/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.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/TimelineEventController.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/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-29 12:18:19 +01:00
SpiritCroc
beb2b1e8a0 [merge] Use Java 11 again 
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
 2022-01-29 10:35:54 +01:00
Benoit Marty
83ed80e6d8 Rename fun for clarity 2022-01-29 07:40:41 +01:00
ariskotsomitopoulos
b1067e9a58 - ktlint format 
- Update a text resource
 2022-01-28 16:37:59 +02:00
ariskotsomitopoulos
1d6d8102b3 Further improve thread summary after forward scrolling 2022-01-28 14:11:03 +02:00
dependabot[bot]
c07b09c727
Bump libphonenumber from 8.12.41 to 8.12.42 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.41 to 8.12.42.
- [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.41...v8.12.42)

---
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-01-27 23:11:05 +00:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ariskotsomitopoulos
78dfac52a7 ktlint format 2022-01-27 18:39:43 +02:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.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/TimelineViewModel.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/search/SearchResultItem.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.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/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
Benoit Marty
4aff1ab017 AGP 7.1.0 2022-01-27 16:08:47 +01:00
ariskotsomitopoulos
554ece724e - Remove counter from thread notifications 
- Fix red dot on user mentioning
 2022-01-27 14:55:34 +02:00
ariskotsomitopoulos
f53b711e0d When thread disabled add thread replies within threads ( to the users with threads enabled ) 2022-01-27 13:49:03 +02:00
ariskotsomitopoulos
358a7d0ec4 Handle latest thread message & root thread edition to update thread summary and thread list appropriately 2022-01-27 13:22:04 +02:00
Onuray Sahin
2ad7a020cf Current user is not a king to end polls, check event sender id instead. 2022-01-27 00:00:29 +03:00
Onuray Sahin
db1152cb72 Allow ending polls if user created it. 2022-01-26 17:50:31 +03:00
ariskotsomitopoulos
92d082c26a Improve thread message deletion 
Fix thread summary after isLimited events
 2022-01-26 14:07:07 +02:00
Benoit Marty
38a6c3ea61 Merge branch 'develop' of github.com:vector-im/element-android into develop 2022-01-25 21:50:12 +01:00
Benoit Marty
fe5109fead Version++ 2022-01-25 21:48:18 +01:00
Adam Brown
0fda2a125a fixing line length 2022-01-25 17:58:51 +00:00
ariskotsomitopoulos
c19b52cded Enhance thread summary 
Fix deleted root thread messages when show deleted messages are enabled/disabled
 2022-01-25 18:21:42 +02:00
Benoit Marty
1ee29555c6 Merge branch 'develop' into feature/ons/static_location 2022-01-25 16:01:16 +01:00
Benoit Marty
589cfeb0cc ktlint 2022-01-25 16:00:52 +01:00
Benoit Marty
9f4deabe08
Merge pull request #5043 from vector-im/feature/bma/track_performance 
Track performance
 2022-01-25 15:54:57 +01:00
Benoit Marty
d9386cd61f ktlint 2022-01-25 15:54:15 +01:00
Benoit Marty
63b3def667
Merge pull request #5008 from SpiritCroc/globstar 
Speed up event match regex evaluation for big messages
 2022-01-25 15:52:55 +01:00
Benoit Marty
b619f70904 Merge branch 'develop' into feature/ons/static_location 2022-01-25 14:29:13 +01:00
ariskotsomitopoulos
b1b27bdd0e Enhance edit to support new threads fallback 2022-01-25 14:12:13 +02:00
Benoit Marty
80d9b64e5a Cover also the error case. 2022-01-24 22:49:34 +01:00
Benoit Marty
cf86fe34d5 Improve SDK API (self review) 2022-01-24 22:37:07 +01:00
Onuray Sahin
d65899ef88 Fix sharing location action in timeline. 2022-01-24 21:55:32 +03:00
ariskotsomitopoulos
fe88e81d4a - Refactor thread awareness (handle decrypted rooms, images, stickers etc) 
- Enable/disable threads functionality
- New fallback thread implementation
 2022-01-24 16:55:15 +02:00
Onuray Sahin
b0b92c062e Undisclosed poll implementation. 2022-01-24 14:31:50 +03:00
Onuray Sahin
7f97e78ba3 Merge branch 'develop' into feature/ons/edit_polls 
* develop: (66 commits)
  toolbar management  (#4887)
  adding changelog entry
  adding back periodic flag when scheduling automatic background workers
  Fix enum class warning
  Split long lines Done by https://github.com/matrix-org/matrix-analytics-events/pull/16
  Add new class in analytics plan
  Fix conditional for Delight issue automation
  Add missing import in kdoc
  Update kdoc
  Enable Delight issue automation
  Fix an error in string resource (#4997)
  Changelog
  Add some unit test for the command parser. Not all commands are covered, could add more tests later.
  data class.
  use sealed interface
  Small cleanup
  Command parser is not a static object anymore
  Add changelog
  Use Throwable.isLimitExceededError extension
  Do not automatically retry 429 with a too long delay
  ...
 2022-01-23 22:15:36 +03:00
Onuray Sahin
9dd48045f6 Invalidate previous votes for edited polls. 2022-01-23 19:32:13 +03:00
Benoit Marty
f6d856d828 Analytics: report performance event about sync request - send number of joined rooms 2022-01-21 17:42:40 +01:00
Benoit Marty
cab06c4b52 Analytics: report performance event about sync request 2022-01-21 16:44:19 +01:00
Onuray Sahin
a871ce26c2 Fix event id of poll replace events. 2022-01-21 18:07:39 +03:00
ganfra
8c4dff4db9 Bubbles: change again url preview 2022-01-21 16:00:58 +01:00
Onuray Sahin
ea9e5183dc Fix rendering edited polls in timeline. 2022-01-21 16:20:08 +03:00
Adam Brown
e8f412b8a1 adding back periodic flag when scheduling automatic background workers 2022-01-20 17:07:14 +00:00
Onuray Sahin
c3d7a253e4 Allow editing polls. 2022-01-20 17:41:03 +03:00
SpiritCroc
bd507a5bd2 Speed up event match regex evaluation for big messages 
`regex.containsMatchIn()` for `.*@room.*` can take significantly longer
than checking for `@room` (some real-world events I was getting took
around 15 seconds with this, significantly slowing down the sync
parsing).

Checking `containsMatchIn()` does not lead to different results when
having leading and trailing stars however, it will match in the same
cases as when these are omitted.

For testing purposes, I sent myself some Lorem Ipsum with 5000 words
(not containing any @room).
Without this change, the regex evaluation takes about 16 seconds.
With this change, the regex evaluation now takes significantly less then
a second.

Change-Id: If3b13304668ad961abb81d5442f37a3a3a1d48b7
 2022-01-20 12:20:47 +01:00
SpiritCroc
af34399135 Speed up event match regex evaluation for big messages 
`regex.containsMatchIn()` for `.*@room.*` can take significantly longer
than checking for `@room` (some real-world events I was getting took
around 15 seconds with this, significantly slowing down the sync
parsing).

Checking `containsMatchIn()` does not lead to different results when
having leading and trailing stars however, it will match in the same
cases as when these are omitted.

For testing purposes, I sent myself some Lorem Ipsum with 5000 words
(not containing any @room).
Without this change, the regex evaluation takes about 16 seconds.
With this change, the regex evaluation now takes significantly less then
a second.
 2022-01-20 12:16:34 +01:00