filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,826 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

23826 Commits

Author SHA1 Message Date
SpiritCroc e3a7ef911e Allow custom emote packs with state keys 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/184

Change-Id: I79ede7f9b45ff762b367c4b5cd048987e4f25515
 2023-03-06 10:32:16 +01:00
SpiritCroc 1f7ff4aec7 Increment version 
Change-Id: I9677db74deb15c841e318002f2781ea13b2d5dfa
 2023-03-05 10:18:41 +01:00
DarkCoder15 49d91fb9e6 Translated using Weblate (Russian) 
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ru/
 2023-03-05 08:21:27 +00:00
SpiritCroc 5081f665ea Include some experimental settings in rageshakes 
Change-Id: I23e313089409df88518446720bdf69a6f112de4b
 2023-03-04 15:45:27 +01:00
SpiritCroc 16f7cb4b8d Prefer caption over generic text for image/video message previews 
Change-Id: I0cfbae4df14b7f8327e56afd152f0e1fffb93c45
 2023-03-04 15:44:57 +01:00
Felipe Nogueira d9e633a7cc Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 66.6% (114 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/pt_BR/
 2023-03-03 19:00:15 +00:00
SpiritCroc bad9fdd8ad Fix url preview picture alignment without text 
Change-Id: I8f0651e8b9d9430cff80702c1bf88bf8fea8f7b7
 2023-02-28 15:23:44 +01:00
SpiritCroc 7c43d951fb Merge remote-tracking branch 'Sinofine/bubble-scale' into sc 
Change-Id: I8d1ec00d90280bdfa107ec25b6ca691169b00ba5
 2023-02-28 15:05:41 +01:00
SpiritCroc 5c0fdcc1ea Merge remote-tracking branch 'origin/sc' into sc 
Change-Id: Ib4721241870755528a702faac74523a92584ad36
 2023-02-28 14:59:27 +01:00
Sinofine Lotusie 772421f20d fix image scaling of no bubble mode 2023-02-27 17:28:01 +08:00
SteffoSpieler 828ab89765 Translated using Weblate (German) 
Currently translated at 96.4% (165 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/de/
 2023-02-24 09:59:58 +00:00
SpiritCroc 84684f24ea permalink loadMore: do not endlessly retry on M_UNKNOWN error 
Currently getting this after
"[rich replies] matrix-sdk: Ensure correct room for events loaded by
chunks"

Change-Id: I6658a9ed9e5df6d1cca580f2e83fff4a86d3383a
 2023-02-23 20:00:03 +01:00
SpiritCroc af720cdab9 [rich replies] matrix-sdk: Ensure correct room for events loaded by chunks 
If somebody links an invalid eventId in a room, which however is valid
in a different room, this can mess up our timelines badly.
This can be reproduced by replying to an event in a room, then forward
the reply to a different room with a client that also forwards the
replied-to information (such as FluffyChat). Then click on the rich
reply to open the eventId. Previously, Android could find the event from
the other room and thus replace the correct timeline with the wrong one.

Compare e.g. https://matrix.to/#/!bfebJVBOZMnORmkVdO:matrix.org/$wUyRiMQEjaWOpJ-XpdBJzuXkh95N7bce2pVT4IMXW50?via=schildi.chat&via=matrix.org&via=envs.net
linking to an event that exists here
https://matrix.to/#/!SDwMepdfgrmExhyxYZ:schildi.chat/$MO2G4MZZ1zg0Ymc9gTfekIyw7QFkNn4OvYQKK1PAGlE

Change-Id: I4dcee94353d954fb6ed57c3970686a620b831c6f
 2023-02-23 19:48:15 +01:00
SpiritCroc 476f60bd04 [merge] Fix initial send button color 
Change-Id: I0361ab015bb4f8e1a31c92dcdbc2dec7cc52fb31
 2023-02-23 12:18:45 +01:00
SpiritCroc 4065d21b7e [merge] Disable another new useless reply fallback calculation 
Change-Id: Ia090dac36ce08e7ea8e8bc0fe67a3e316b988bb9
 2023-02-23 12:12:46 +01:00
SpiritCroc 65a1a6e90f Automatic SchildiChat string correction 
Change-Id: I979fcf00b93efd23fffa3f9ee7a53fd13882c5e2
 2023-02-23 11:55:24 +01:00
SpiritCroc e771157851 Automatic upstream merge postprocessing 
Change-Id: I1899612abed560e8f96288c9dd30827c48c34102
 2023-02-23 11:55:23 +01:00
SpiritCroc 38c8e30541 Merge tag 'v1.5.26' into sc 
Change-Id: Ie54ce4c15b4b95f7ecb4419f421762d7c57c5c2d

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/res/drawable/ic_composer_rich_text_editor_close.xml
	vector/src/main/res/drawable/ic_composer_rich_text_editor_edit.xml
	vector/src/main/res/drawable/ic_rich_composer_add.xml
	vector/src/main/res/drawable/ic_rich_composer_send.xml
 2023-02-23 11:55:21 +01:00
SpiritCroc c92c579eb6 [TMP] Automatic upstream merge preparation 
Change-Id: I1e101e6410585303689b9ee1383587c4d1b1f076
 2023-02-23 11:39:53 +01:00
SpiritCroc fd0f4e733c Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I4d960c3207cfa802fcea0c6659478f848955a7c2
 2023-02-23 11:39:52 +01:00
SpiritCroc 702142f62f Revert "Revert "stop listening timeline collection changes when app is not resumed (#7734)"" 
Upstream fix incoming

This reverts commit 987ca6dec4.

Change-Id: I3cec506b84cf1e469133df5276640d099e3c33de
 2023-02-23 11:29:12 +01:00
SpiritCroc 2542d7de83 GitHub issue template: please check if it's related to a labs setting 
Change-Id: Iffa75319272401f1188a6d0a3e77263629d6a007
 2023-02-23 11:28:55 +01:00
ganfra f637996310 Merge branch 'release/1.5.26' into main 2023-02-22 17:48:04 +01:00
ganfra a9ebf4fdd6 Adding fastlane file for version 1.5.26 2023-02-22 17:47:59 +01:00
ganfra 93a6bfb0f2 Changelog for version 1.5.26 2023-02-22 17:47:37 +01:00
Maxime NATUREL 24e1740a8a
Merge pull request #8151 from vector-im/fix/mna/edited-reply-parsing 
[Timeline]: Editing a reply from iOS breaks the "in reply to" rendering (PSG-1168)
 2023-02-22 10:48:25 +01:00
Maxime NATUREL 7938eac490
Merge pull request #8154 from vector-im/dependabot/gradle/com.otaliastudios-transcoder-0.10.5 
Bump com.otaliastudios:transcoder from 0.10.4 to 0.10.5
 2023-02-22 10:42:46 +01:00
dependabot[bot] e9a2cf4834
Bump com.posthog.android:posthog from 2.0.1 to 2.0.2 (#8155) 
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/PostHog/posthog-android/releases)
- [Changelog](https://github.com/PostHog/posthog-android/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PostHog/posthog-android/compare/2.0.1...2.0.2)

---
updated-dependencies:
- dependency-name: com.posthog.android:posthog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-02-22 08:44:53 +01:00
dependabot[bot] 77807de811
Bump com.otaliastudios:transcoder from 0.10.4 to 0.10.5 
Bumps [com.otaliastudios:transcoder](https://github.com/natario1/Transcoder) from 0.10.4 to 0.10.5.
- [Release notes](https://github.com/natario1/Transcoder/releases)
- [Commits](https://github.com/natario1/Transcoder/compare/v0.10.4...v0.10.5)

---
updated-dependencies:
- dependency-name: com.otaliastudios:transcoder
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-21 23:57:25 +00:00
ganfra 9541d75d3f
Merge pull request #8152 from vector-im/feature/fga/fix_timeline_position_loss 
Fix always jumps to the bottom of the timeline #8090
 2023-02-21 14:51:21 +01:00
ganfra 84cb6e74f2 Fix always jumps to the bottom of the timeline #8090 2023-02-21 11:47:09 +01:00
Maxime NATUREL 6bd150d4cd
Merge pull request #8144 from vector-im/feature/mna/user-location-in-loc-sharing 
[Location sharing] Show own location in map views
 2023-02-20 16:34:37 +01:00
Maxime NATUREL ac0bdb7dfe Ensure edited text reply contains a formatted body 2023-02-20 15:55:49 +01:00
Maxime NATUREL db512d63df Adding changelog entry 2023-02-20 15:55:17 +01:00
Maxime NATUREL a0bab98af9 Use dispatcher provider instead of hardcoded dispatcher 2023-02-20 10:22:10 +01:00
Maxime NATUREL 27046ed1a6 Fixing code style issue 2023-02-20 09:23:09 +01:00
SpiritCroc 9521814f32 Support webp rendering in the timeline 
Change-Id: I701cc96bdc466e1de961222e30d25289a159557e
 2023-02-19 10:10:42 +01:00
SpiritCroc 6887589b9e Increment version 
Change-Id: I41282c5ec503eeb7e54c9e45dfb8b801b6b7304a
 2023-02-18 11:00:09 +01:00
Maxime NATUREL aa805dceca Mutualizing some code 2023-02-17 17:15:56 +01:00
Maxime NATUREL df2c3e7c07 Check if location tracking is started before starting it 2023-02-17 17:02:05 +01:00
Maxime NATUREL 25ca598414 Adding some unit tests 2023-02-17 16:41:03 +01:00
Benoit Marty 4080f1c8b8
Merge pull request #8117 from vector-im/dependabot/gradle/dagger-2.45 
Bump dagger from 2.44.2 to 2.45
 2023-02-17 16:07:29 +01:00
Benoit Marty 386814eac4
Merge pull request #8142 from vector-im/yostyle/fix_sendbutton_color 
Remove hardcoded color on send button
 2023-02-17 15:53:11 +01:00
Maxime NATUREL b5af6f5a0f Render user location pin on the live location sharing map preview 2023-02-17 15:31:30 +01:00
Maxime NATUREL de50577ac3
Merge pull request #8136 from vector-im/fix/mna/poll-end-while-no-poll-start 
[Poll] Improve rendering of poll end message when poll start event isn't available (PSG-1157)
 2023-02-17 13:51:50 +01:00
Florian Renaud 7d16c86f37
Merge pull request #8130 from vector-im/feature/fre/poll_sync_push_rules_after_creation 
[Poll] Synchronize polls and message push rules after creation (PSG-1137)
 2023-02-17 13:46:13 +01:00
Florian Renaud 8bf46b136a Fix broken test 2023-02-17 12:12:55 +01:00
SpiritCroc 4939481577 Update German store description 
Change-Id: I1f22dc3505c3b65d1fbb0e5b5e53366a034e8c11
 2023-02-17 12:09:08 +01:00
yostyle 4c12c0dd1f Add changelog 2023-02-17 11:32:51 +01:00
yostyle 835e1f5a4b Remove hardcoded color on send button 2023-02-17 11:17:49 +01:00