Commit Graph

14 Commits

Author SHA1 Message Date
SpiritCroc 978056e01f Merge tag 'v1.3.4' into sc
Conflicts:
	dependencies.gradle
	gradle.properties
	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/session/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
2021-10-21 17:31:11 +02:00
ariskotsomitopoulos 9ab59a543d * Implement Presence Service:
- Get Presence Status
     - Set Presence Status
* Integrate presence in room details screen
* Integrate presence in room people's view
* Update UI to support presence
* Fix bug when insertOrUpdate was called on RoomMemberEventHandler and override the correct presence value in RoomMemberSummaryEntity
* Improve performance on updateUserPresence in RoomMemberSummaryEntity entity
* Remarks & linter fixes
* Disable presence when there is no m.presence events. In some servers like matrix.org is disabled atm.
* Enhance UI Presence on DM room lists to support dark/light theme
* Restore missing lines in gradle.properties to speed up debugging
2021-10-06 18:00:02 +03:00
SpiritCroc de0f44307b Switch to own UP FCM fork for now
Change-Id: Ic96668ca69da62d93d360a4175e08579d58c6e67
2021-09-30 09:18:57 +02:00
SpiritCroc f167a00921 Increase gradle/java heap size to fix fdroid build again
Was 4G before merge, upstream changed from 2G to 3G, which still seems
too small.

Change-Id: I1a9f334a1ea991e9c2d27950a37504e68fee87d2
2021-09-29 10:34:41 +02:00
ariskotsomitopoulos fe1d9aa589 - Optimize build time for local builds
- Enhance CI/CD workflows (7GB Ram, 2CPU) by adding custom gradle arguments to properly run
- Add unit test UI comment representation plugin
2021-09-13 19:03:35 +03:00
Benoit Marty a0c8a8e97c Log HTTP requests and responses in production (level BASIC, i.e. without any private data) 2020-12-08 13:44:42 +01:00
Benoit Marty 6a3eed49fc Enable file system watch to reduce compilation time 2020-10-15 15:55:55 +02:00
Mathieu Velten 6f996f1f09 Put xmx to 2048m 2020-07-07 14:23:59 +02:00
Nolan Darilek 2e4d30ef29 Set `tickerText` to improve accessibility of notifications.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2020-04-15 07:43:41 -05:00
Benoit Marty 11b5c2c3ba Restore previous log level 2019-10-21 18:17:03 +02:00
ganfra d8f449388c Read marker: start working on it (no UI) 2019-08-20 18:30:24 +02:00
Benoit Marty 875947dd61 Give the opportunity to override log configuration in local gradle properties file 2019-06-11 14:52:39 +02:00
ganfra ac2d20ad3f Migration androidx : first commit where it compiles. Updates some libs and android studio version in the same time. 2019-01-16 19:25:43 +01:00
ganfra b406e8301a first commit 2018-10-03 17:58:12 +02:00