Commit graph

24208 commits

Author SHA1 Message Date
dependabot[bot]
088c2ae449
Bump org.maplibre.gl:android-sdk from 9.6.0 to 10.0.2
Bumps [org.maplibre.gl:android-sdk](https://github.com/maplibre/maplibre-gl-native) from 9.6.0 to 10.0.2.
- [Release notes](https://github.com/maplibre/maplibre-gl-native/releases)
- [Changelog](https://github.com/maplibre/maplibre-gl-native/blob/main/CHANGELOG.md)
- [Commits](https://github.com/maplibre/maplibre-gl-native/compare/android-v9.6.0...android-v10.0.2)

---
updated-dependencies:
- dependency-name: org.maplibre.gl:android-sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-25 00:00:01 +00:00
dependabot[bot]
62ee6c8033
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.6 to 8.13.7
Bumps [com.googlecode.libphonenumber:libphonenumber](https://github.com/google/libphonenumber) from 8.13.6 to 8.13.7.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.13.6...v8.13.7)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 23:59:47 +00:00
dependabot[bot]
a30e4a9d86
Bump androidx.transition:transition from 1.2.0 to 1.4.1
Bumps androidx.transition:transition from 1.2.0 to 1.4.1.

---
updated-dependencies:
- dependency-name: androidx.transition:transition
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 23:58:26 +00:00
dependabot[bot]
370d58e876
Bump glide from 4.14.2 to 4.15.0
Bumps `glide` from 4.14.2 to 4.15.0.

Updates `com.github.bumptech.glide:glide` from 4.14.2 to 4.15.0
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/v4.14.2...v4.15.0)

Updates `com.github.bumptech.glide:compiler` from 4.14.2 to 4.15.0
- [Release notes](https://github.com/bumptech/glide/releases)
- [Commits](https://github.com/bumptech/glide/compare/v4.14.2...v4.15.0)

---
updated-dependencies:
- dependency-name: com.github.bumptech.glide:glide
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.github.bumptech.glide:compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 23:58:00 +00: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
Maxime NATUREL
a6f7302350
Merge pull request #8159 from vector-im/feature/mna/aggregated-unread-indicator
Add aggregated unread indicator for spaces in the new layout
2023-02-24 09:56:54 +01:00
Florian Renaud
b20d74aa1d Add changelog file 2023-02-24 09:50:07 +01:00
Florian Renaud
9d7758c9e3 Reuse event.supportsNotification extension 2023-02-24 09:26:50 +01:00
Florian Renaud
b6ac915805 Apply push rules on encrypted events 2023-02-24 09:13:44 +01:00
Maxime NATUREL
ef38ba033f
Merge pull request #8169 from vector-im/dependabot/gradle/com.posthog.android-posthog-2.0.3
Bump com.posthog.android:posthog from 2.0.2 to 2.0.3
2023-02-24 09:12:57 +01:00
Florian Renaud
ea635976a5
Merge pull request #8141 from vector-im/feature/fre/poll_sync_error_handling
[Poll] Error handling for push rules synchronization
2023-02-24 09:11:38 +01:00
dependabot[bot]
a331d907ce
Bump com.posthog.android:posthog from 2.0.2 to 2.0.3
Bumps [com.posthog.android:posthog](https://github.com/PostHog/posthog-android) from 2.0.2 to 2.0.3.
- [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.2...2.0.3)

---
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>
2023-02-23 23:58:26 +00:00
SpiritCroc
8192bb5442 matrix-sdk: Ensure correct room for events loaded by chunks
Chunks should not load events from other rooms if they happen to be
requested for one eventId that already exists in a different room.

Motivation from a client that renders rich replies (although the
broken scenario can appear in other cases as well):

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 20:12:33 +01: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
Maxime NATUREL
53d03335ab Remove unused import 2023-02-23 14:18:21 +01:00
Florian Renaud
6649297ea0 restore onSessionStarted method call 2023-02-23 14:01:49 +01:00
Maxime NATUREL
2bd0126523 Extracting logic to compute the badge state into a usecase 2023-02-23 13:59:32 +01:00
Florian Renaud
85734c05aa
Merge pull request #8147 from vector-im/dependabot/gradle/flipper-0.182.0
Bump flipper from 0.178.1 to 0.182.0
2023-02-23 13:56:42 +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
Maxime NATUREL
f782a31592 Fix unit tests 2023-02-23 10:15:34 +01:00
ganfra
60ebc0dccb
Update build.yml to fix checkout on main 2023-02-23 10:05:45 +01:00
Florian Renaud
021babc9b1 Fix notification in encrypted room for poll end event 2023-02-23 09:24:14 +01:00
Florian Renaud
cd648a0b50 Fix unit tests 2023-02-23 09:24:14 +01:00
Florian Renaud
13866c62bf Refresh push rules settings on account data changes 2023-02-23 09:24:14 +01:00
Florian Renaud
8f56f9de46 update doc 2023-02-23 09:24:14 +01:00
Florian Renaud
84ccd30ab7 Fix wrong import 2023-02-23 09:24:13 +01:00
Florian Renaud
552c6fbbd3 Changelog 2023-02-23 09:24:13 +01:00
Florian Renaud
0d28b3a860 Handle errors when updating push rules 2023-02-23 09:24:13 +01:00
dependabot[bot]
f8449f9567
Bump androidx.arch.core:core-testing from 2.1.0 to 2.2.0
Bumps androidx.arch.core:core-testing from 2.1.0 to 2.2.0.

---
updated-dependencies:
- dependency-name: androidx.arch.core:core-testing
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-22 23:16:01 +00:00
Maxime NATUREL
664fa7f952
Merge pull request #8160 from vector-im/fix/mna/pref-space-setting-visibility
Space setting category doesn't show up
2023-02-22 17:59:43 +01:00
ganfra
2aa5e6f7a0 Apply changes 2023-02-22 17:55:50 +01:00
ganfra
a98dc86e34 version++ 2023-02-22 17:51:12 +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
8861b36aba Make the setting visible when using old app layout 2023-02-22 16:09:37 +01:00
Maxime NATUREL
7062e0737c Add changelog entry 2023-02-22 16:08:59 +01:00
Maxime NATUREL
af4ab41851 Highlight the badge when there is pending space invite 2023-02-22 15:04:14 +01:00
Maxime NATUREL
1b0265662d Adding changelog entry 2023-02-22 14:50:01 +01:00
Maxime NATUREL
18c7f0d894 Remove unused import 2023-02-22 14:39:44 +01:00
Maxime NATUREL
b78da9824d Adding unit tests for NewHomeDetailViewModel 2023-02-22 14:38:35 +01:00