mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-22 17:10:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
16088 commits 7 branches 124 tags 230 MiB
Commit graph

4358 commits

Author SHA1 Message Date
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
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
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
105118f831 Merge hotfix 1.3.18 to develop 2022-02-03 15:48:51 +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
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
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
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
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
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
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
ariskotsomitopoulos
e0630ceac0 Fix mentions UI within threads 2022-01-20 13:02:35 +02:00
Florian Renaud
b8fa6f9ec8 Add missing import in kdoc 2022-01-20 10:50:07 +01:00
Florian Renaud
879d5eb5f6 Update kdoc 2022-01-20 10:49:02 +01:00
ariskotsomitopoulos
38f193fbd5 Add LightweightSettingsStorage in sdk 
Enable thread awareness when threads are disabled
Enhance enable/disable thread messages to app & sdk
Add Shared PReferences to sdk
 2022-01-19 18:52:02 +02:00
Florian Renaud
83c961e255 Use Throwable.isLimitExceededError extension 2022-01-19 16:56:00 +01:00
Florian Renaud
fd61f07373 Do not automatically retry 429 with a too long delay 2022-01-19 16:56:00 +01:00
ariskotsomitopoulos
8cc96e27bc - Add threads to lab settings 
- Disable thread awareness due to the new fallback mechanism
 2022-01-19 12:28:00 +02:00
ariskotsomitopoulos
4cff3938e7 - Hide read receipts from thread timeline 
- Enhance FetchThreadTimelineTask
 2022-01-18 16:05:41 +02:00
ariskotsomitopoulos
707397cb9d cleanup 2022-01-18 15:28:44 +02:00
Onuray Sahin
7993ff39a5 Add missing fields to location event content. 2022-01-18 15:33:48 +03:00
ariskotsomitopoulos
636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.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/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
ariskotsomitopoulos
5e23947419 Enhance filtering to support threads 2022-01-17 19:22:22 +02:00
Onuray Sahin
5581e0b5ba Code review fixes. 2022-01-17 18:30:04 +03:00
ariskotsomitopoulos
81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Benoit Marty
eafb76b9b6
Merge pull request #4960 from vector-im/feature/aris/improve_local_echo_stuck_fix 
Avoid deleting sent messages on non room events
 2022-01-17 15:26:46 +01:00
Benoit Marty
c59bb5740a Add comment after merge of #4952 2022-01-17 15:24:51 +01:00
Benoit Marty
95b116b8a1
Merge pull request #4952 from abaker/disable_http_2 
Force HTTP/1.1
 2022-01-17 15:20:23 +01:00
ariskotsomitopoulos
f6067977fe Refactor ThreadMessagingTest 2022-01-17 14:27:30 +02:00
ariskotsomitopoulos
b343739a71 Enhance decrypted thread summary to return poll questions 2022-01-17 14:27:17 +02:00
ariskotsomitopoulos
5b786e5749 Remove duplicate RetryTestRule 2022-01-17 14:26:39 +02:00
ariskotsomitopoulos
52348e399e ktlint fixes 2022-01-17 13:30:59 +02:00
ariskotsomitopoulos
879c4ffef6 Improve logic 2022-01-17 13:00:34 +02:00
ariskotsomitopoulos
01ade64f3b fix ktlint format 2022-01-17 12:27:53 +02:00
ariskotsomitopoulos
3656896af9 Avoid deleting sent messages on non room events 2022-01-17 12:13:01 +02:00
ariskotsomitopoulos
53b82dfa3f Fix permalink handling for threads regarding timeline changes 2022-01-14 13:02:08 +02:00
Alex Baker
e3c4a9157e Force HTTP/1.1 
Signed-off-by: Alex Baker <alex@beeper.com>
Change-Id: I0a71fafa883f8e15f06ceccae8edcc81ce550309
 2022-01-14 11:38:36 +01:00
Benoit Marty
31e487b073
Merge pull request #4911 from vector-im/feature/nfe/rename_kick_command 
Remove "X kicked X" terminology when removing people from a room
 2022-01-14 08:42:18 +01:00
