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
Benoit Marty
3547926c25
Merge pull request #5172 from vector-im/sync-emojis
...
Sync Emojis
2022-02-14 11:43:21 +01:00
Benoit Marty
13f78831f0
Merge pull request #5216 from TheLastProject/patch-1
...
Increase max heap size for build
2022-02-14 11:23:03 +01: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
bmarty
ff1c307ca0
Sync Emojis
2022-02-14 00:03:37 +00:00
Sylvia van Os
91a4195537
Increase max heap size for build
...
The F-Droid build ran OOM during R8 shrinking with 3GB, but worked fine with 4GB
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
2022-02-12 15:18:53 +01:00
Adam Brown
d6a08a9249
Merge pull request #5210 from vector-im/michaelk/standardise_emulator_usage
...
Standardise configuration options for emulators in GHA integration tests
2022-02-11 17:11:58 +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
Adam Brown
e6415a47ea
Merge pull request #5188 from vector-im/gradlew-update-7.4
...
Update Gradle Wrapper from 7.3.3 to 7.4
2022-02-11 16:28:00 +00:00
Michael Kaye
d173a8d15f
changelog.d
2022-02-11 15:32:33 +00:00
Michael Kaye
c224a4b813
Make sanity_test.yml use same configuration as integration_test.yml
...
This makes it easier to reason about emulator failures.
2022-02-11 15:28:16 +00:00
Michael Kaye
edd95464ea
changelog.d
2022-02-11 14:31:28 +00:00
Adam Brown
ea13f1c879
Merge pull request #5189 from vector-im/arb/issues/4640
...
#4640 : The notification badge jumps around
2022-02-11 14:18:41 +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
ganfra
0a52651e40
Reactions: update after remarks
2022-02-11 13:01:34 +01: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
Ahmed Radhouane Belkilani
85414fa92e
#4640
...
- update changelog file.
Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-11 11:45:39 +01:00
Ahmed Radhouane Belkilani
a9a1532e01
#4640
...
- change unread counter badge view in item_room to be in consistent place on the screen, to left of date/time.
- change unread badge color state for dark and light theme to align with iOS.
- add changelog file related to the issue.
Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
2022-02-11 11:45:39 +01: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
fd89acc112
Merge pull request #5144 from vector-im/feature/mna/update-pr-template
...
Updating PR template description
2022-02-10 19:36:27 +01:00
ganfra
56338c22dd
Merge pull request #5195 from abaker/fix_crash_detection
...
Set PREFS_CRASH_KEY synchronously
2022-02-10 19:21:17 +01: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
c690bada0d
Clean code and add changelog.
2022-02-10 19:13:35 +01:00
ganfra
9f44ec1d70
Reactions: fix ui echo ordering
2022-02-10 18:56:39 +01:00
ganfra
31fa43b5bd
Reactions: fix direction for outgoing bubble
2022-02-10 17:52:10 +01:00
ganfra
0244fea222
Reactions: more refinements
2022-02-10 17:51:49 +01:00
fedrunov
00ada6748a
Merge pull request #5171 from vector-im/sync-analytics-plan
...
Sync analytics plan
2022-02-10 15:47:32 +01:00
NIkita Fedrunov
ba5c7a530c
another sync with analytics repo
2022-02-10 13:22:00 +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
Alex Baker
a4b50d2a78
Set PREFS_CRASH_KEY synchronously
...
Sometimes the app dies before this preference gets written to disk, and
then the crash dialog is not displayed to the user
Signed-off-by: Alex Baker <alex@beeper.com>
2022-02-09 17:09:48 -06:00
ganfra
911ee97122
Reactions: start handling show more, show less and add more actions in timeline.
2022-02-09 21:29:03 +01:00
Onuray Sahin
e71063222b
Merge pull request #5179 from vector-im/feature/ons/fix_poll_option_animation
...
Remove redundant highlight on add poll option button
2022-02-09 22:24:54 +03:00
NIkita Fedrunov
761b8031f6
Merge branch 'develop' into sync-analytics-plan
...
# Conflicts:
# vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
# vector/src/main/java/im/vector/app/features/analytics/plan/Composer.kt
# vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
2022-02-09 16:27:33 +01:00
NIkita Fedrunov
cc4228ed26
use new screen name constants
2022-02-09 16:07:47 +01:00
NIkita Fedrunov
e196b01038
synced with latest changes in analytics repo
2022-02-09 15:55:22 +01:00
NIkita Fedrunov
f78446c1e7
Click replaced with Compose on message sent
...
Identity replaced with UserProperty
added missing param for JoinedRoom
2022-02-09 14:23:45 +01:00
ganfra
c28a20dce3
Bump versions to 1.4.2
2022-02-09 12:55:33 +01:00
ganfra
9678ab899e
Merge release 1.4.0 into develop
2022-02-09 12:53:20 +01:00
ganfra
d1e49624c7
Merge branch 'release/1.4.0' into main
2022-02-09 12:50:30 +01:00
ganfra
5b83ba9320
Release: update CHANGES
2022-02-09 11:25:11 +01:00
ganfra
a6bf921d64
Release: update versions
2022-02-09 11:18:03 +01:00
ganfra
a75e2d5fa8
Merge pull request #5186 from vector-im/feature/fga/fix_ui_test
...
Feature/fga/fix UI test
2022-02-09 10:13:05 +01:00
gradle-update-robot
f2fd9a0469
Update Gradle Wrapper from 7.3.3 to 7.4.
...
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
2022-02-09 00:18:52 +00:00
Onuray Sahin
f6a24e964e
Code review fix.
2022-02-08 23:23:03 +03:00
ganfra
e72593304f
UITests: remove search menu item test case (not visible anymore in E2E room)
2022-02-08 19:35:33 +01:00
ganfra
a19642cd8e
Analytics: fix always null identity property
2022-02-08 19:34:41 +01:00