Matrix client / Element Android fork
Find a file
SpiritCroc 39359f7d24 Merge remote-tracking branch 'upstream/develop' into spaces
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
	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/room/summary/RoomSummaryDataSource.kt
	vector/build.gradle
	vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
	vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.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/action/MessageActionsViewModel.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/list/RoomListAction.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
2021-05-02 12:12:52 +02:00
.github [TMP] Automatic upstream merge preparation 2021-05-02 10:13:16 +02:00
.idea Merge tag 'v1.1.1' into sc 2021-03-14 10:58:57 +01:00
attachment-viewer Bump recyclerview from 1.2.0-rc01 to 1.2.0 2021-04-08 07:22:33 +00:00
diff-match-patch Use diff_match_patch sources as dependency 2019-12-11 10:51:09 +01:00
docs Typo 2021-03-19 16:00:49 +01:00
fastlane Merge remote-tracking branch 'upstream/develop' into spaces 2021-05-02 12:12:52 +02:00
fastlane_testing alternative_package.sh: Patch store description for test releases 2020-12-20 13:11:16 +01:00
gradle/wrapper Update Gradle Wrapper from 6.8.3 to 7.0. 2021-04-10 01:06:51 +00:00
graphics Update third party license notice for notification icon 2021-04-20 14:33:03 +02:00
matrix-sdk-android Merge remote-tracking branch 'upstream/develop' into spaces 2021-05-02 12:12:52 +02:00
matrix-sdk-android-rx Code review 2021-04-28 11:15:58 +02:00
multipicker Bump fragment-ktx from 1.3.2 to 1.3.3 2021-04-26 14:27:59 +00:00
resources/img put F-Droid and GPlay badges locally 2020-06-20 19:42:31 +03:00
tmp_sc_.github/ISSUE_TEMPLATE [TMP] Automatic upstream merge preparation 2021-05-02 10:13:16 +02:00
tmp_sc_fastlane/metadata/android [TMP] Automatic upstream merge preparation 2021-05-02 10:13:16 +02:00
tools Add Rooms to space 2021-04-28 11:15:58 +02:00
vector Merge remote-tracking branch 'upstream/develop' into spaces 2021-05-02 12:12:52 +02:00
.editorconfig prevent wildcard for import 2020-02-26 17:01:38 +01:00
.gitignore Enable semi-automatic correct_strings.sh-patching 2021-02-21 10:35:55 +01:00
.travis.yml Add missing changes of SDK version and build tools 2020-04-15 12:53:28 +02:00
alternative_package.sh Add beta icon 2020-12-29 11:58:13 +01:00
AUTHORS.md Add ability to share profile by QR code 2020-11-20 14:49:39 +01:00
build.gradle master branch has been renamed to main 2021-04-29 12:29:52 +02:00
CHANGES.md Fix missing sender information after edits 2021-05-01 10:11:15 +02:00
CONTRIBUTING.md Fix spelling 2021-02-21 19:19:46 +01:00
correct_strings.sh correct_strings.sh: matrix-sdk strings were deleted 2021-03-14 11:06:25 +01:00
correct_strings_de.sh Update string correction 2021-04-19 11:20:29 +02:00
FEATURES.md Sticker picker: pass dark/light theme 2021-01-19 19:46:30 +01:00
gradle.properties Log HTTP requests and responses in production (level BASIC, i.e. without any private data) 2020-12-08 13:44:42 +01:00
gradlew Update Gradle Wrapper from 5.6.4 to 6.6.1. 2020-10-01 00:53:05 +00:00
gradlew.bat Update Gradle Wrapper from 5.6.4 to 6.6.1. 2020-10-01 00:53:05 +00:00
increment_version.sh Enable semi-automatic correct_strings.sh-patching 2021-02-21 10:35:55 +01:00
legacy_icons.sh Theme legacy icons as well 2020-08-12 13:35:31 +02:00
LICENSE Update README.md & Create LICENSE 2019-03-04 19:18:15 +01:00
merge_helpers.sh merge_helpers.sh: Fix spaces for upstream_previous_tag 2021-04-12 16:01:39 +02:00
post_merge.sh Fix some accent colors 2021-02-05 12:40:32 +01:00
pre_merge.sh pre_merge.sh: Fix when last merge was not tagged 2021-04-09 11:55:15 +02:00
PRIVACY.md Privacy policy: moved to website 2021-04-25 11:09:04 +02:00
README.md [TMP] Automatic upstream merge preparation 2021-05-02 10:13:16 +02:00
settings.gradle Format 2020-07-10 12:52:54 +02:00
tmp_sc_README.md [TMP] Automatic upstream merge preparation 2021-05-02 10:13:16 +02:00

Buildkite Weblate Element Android Matrix room #element-android:matrix.org Quality Gate Vulnerabilities Bugs

Element Android

Element Android is an Android Matrix Client provided by Element.

It is a total rewrite of Riot-Android with a new user experience.

Get it on Google Play Get it on F-Droid

Nightly build: Buildkite

New Android SDK

Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.

At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.

Roadmap

The version 1.0.0 of Element still misses some features which was previously included in Riot-Android. The team will work to add them on a regular basis.

Contributing

Please refer to CONTRIBUTING.md if you want to contribute on Matrix Android projects!

Come chat with the community in the dedicated Matrix room.