Alex Baker
7e4e8339e6 Force HTTP/1.1 
Signed-off-by: Alex Baker <alex@beeper.com>
 2022-01-13 17:50:24 -06:00
fedrunov
d92e0e48f6 code review changes 2022-01-13 17:50:38 +01:00
Benoit Marty
1b24b9d764
Merge pull request #4895 from vector-im/feature/bma/empty_state_key 
Avoid allowing null String for state_key.
 2022-01-13 12:00:48 +01:00
Benoit Marty
a16a6a6eeb
Merge pull request #4935 from vector-im/feature/bma/fix_legals 
Fix #4919
 2022-01-13 11:59:46 +01:00
Benoit Marty
5095514ecd
Merge pull request #4928 from vector-im/feature/aris/stuck_local_echo_issue_516 
Potential fix stuck local echo events at the bottom of the screen
 2022-01-13 10:44:56 +01:00
Benoit Marty
18359fedb3 Fix #4919 2022-01-12 18:08:37 +01:00
ariskotsomitopoulos
b89054685f Fix migration from 21 to 22 2022-01-12 18:40:33 +02:00
ariskotsomitopoulos
9d48ecea2f Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	.github/workflows/integration.yml
#	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/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
 2022-01-12 18:20:50 +02:00
Benoit Marty
f8afe04a3b
Merge pull request #4842 from vector-im/feature/aris/integration_tests_improvement 
Trying to fix integration tests
 2022-01-12 17:11:16 +01:00
ariskotsomitopoulos
6f5f773360 Fix kltint errors 2022-01-12 16:45:15 +02:00
ariskotsomitopoulos
b92cb753f9 Fix stuck local echo events at the bottom of the screen 2022-01-12 15:31:54 +02:00
Valere
7839f18f58 prevent OrderedRealmCollection to throw when using first() 2022-01-12 11:37:02 +01:00
Valere
f4c891abe6 Ensure algorithm instance is created and stored 2022-01-12 10:36:56 +01:00
ariskotsomitopoulos
4560d748d3 Display encrypted messages in thread summary and in thread list 2022-01-11 17:52:14 +02:00
fedrunov
9ec662ccdc replace "kick" with "remove" 2022-01-11 16:21:42 +01:00
Valere
60ae416b36 Split this PR db change in a separate migration 2022-01-11 15:14:45 +01:00
ariskotsomitopoulos
8adeab0ddd - fix lint error 2022-01-11 16:14:26 +02:00
Valere
1a92d75a54 Fix bad copyright 2022-01-11 14:56:31 +01:00
Valere
b10bc7000a Update room badge when e2e misconfigured 2022-01-11 14:56:31 +01:00
Valere
38fbfad8d5 Code review 2022-01-11 14:56:31 +01:00
Valere
6b05e7a6bb Support misconfigured room encryption 2022-01-11 14:56:31 +01:00
ariskotsomitopoulos
753e3e7519 - fix ktlint format 
- Update Threads toolbar UI
 2022-01-11 15:31:21 +02:00
ariskotsomitopoulos
3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
 2022-01-11 14:09:49 +02:00
