mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 17:35:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
22482 commits 6 branches 120 tags 229 MiB
Commit graph

22482 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
87c4506be5 Automatic upstream merge postprocessing 
Change-Id: I83125c87133ab63492d8d1fec30ad3746ce48c3e
 2022-12-07 14:56:10 +01:00
SpiritCroc
87100a8536 Merge remote-tracking branch 'upstream/develop' into sc 
Change-Id: Ifed09540802774e7b1d3f2ab787a7f42f1030b28

Conflicts:
	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
 2022-12-07 14:56:07 +01:00
SpiritCroc
f62381a972 Revert "Avoid unifiedpush selection spam" 
This reverts commit 509eabfe5c.
 2022-12-07 14:40:04 +01:00
SpiritCroc
001e22bbad Merge tag 'v1.5.11' into sc 
Change-Id: Ia736ee03b924e8ec8f641420eac11f5fc68b69f4
 2022-12-07 14:36:35 +01:00
SpiritCroc
ae87068cd8 [TMP] Automatic upstream merge preparation 
Change-Id: Icc696ad9418ffafd7271139471cae7e7d7b601cd
 2022-12-07 14:36:18 +01:00
SpiritCroc
bf80489905 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I215f83dab2252490aba0aba425bf5e19fcd0d392
 2022-12-07 14:36:17 +01:00
Benoit Marty
40bfffae9d Merge branch 'hotfix/1.5.11' into main 2022-12-07 14:03:49 +01:00
Benoit Marty
03440307ce Merge branch 'hotfix/1.5.11' into develop 2022-12-07 14:03:48 +01:00
Benoit Marty
242ef518b2 Merge hotfix 1.5.11 into develop (the fix is already on develop) 2022-12-07 14:03:08 +01:00
Benoit Marty
3132a7d463 Towncrier 1.5.11 2022-12-07 13:59:42 +01:00
Benoit Marty
a0bba91d67 Fastlane file for hotfix 1.5.11 2022-12-07 13:58:51 +01:00
Benoit Marty
6c84668611 Hotfix 1.5.11 2022-12-07 13:58:02 +01:00
Benoit Marty
53b703dcaf Changelog 2022-12-07 13:55:42 +01:00
Benoit Marty
1acd8e1049 Do not propagate failure if saving the filter server side fails. This will be retried later. 2022-12-07 13:55:18 +01:00
Benoit Marty
4a5f4849e5
Merge pull request #7725 from vector-im/feature/bma/filterCrash 
Do not propagate failure if saving the filter server side fails
 2022-12-07 13:54:57 +01:00
Benoit Marty
11dded71ec Changelog 2022-12-07 13:54:20 +01:00
ganfra
440944decb
Merge pull request #7669 from vector-im/dependabot/gradle/com.google.devtools.ksp-1.7.22-1.0.8 
Bump com.google.devtools.ksp from 1.7.21-1.0.8 to 1.7.22-1.0.8
 2022-12-07 11:43:05 +01:00
