mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-23 09:41:11 +03:00
Code Issues Projects Releases Packages Wiki Activity
12225 commits 160 branches 159 tags 271 MiB
Commit graph

7250 commits

Author SHA1 Message Date
ariskotsomitopoulos
7048080ee0 Merge branch 'develop' into feature/aris/threads 2021-12-21 13:24:03 +02:00
ariskotsomitopoulos
ed48eb38c9 Apply ktlinFormat 2021-12-21 13:23:17 +02:00
Adam Brown
f1dff33dc2 removing android version bypass for using text futures 
- the emoji span changes affect all android versions
 2021-12-20 10:09:17 +00:00
ganfra
461beda634
Merge pull request #4742 from vector-im/feature/aris/fix_immutable_model_crash 
Fix crash ImmutableModelException
 2021-12-17 15:30:19 +01:00
ganfra
e155eefb7b
Merge pull request #4748 from vector-im/feature/adm/late-emoji-initialisation 
Unable to render messages
 2021-12-17 12:35:37 +01:00
ganfra
ac65942c28
Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix 
Emojis in emotes causing crashes on Android 12+
 2021-12-17 11:47:16 +01:00
Adam Brown
ddbf8582dd removing trailing space 2021-12-17 10:46:03 +00:00
Adam Brown
6918372a87 extracting the emoji processing to an interface so that we can override the behaviour in the unit test 2021-12-17 10:38:49 +00:00
Adam Brown
b73bae452a
adding comment to explain SpannableStringBuilder usage 2021-12-17 09:37:50 +00:00
Adam Brown
37db28ae7c using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet 2021-12-17 09:25:16 +00:00
ClaireGizard
ca58a04f57
Small UI fix in room member profile hearder (#4700) 
Small ui fix on room member profile name

Co-authored-by: Claire Gizard <cgizard>
 2021-12-16 21:10:03 +01:00
ariskotsomitopoulos
dca5bea744 Merge branch 'feature/aris/fix_immutable_model_crash' into feature/aris/threads 2021-12-16 20:56:10 +02:00
ariskotsomitopoulos
f769d84443 Merge branch 'develop' into feature/aris/threads 2021-12-16 20:55:52 +02:00
Adam Brown
ae6be3fdc4 adding missing binding options emote content 
- fixes android 12+ crash when certain emojis are used within the emote content
 2021-12-16 18:34:00 +00:00
ariskotsomitopoulos
2275bdd4fa Fix crash ImmutableModelException 2021-12-16 20:14:21 +02:00
Benoit Marty
3b35be510f
Merge pull request #4729 from vector-im/feature/adm/avoid-leaking-window-when-showing-loading 
Avoid leaking Activity Window when showing loading dialog
 2021-12-16 11:07:23 +01:00
Benoit Marty
818a8898b3 Call banner: center text vertically 2021-12-15 22:19:23 +01:00
Adam Brown
4c238e81cf dismisses any potential loading dialogs when the linked fragment is destroyed 
- fixes leaking the activity window when the fragment is destroyed
 2021-12-15 18:16:10 +00:00
Adam Brown
8b96d8cd8d only acquire a wake lock if a lock is not already held 2021-12-15 17:32:39 +00:00
ariskotsomitopoulos
bc6e89b503 Disable user typing from thread timeline 2021-12-15 18:49:22 +02: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
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
ariskotsomitopoulos
2aa24f0a0d Fix threads sort order, newest first 2021-12-14 16:30:59 +02:00
Benoit Marty
73dba2b692 Fix another crash 2021-12-14 14:37:01 +01:00
Benoit Marty
32820f7893 Comment out some part of the test to make it pass. Tested manually for this time. 2021-12-14 13:27:33 +01:00
Benoit Marty
1961309458 Fix a crash on reactions bottom sheet 2021-12-14 13:26:03 +01: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
0411291515
Merge pull request #4708 from vector-im/feature/bma/analytics_before_release 
Disable automatic opt-in screen display
 2021-12-14 12:07:12 +01:00
Benoit Marty
08def813cc Disable automatic opt-in screen display. 
We want to wait for translations to be available in the project before showing this screen to every users.
 2021-12-14 11:34:06 +01:00
Weblate
1e40b5cd34 Merge branch 'origin/develop' into Weblate. 2021-12-14 08:58:12 +00:00
Benoit Marty
f4cfb5d6d3
Merge pull request #4559 from vector-im/feature/bma/posthog 
Analytics
 2021-12-14 09:31:55 +01:00
Benoit Marty
aad19e4bce code qual 2021-12-14 09:06:36 +01:00
Denys Nykula
cb4690a3e6 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2693 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2021-12-14 02:26:03 +00:00
Jozef Gaal
d3d5d79b7d Translated using Weblate (Slovak) 
Currently translated at 52.6% (1417 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2021-12-14 02:25:58 +00:00
DUCKCHI
0a090fab65 Translated using Weblate (Korean) 
Currently translated at 49.0% (1322 of 2693 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ko/
 2021-12-14 02:25:57 +00:00
Benoit Marty
ea9a524048 Fix compilation issue after merge develop 2021-12-13 23:23:18 +01:00
Benoit Marty
a40e60ba8f Merge branch 'develop' into feature/bma/posthog 2021-12-13 23:18:14 +01:00
Benoit Marty
e519e314fe Limit width of content on tablets 2021-12-13 23:16:47 +01:00
Benoit Marty
48fa411d83
Merge pull request #4698 from vector-im/feature/bma/emoji_hotfix 
Emoji fix
 2021-12-13 23:15:46 +01:00
Benoit Marty
2c81e7ea08
Merge pull request #4601 from vector-im/feature/aris/search_no_data_displayed_4600 
Fix issue 4600 that search results sometimes are not displayed properly
 2021-12-13 23:01:03 +01:00
Benoit Marty
3719551913
Merge pull request #4693 from SpiritCroc/spaceChildIds 
Fix possible crash when having identical subspaces in multiple root spaces
 2021-12-13 22:59:57 +01:00
Benoit Marty
240d0c0a5e
Merge pull request #4703 from vector-im/feature/bma/fix_poll_create 
Use only non empty option to create a poll
 2021-12-13 22:56:58 +01:00
Benoit Marty
b9799b46fd Fix test compilation 2021-12-13 22:45:24 +01:00
Benoit Marty
28588eb10c Use only non empty option to create a poll 2021-12-13 22:17:43 +01:00
Benoit Marty
db81ec260e Recycle View a bit more 2021-12-13 21:49:40 +01:00
Benoit Marty
0981af3085 Remove unused attribute 2021-12-13 21:33:15 +01:00
Benoit Marty
f29e14fdd8 Rename class 2021-12-13 21:17:14 +01:00
Benoit Marty
da407ef8a2 Avoid lateinit 2021-12-13 21:16:44 +01:00
Benoit Marty
10b39ccd28 Do some renaming 2021-12-13 21:08:52 +01:00