mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-27 11:28:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
24895 commits 7 branches 124 tags 230 MiB
Commit graph

24895 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot[bot]
7388279eb7
Bump flipper from 0.182.0 to 0.183.0 
Bumps `flipper` from 0.182.0 to 0.183.0.

Updates `com.facebook.flipper:flipper` from 0.182.0 to 0.183.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.182.0...v0.183.0)

Updates `com.facebook.flipper:flipper-network-plugin` from 0.182.0 to 0.183.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.182.0...v0.183.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 00:00:34 +00:00
Benoit Marty
448374fc58 Be able to let the user trust several Fingerprints during login flow. 
It was the case before, see `LoginViewModel.handleUserAcceptCertificate(...)`
 2023-03-01 21:18:46 +01:00
Florian Renaud
245ca13049 Improve encryption check condition 2023-03-01 13:52:53 +01:00
Florian Renaud
891897f0a7 Add additional tests 2023-03-01 13:50:40 +01:00
Maxime NATUREL
0df8d54de6
Merge pull request #8190 from vector-im/fix/mna/poll-ux-review 
[Poll history] Fixing small issue about font style (PSG-1178)
 2023-03-01 13:42:10 +01:00
Florian Renaud
75559fb21a Ensure the event is decrypted before applying push rules 2023-03-01 11:49:43 +01:00
Florian Renaud
ccf971afc4 Update encrypted raw json with decrypted event content for event matching condition 2023-03-01 10:42:57 +01:00
Maxime NATUREL
b0c8008fe0 Adding changelog entry 2023-03-01 10:40:53 +01:00
Maxime NATUREL
c54de67e03 Increase line spacing of the empty title in poll list screen 2023-03-01 10:29:14 +01:00
Maxime NATUREL
05c16dd09a Reducing size of the empty title in poll list screen 2023-03-01 10:08:22 +01:00
Weblate
95e345678a Merge branch 'origin/develop' into Weblate. 2023-02-28 23:33:45 +00:00
Besnik Bleta
ab1ff2ed84 Translated using Weblate (Albanian) 
Currently translated at 100.0% (93 of 93 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2023-02-28 23:33:43 +00:00
Danial Behzadi
c5cd0b2911 Translated using Weblate (Persian) 
Currently translated at 100.0% (93 of 93 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
 2023-02-28 23:33:41 +00:00
依云
34e2dca465 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 98.5% (2567 of 2606 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2023-02-28 23:33:39 +00:00
Danial Behzadi
45ab356b27 Translated using Weblate (Persian) 
Currently translated at 100.0% (2606 of 2606 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2023-02-28 23:33:39 +00:00
Yoan Pintas
09ad11df7f
Merge pull request #8175 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.13.7 
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.6 to 8.13.7
 2023-02-28 15:44:33 +01: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
dependabot[bot]
8e14579886
Bump org.sonarsource.scanner.gradle:sonarqube-gradle-plugin 
Bumps org.sonarsource.scanner.gradle:sonarqube-gradle-plugin from 3.5.0.2730 to 4.0.0.2929.

---
updated-dependencies:
- dependency-name: org.sonarsource.scanner.gradle:sonarqube-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 09:35:39 +00:00
dependabot[bot]
69f8715d03
Bump org.owasp:dependency-check-gradle from 8.1.0 to 8.1.1 (#8184) 
Bumps org.owasp:dependency-check-gradle from 8.1.0 to 8.1.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  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-28 09:34:53 +00:00
Maxime NATUREL
fadab52ba3
Merge pull request #8182 from vector-im/dependabot/gradle/org.json-json-20230227 
Bump org.json:json from 20220924 to 20230227
 2023-02-28 10:31:11 +01:00
dependabot[bot]
67d25dfcd8
Bump org.json:json from 20220924 to 20230227 
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20220924 to 20230227.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 00:01:45 +00:00
Sinofine Lotusie
772421f20d fix image scaling of no bubble mode 2023-02-27 17:28:01 +08:00
jonnyandrew
39d9591b26
[Rich text editor] Fix code appearance (#8171) 
Code does not use the correct theme colour when the theme is manually
selected in the app settings.

https://github.com/vector-im/verticals-internal/issues/23
 2023-02-27 09:24:56 +00:00
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
valere
1e66f4fa49 Fix broken migration 2023-02-23 14:57:28 +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