dependabot[bot]
a6752a0cf1
Bump com.google.devtools.ksp from 1.7.21-1.0.8 to 1.7.22-1.0.8 
Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.7.21-1.0.8 to 1.7.22-1.0.8.
- [Release notes](https://github.com/google/ksp/releases)
- [Commits](https://github.com/google/ksp/compare/1.7.21-1.0.8...1.7.22-1.0.8)

---
updated-dependencies:
- dependency-name: com.google.devtools.ksp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-06 16:10:25 +00:00
Benoit Marty
b9eb271aff
Merge pull request #7712 from vector-im/feature/bma/startServiceApi 
Use the latest startForeground API
 2022-12-06 17:05:07 +01:00
Florian Renaud
3b3947d046
Merge pull request #7677 from vector-im/dependabot/gradle/com.autonomousapps.dependency-analysis-1.17.0 
Bump com.autonomousapps.dependency-analysis from 1.16.0 to 1.17.0
 2022-12-06 17:04:58 +01:00
Onuray Sahin
f76a6de10d
Merge pull request #7710 from vector-im/feature/ons/fix_unknown_shield_icon_in_room 
Fix usage of unknown shield in room summary (PSG-1019)
 2022-12-06 17:51:04 +03:00
Benoit Marty
ae93c07597 Do not propagate failure if saving the filter server side fails. This will be retried later. 2022-12-06 15:01:47 +01:00
Maxime NATUREL
6f0a95b828
Merge pull request #7692 from vector-im/feature/mna/listen-notification-account-data 
Update notifications setting when m.local_notification_settings.<device-id> event changes for current device (PSG-874)
 2022-12-06 14:12:01 +01:00
Onuray Sahin
4cd4cf1c51 Code review fix. 2022-12-06 14:06:14 +03:00
Maxime NATUREL
b5f6dc0034
Merge pull request #7696 from vector-im/feature/mna/signout-all-other-sessions 
[Session manager] Add action to signout all the other session (PSG-888)
 2022-12-05 17:50:14 +01:00
Maxime NATUREL
7b830d1c1a Renaming a use case 2022-12-05 17:40:38 +01:00
Maxime NATUREL
a12c640984
Merge pull request #7630 from vector-im/feature/mna/remote-notification-toggle-account-data 
Save m.local_notification_settings.<device-id> event in account_data (PSG-873)
 2022-12-05 16:58:51 +01:00
Maxime NATUREL
a2f8fed63c
Merge pull request #7675 from vector-im/fix/mna/unified-push-selection 
ANR when asking to select the notification method
 2022-12-05 16:58:09 +01:00
Benoit Marty
febf01a2e6 Use the API startForeground(int id, @NonNull Notification notification, @ForegroundServiceType int foregroundServiceType) when available. 
Add missing android:foregroundServiceType in the manifest
 2022-12-05 16:36:31 +01:00
Onuray Sahin
32ded289fc Add changelog. 2022-12-05 18:18:09 +03:00
Onuray Sahin
516103e51b Fix usage of unknown shield in room summary. 2022-12-05 18:10:22 +03:00
Benoit Marty
201873f5a7
Merge pull request #7700 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-12-05 14:06:49 +01:00
Benoit Marty
a6904d2604
Merge pull request #7689 from vector-im/feature/bma/pills_color 
Fix bad pills color background.
 2022-12-05 14:05:44 +01:00
dependabot[bot]
7e0a597c65
Bump wysiwyg from 0.7.0.1 to 0.8.0 (#7666) 
Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.7.0.1 to 0.8.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/commits/0.8.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-05 09:42:20 +00:00
dependabot[bot]
b4792c8a59
Bump leakcanary-android from 2.9.1 to 2.10 (#7570) 2022-12-05 10:20:02 +01:00
Benoit Marty
b8023d66de Fix formatting 2022-12-05 09:57:02 +01:00
Maxime NATUREL
c12af5a800 Listening changes on notifications enabled preference to update the UI in settings 2022-12-05 09:46:14 +01:00
Maxime NATUREL
9fbfe82044 Fix observation of the notification status for the current session 2022-12-05 09:46:14 +01:00
Maxime NATUREL
18ab8a1279 Adding changelog entry 2022-12-05 09:46:14 +01:00
Maxime NATUREL
635f975b6c Fix missing unregister of pusher when notifications are disabled 2022-12-05 09:43:57 +01:00
Maxime NATUREL
e09b9a2ce0 Fixing wrong notification status when no registered pusher for the session 2022-12-05 09:43:57 +01:00
Maxime NATUREL
b78de15228 Adding unit tests for new toggle notification for current session use case 2022-12-05 09:43:57 +01:00
Maxime NATUREL
5248a69fe2 Updating existing unit tests 2022-12-05 09:43:57 +01:00
Maxime NATUREL
06681fd115 Removing listening on background sync preference 2022-12-05 09:43:57 +01:00
Maxime NATUREL
3f5147ddce Fixing the toggle notifications use case for current session 2022-12-05 09:43:57 +01:00
Maxime NATUREL
8973f3892a Fixing unit tests after rebase 2022-12-05 09:43:57 +01:00
Maxime NATUREL
9dff4ff949 Fixing import order after rebase 2022-12-05 09:43:57 +01:00
Maxime NATUREL
68d00e00d1 Fix method used to check if background sync is enabled 2022-12-05 09:43:56 +01:00
Maxime NATUREL
a2ae3af69d Removing unused imports 2022-12-05 09:43:56 +01:00
Maxime NATUREL
7c10a4cb21 Adding tests for notifications setting updater 2022-12-05 09:43:56 +01:00