mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-24 18:08:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
14512 commits 7 branches 124 tags 230 MiB
Commit graph

14512 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
a6ae709fe9
Merge pull request #5101 from vector-im/feature/bma/typos 
Fix some typos
 2022-01-31 11:18:30 +01:00
Benoit Marty
14c4233cdc Fix some typos 2022-01-31 11:01:29 +01:00
Benoit Marty
2228a1b59f
Merge pull request #5100 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-01-31 10:59:06 +01:00
ariskotsomitopoulos
cdd36ce034 Fix IndexOutOfBound crashes while clicking permalinks 2022-01-31 11:56:26 +02:00
Weblate
45360e8d18 Merge branch 'origin/develop' into Weblate. 2022-01-31 08:46:22 +00:00
Benoit Marty
57fc623995
Merge pull request #5098 from vector-im/sync-analytics-plan 
Sync analytics plan
 2022-01-31 09:44:00 +01:00
Weblate
da7edde0a2 Merge branch 'origin/develop' into Weblate. 2022-01-31 08:41:51 +00:00
Jozef Gaal
6564146e91 Translated using Weblate (Slovak) 
Currently translated at 72.6% (1999 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-01-31 08:41:44 +00:00
bmarty
b2bc92eebb Sync analytics plan 2022-01-31 00:02:22 +00:00
SpiritCroc
0a48bc7b91 Automatic SchildiChat string correction 
Change-Id: Ib9786bd0ae9894684b8c29ff9afd5372d471f7dc
 2022-01-29 15:56:26 +01:00
SpiritCroc
be016b253f Automatic upstream merge postprocessing 
Change-Id: I33e1c359a79d9421a689295976d93f5ec0697026
 2022-01-29 15:56:25 +01:00
SpiritCroc
45a5b8ca94 [merge] Further merge fixups 
Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812
 2022-01-29 15:56:13 +01:00
SpiritCroc
7b9da40e52 [merge] Use java 11 again, pt.2 
Change-Id: I136053222ffa1a264ce97a9d6ec51515e10208a0
 2022-01-29 14:59:20 +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
SpiritCroc
0eddb5ed75 [TMP] Automatic upstream merge preparation 
Change-Id: I367672d6824d7e49f7393247372314c816d05ceb
 2022-01-29 10:36:12 +01:00
SpiritCroc
a7f1d68f38 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iaff18aadc34781f6d4d4ba93e4017373ee9feb37
 2022-01-29 10:36:12 +01:00
SpiritCroc
beb2b1e8a0 [merge] Use Java 11 again 
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
 2022-01-29 10:35:54 +01:00
Jozef Gaal
84373a3f44 Translated using Weblate (Slovak) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
 2022-01-29 09:26:32 +00:00
Szimszon
d9cee9f2f1 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2022-01-29 09:26:31 +00:00
libexus
47c9404518 Translated using Weblate (German) 
Currently translated at 100.0% (46 of 46 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2022-01-29 09:26:30 +00:00
Hasan
ed21744402 Translated using Weblate (Turkish) 
Currently translated at 64.0% (1763 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2022-01-29 09:26:29 +00:00
Szimszon
c3b4e4f2f9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-01-29 09:26:17 +00:00
Paragoumba
45c0761b74 Translated using Weblate (French) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-01-29 09:26:14 +00:00
libexus
fee155ba1e Translated using Weblate (German) 
Currently translated at 99.6% (2741 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-29 09:26:14 +00:00
Benoit Marty
2fbb434099 Format 2022-01-29 08:52:20 +01:00
Benoit Marty
a8c251f6f5 Avoid taking into account any provider location if we have gps location. 2022-01-29 08:51:30 +01:00
Benoit Marty
99f82d9691 Avoid taking into account network location if we have gps location. 2022-01-29 08:34:20 +01:00
Benoit Marty
303a858423 Create an extension, improve the parsing algorithm, add robustness and unit test it 2022-01-29 08:13:11 +01:00
Benoit Marty
83ed80e6d8 Rename fun for clarity 2022-01-29 07:40:41 +01:00
Benoit Marty
b14e557c36 Use the existing item click mechanism 2022-01-29 07:39:55 +01:00
Benoit Marty
2ce3894562 Create a UrlMapProvider for a better handling of RTL languages, and build the URLs in the controllers 2022-01-28 22:46:58 +01:00
ganfra
fd99d6d7d8 Bubbles: start fixing RTL 2022-01-28 19:53:07 +01:00
Benoit Marty
eff6942f82 Use a MaterialCarView 2022-01-28 18:56:09 +01:00
Benoit Marty
e0ac8ee8b8 No need for an extra FrameLayout 2022-01-28 18:53:30 +01:00
Benoit Marty
0dce0342b3
Merge pull request #5093 from vector-im/feature/adm/test-code-quality-warnings 
UI test clean ups
 2022-01-28 18:49:03 +01:00
Onuray Sahin
2dc52da30c Use static map image in bottom sheet. 2022-01-28 20:48:53 +03:00
ganfra
c425701c20 Bubbles: handle ripple effect 2022-01-28 17:55:32 +01:00
Onuray Sahin
50279e3183 Use static map image in timeline. 2022-01-28 18:51:28 +03:00
ariskotsomitopoulos
b1067e9a58 - ktlint format 
- Update a text resource
 2022-01-28 16:37:59 +02:00
ganfra
35674ad401 Bubbles: handle location sharing (need updates) 2022-01-28 15:10:13 +01:00
ganfra
b79a5fd4f4 Bubble: move overlay view to MessageBubbleView (and fix corner radius) 2022-01-28 15:09:43 +01:00
Adam Brown
f66bd4ffe9 waiting for the emoji to become visible instead of a hardcoded sleep 2022-01-28 13:20:56 +00:00
Adam Brown
d6f0e065aa fixing missing when branches warning 2022-01-28 12:49:28 +00:00
Adam Brown
0c2116a95d using espresso long click instead of barista helper and waiting for reaction before interacting 
- the non barista long pressing works for the menu opening, maybe this will fix the CI
 2022-01-28 12:48:26 +00:00
Benoit Marty
c487add2cd
Merge pull request #5091 from vector-im/feature/adm/timeline-item-crash 
Timeline recycling crash
 2022-01-28 13:40:16 +01:00
Adam Brown
2eeeefdf49 adding changelog entry 2022-01-28 12:11:54 +00:00
ariskotsomitopoulos
1d6d8102b3 Further improve thread summary after forward scrolling 2022-01-28 14:11:03 +02:00
Onuray Sahin
4026ddb34f Fix multiple pin rendering. 2022-01-28 15:07:51 +03:00
Adam Brown
22b64a3e9a resetting text futures when updating recycled text 2022-01-28 12:05:12 +00:00
Onuray Sahin
0f8c3bcc17 Try to get location by using all available providers. 2022-01-28 14:17:07 +03:00