filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-21 23:34:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,644 Commits 7 Branches 123 Tags 229 MiB
6b0f8318b7
Commit Graph

10934 Commits

Author SHA1 Message Date
ericdecanini
9e1235d51f Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
 2022-07-20 16:44:33 +02:00
ericdecanini
0ad2051dd3 Improves plural used in strings 2022-07-20 14:48:38 +02:00
Weblate
2792c48a6e Merge branch 'origin/develop' into Weblate. 2022-07-20 12:26:40 +00:00
LinAGKar
3eb590ebe8 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2022-07-20 12:26:32 +00:00
Sveinn í Felli
653f699c28 Translated using Weblate (Icelandic) 
Currently translated at 82.1% (1861 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
 2022-07-20 12:26:32 +00:00
Szimszon
b500fcd3d0 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-07-20 12:26:32 +00:00
notramo
9a86ae670c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2265 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-07-20 12:26:30 +00:00
ssnfcmux
79ba60c10d Translated using Weblate (Arabic) 
Currently translated at 43.2% (979 of 2265 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-07-20 12:26:30 +00:00
Onuray Sahin
7f821f1285
Merge pull request #6587 from vector-im/feature/ons/fix_live_location_sharing_permission 
Check user power level before sharing live location (PSG-620)
 2022-07-20 15:01:32 +03:00
Eric Decanini
7ceef0045b
Merge pull request #6602 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.52 
Bump libphonenumber from 8.12.51 to 8.12.52
 2022-07-20 13:51:45 +02:00
Onuray Sahin
26a677edc2
Merge branch 'develop' into feature/ons/fix_live_location_sharing_permission 2022-07-20 13:40:55 +03:00
Eric Decanini
38ba61f144
Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication 
Fixes room not being in space after upgrade
 2022-07-20 12:30:42 +02:00
Eric Decanini
a0bf1787cb
Merge pull request #6593 from vector-im/task/eric/trailing-commas 
Code style change: Trailing Commas
 2022-07-20 11:46:53 +02:00
ericdecanini
ee941cf88d Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt
 2022-07-20 10:56:07 +02:00
Maxime NATUREL
448b6e1c74
Merge pull request #6539 from vector-im/bugfix/mna/lls-status-bar-disappearing 
[Location Share] - Wrong room live location status bar visibility in timeline (PSG-625)
 2022-07-20 09:55:06 +02:00
dependabot[bot]
6332668b8c
Bump libphonenumber from 8.12.51 to 8.12.52 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.51 to 8.12.52.
- [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.12.51...v8.12.52)

---
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>
 2022-07-19 23:06:00 +00:00
Maxime NATUREL
c3105c8bb1
Merge pull request #6486 from vector-im/feature/mna/delete-lls 
[Location sharing] - Delete action on a live message (PSG-523)
 2022-07-19 16:43:41 +02:00
Maxime NATUREL
b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events 
[Timeline] - Collapse redacted events (PSG-523)
 2022-07-19 16:39:45 +02:00
Onuray Sahin
9976b3b8ac
Merge pull request #6567 from vector-im/feature/ons/share_location_with_other_apps 
Share location with other apps (PSG-242)
 2022-07-19 17:08:36 +03:00
ericdecanini
8c53d2f9b0 Reformats modules 2022-07-19 15:11:42 +02:00
Benoit Marty
70c62233d0
Merge pull request #6569 from vector-im/feature/adm/ftue-copy-review 
FTUE - Copy review
 2022-07-19 14:49:28 +02:00
Benoit Marty
70c8703b2b
Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review 
FTUE - Combined register copy review
 2022-07-19 14:44:29 +02:00
Maxime NATUREL
ecbd2d48a7 Replacing callback by a SharedFlow to notify of roomIds updates 2022-07-19 14:43:33 +02:00
Maxime NATUREL
33714b850f Make the status bar only visible in rooms where there is an active live 2022-07-19 14:43:33 +02:00
Maxime NATUREL
82391aa281 Replacing ViewEvent by a ViewState property 2022-07-19 14:43:33 +02:00
Maxime NATUREL
b2d7ef9fbf Re-arranging imports 2022-07-19 14:06:19 +02:00
Maxime NATUREL
7961525869 Unit tests: adding verification that redaction does not happen when event id is empty 2022-07-19 14:06:19 +02:00
Maxime NATUREL
2121ec5739 Moving use case to check if event is redacted into a dedicated package 2022-07-19 14:06:19 +02:00
Maxime NATUREL
99fc4b4a21 Simplify logic of the use case to check if event can be redacted 2022-07-19 14:06:18 +02:00
Maxime NATUREL
1277376496 Fix missing handling of redacted beacon location data events 2022-07-19 14:05:13 +02:00
Maxime NATUREL
8fb402ab10 Stop sharing live location if live is redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL
391bf842b4 Calling usecase to redact live location share event 2022-07-19 14:05:13 +02:00
Maxime NATUREL
c095cc73ce Introducing use case to check if an event can be redacted 2022-07-19 14:05:13 +02:00
Maxime NATUREL
9c619001a5 Updating string value for redacted event to be more consistent 2022-07-19 14:04:09 +02:00
Maxime NATUREL
4a5fe3c0f9 Fix the criteria to start merging redacted events 2022-07-19 14:04:09 +02:00
Maxime NATUREL
fe4174f005 Small improvements in code 2022-07-19 14:04:08 +02:00
Maxime NATUREL
c9794d8280 Small fixes in comments 2022-07-19 14:04:08 +02:00
Maxime NATUREL
b412b9f4e9 Merging redacted events by reusing existing mechanism for same type events 2022-07-19 14:04:08 +02:00
Maxime NATUREL
8d8ee051eb Improve readability of merged Header factory code 2022-07-19 14:04:08 +02:00
Onuray Sahin
c408f824d3 Code review fixes. 2022-07-19 14:58:00 +03:00
Eric Decanini
221cb24de8
Merge pull request #6584 from vector-im/task/eric/new_layout_feature_flag 
Adds NewAppLayoutEnabled Feature Flag
 2022-07-19 12:24:16 +01:00
Benoit Marty
758f0398bd Fix error when building `./gradlew assembleGplayNightly. Just reordering lines... 
Error was `No matching client found for package name 'im.vector.app'`
 2022-07-19 12:50:47 +02:00
Onuray Sahin
493dc57a29 Code review fixes. 2022-07-19 13:41:00 +03:00
Benoit Marty
4d4dbc958b
Merge pull request #6590 from vector-im/bugfix/nfe/missing_font_scale_setting 
fixed crash when system font scale setting isn't set
 2022-07-19 12:30:38 +02:00
Onuray Sahin
8b6e4dd4d4
Merge pull request #6579 from vector-im/feature/ons/fix_remove_live_location_logs 
Do not log the live location of the user (PSG-63)
 2022-07-19 12:18:58 +03:00
ericdecanini
2f408656a7 Changes vector override to vector feature 2022-07-19 10:43:55 +02:00
NIkita Fedrunov
f37e3b71eb fixed crash when system font scale setting isn't set 2022-07-19 10:40:14 +02:00
Onuray Sahin
e2cd75284f Check user power level before sharing live location. 2022-07-18 18:46:03 +03:00
ericdecanini
fbd1763dcf Adds new app layout enabled feature flag 2022-07-18 16:49:42 +02:00
ericdecanini
7d29fbc68c Fixes post merge errors 2022-07-18 15:06:25 +02:00