Onuray Sahin
9ea30445ef Merge branch 'develop' into feature/ons/static_location 
* develop: (281 commits)
  Add a comment about the workaround
  Remove deprecated restricted lab option (#4889)
  Bump actions/github-script from 3 to 5.1.0
  Add some missing language in the change language screen
  Workaround to not to reuse poll option cells.
  Olm lib is now hosted in MavenCentral. Upgrade to 3.2.10
  Changelog
  Test: Fix test after change on OnBoarding screens
  Test: Analytics opt-in
  Cleanup
  Revert "Disable automatic opt-in screen display."
  - Do not add GitHub comments on successful ktlint runs  - Remove already existing comments when ktlint succeed
  restore deprecated lab preference
  Update nb of enum classes
  Change autoUisi label + rename matching_issue
  code review
  Fix enabling was broken
  Simple rate limiting of RS sending
  use flow instead of reactivex
  Fix UISIS preference listener
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
#	vector/src/main/res/layout/view_attachment_type_selector.xml
#	vector/src/main/res/values/strings.xml
 2022-01-11 14:42:11 +03:00
ariskotsomitopoulos
37ec3fdf84 Refactor threads to support the new timeline implementation 2022-01-11 12:13:53 +02:00
Benoit Marty
7581a0b549 Fix test compilation 2022-01-10 18:36:04 +01:00
Benoit Marty
7be01ab7ae Avoid allowing null String for state_key. Should always be an empty String according to the Matrix specification. 
There is no functional change, just a change in the SDK API for clarity regarding the Matrix specs.
 2022-01-10 17:47:27 +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
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
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
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
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
SpiritCroc
12497bd90f Merge remote-tracking branch 'upstream/feature/bma/toDevice_timeout_0' into sc 
Change-Id: I6234f07715d1c5eab4732a046e93c4bda48159ad
 2021-12-27 19:38:08 +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
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
SpiritCroc
acdd4e24b9 Merge tag 'v1.3.12' into sc 
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10

Conflicts:
	build.gradle
	vector/build.gradle
	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/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/detail/timeline/url/PreviewUrlView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.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/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/drawable/highlighted_message_background.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/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_expandable_textview.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/layout/item_radio.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_stub_room_profile_header.xml
	vector/src/main/res/layout/view_url_preview.xml
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_root.xml
 2021-12-23 14:36:13 +01:00
ariskotsomitopoulos
5a7d12a9a5 Enhance RoomEventFilter with MSC3440 2021-12-21 20:04:50 +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
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
Onuray Sahin
6495bd9e5e Send location event. 2021-12-17 15:09:02 +03: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
Valere
270c70d301 Avoid creating new otk if there are pending to_devices to process 2021-12-15 13:31:19 +01: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
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
04a7590804 Code review fixes. 2021-12-09 15:09:12 +03: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
Valere
a026137381 code review 2021-12-08 15:47:06 +01:00
Valere
01b8b7d57a Code review 2021-12-08 14:17:08 +01:00
ganfra
b53433e61b Timeline: some clean up 2021-12-08 11:07:07 +01:00
ganfra
bf1be4f20d Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-08 10:38:42 +01:00
ganfra
29a4fd1e41 Timeline: make 3 integration tests passing (also add some suspend method on the timeline) 2021-12-07 21:13:41 +01:00
Valere
5d35f02abb Support using unpublished fallback key instead of generating 
And forgetFallback after 5mn
 2021-12-07 19:56:14 +01:00
Valere
f843dddc3a Cleaning 2021-12-07 19:05:36 +01:00
Valere
10671a53a4 Quick refactor to use same mechanism as updateOneTimeKeyCount 2021-12-07 19:05:36 +01:00
Onuray Sahin
c603135398 Code review fixes. 2021-12-07 19:05:36 +01:00
Benoit Marty
4ac90f10c1 Fallback keys implementation. 
Author: Onuray - Benoit squashes the 4 commit to cancel the addition on binaries
 2021-12-07 19:05:36 +01:00
Onuray Sahin
953fadeed4 Merge branch 'develop' into feature/ons/poll_timeline 
* develop: (319 commits)
  Bump dagger from 2.40.4 to 2.40.5
  More debouncing
  Changelog
  I need the view here
  clicks() already has debouncing with conflate(), so throttleFirst is not necessary
  Use debouncedClicks where applicable
  Use `observeViewEvents` facility
  private
  use != rather that is
  Fix waring for state is not dialing or connected
  state can also be connected
  Add script to compress video and convert to gif file
  removing boolean notification version usage
  adding changelog entry
  removing unused imports and increasing enum allowance
  porting the notifications setting version to the vector features
  Add warning if unexpected state.
  setting login version via typed build config field instead of resources
  separating the SSO redirection from the login activities - adds a dedicated routing activity to proxy the uri to the login selected by the feature flags
  Removing trailing space
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
#	vector/src/main/res/layout/item_timeline_event_option_buttons_stub.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2021-12-07 18:50:52 +03:00
Onuray Sahin
75b544a110 Support push notification for poll creation event. 2021-12-07 12:53:35 +03:00
Benoit Marty
f1d8b9e974
Merge pull request #4637 from vector-im/feature/dla/outgoing_pstn_call_fails 
Feature/dla/outgoing pstn call fails
 2021-12-06 21:37:11 +01:00
David Langley
747030b578 use != rather that is 2021-12-06 14:37:36 +00:00
David Langley
03be698a7e Fix waring for state is not dialing or connected 2021-12-06 13:46:56 +00:00
David Langley
a6d6fd7b3b state can also be connected 2021-12-06 13:05:37 +00:00
SpiritCroc
4b63a9f939 Merge tag 'v1.3.9' into sc 
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.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/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/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
 2021-12-05 13:46:55 +01:00
ariskotsomitopoulos
c40a686cff Implement LOCAL thread notifications that work only on real time. 2021-12-03 18:15:25 +00:00
ganfra
49eee0dc38 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-03 18:39:18 +01:00
ganfra
3217277bc4 Timeline: check for create event to hide loader 2021-12-03 18:39:04 +01:00
Benoit Marty
e60d053f84
Merge pull request #4568 from vector-im/feature/fga/fix_sdk_integration_tests 
Feature/fga/fix sdk integration tests
 2021-12-03 17:11:33 +01:00
David Langley
767ead019a Add warning if unexpected state. 2021-12-03 15:13:06 +00:00
Onuray Sahin
23ad4e5a27 Remove legacy implementation classes. 2021-12-03 16:19:19 +03:00
Benoit Marty
cd7345aa6b
Removing trailing space 2021-12-03 13:54:05 +01:00
ganfra
8ca60eadbb Merge branch 'develop' into feature/fga/timeline_chunks_rework 2021-12-03 12:55:57 +01:00
ganfra
667bf1a848 Tests: fix internal TestMatrix 2021-12-03 12:55:32 +01:00
David Langley
de7180ef7e And remove braces 2021-12-03 11:30:28 +00:00
David Langley
0cf50e88e9 Keep guard pattern 2021-12-03 11:28:49 +00:00
David Langley
bf8b485e2c lint 2021-12-03 11:24:40 +00:00
ganfra
014da84ba6 Timeline: try to optimise a bit the loading 2021-12-03 12:14:35 +01:00
Onuray Sahin
c62028df68 Implement poll actions bottom sheet. 2021-12-03 11:41:21 +03:00
Onuray Sahin
2a3a55894f Aggregate votes and poll end event. 2021-12-03 11:23:47 +03:00
Onuray Sahin
a3b11b223a Allow removing poll event. 2021-12-03 11:21:52 +03:00
Onuray Sahin
7c269309c2 Allow sending vote and ending poll. 2021-12-03 11:21:21 +03:00
Onuray Sahin
ebc131f492 Implement new poll content. 2021-12-03 11:18:16 +03:00
ganfra
76eddef840 Timeline: avoid notifying when decryption error is same as previous 2021-12-02 20:42:54 +01:00
ganfra
03961fe933 Timeline: update when loading states changed 2021-12-02 20:42:29 +01:00
David Langley
f3b3c880d0 select answer should be used for outgoing calls. 2021-12-02 18:35:51 +00:00
Benoit Marty
5eda8a84d0 Small cleanup 2021-12-02 13:57:32 +01:00
Benoit Marty
b6218d086d Rename const for clarity 2021-12-02 13:55:26 +01:00
Benoit Marty
78c3bff81f Add name to call argument and actually fix a mistake :/ 2021-12-02 13:54:32 +01:00
Benoit Marty
b7f6254c98 Clarify the time units. We should always used milliseconds to avoid mistake... 2021-12-02 13:50:59 +01:00
Benoit Marty
f22badd13e Format 2021-12-02 13:47:02 +01:00