filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,591 Commits 7 Branches 122 Tags 228 MiB
Commit Graph

22591 Commits

Author SHA1 Message Date
Benoit Marty ee737025f2
Merge pull request #7744 from vector-im/feature/bma/quickCrashFix 
Fix crash
 2022-12-08 16:01:55 +01:00
Onuray Sahin b09a00efda Code review fixes. 2022-12-08 17:11:09 +03:00
Maxime NATUREL 63bde230a3 Cancel verification alerts when adding the incoming request alert and when starting the process 2022-12-08 14:40:17 +01:00
Hugh Nimmo-Smith 7bbd91f2a9 Handle error whilst download key for self 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith 3a2a916c2f Clarify comment 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith d0b2c0693d Changelog 2022-12-08 13:27:49 +00:00
Hugh Nimmo-Smith 73fd93148a Download device keys for self prior to verification checks 
Fixes https://github.com/vector-im/element-android/issues/7676
 2022-12-08 13:27:49 +00:00
Maxime NATUREL df55c84167 Raise priority of incoming verification request alert + cancel existing verification alerts 2022-12-08 14:00:35 +01:00
jonnyandrew de18f37849
[Rich text editor] Add error tracking for rich text editor (#7695) 2022-12-08 11:43:19 +00:00
Onuray Sahin d6c20226bb Add changelog. 2022-12-08 13:46:01 +03:00
SpiritCroc 035e1ae7f7 Give replied-to text preview more height 
Change-Id: Iceb552d5f73d7860c333e242adfe066a8cf7105e
 2022-12-08 10:56:47 +01:00
dependabot[bot] 72ecd1bbc9
Bump kotlin-gradle-plugin from 1.7.21 to 1.7.22 (#7664) 
Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.7.21 to 1.7.22.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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-08 10:51:20 +01:00
Benoit Marty b25f185d63 Try to fix issue about danger file not found. 2022-12-08 10:48:17 +01:00
Maxime NATUREL b49045ff15 Adding changelog entry 2022-12-08 10:37:00 +01:00
Benoit Marty 7034d82259 changelog 2022-12-08 10:36:29 +01:00
Benoit Marty a5ab1b4a8b Fix crash `kotlin.UninitializedPropertyAccessException: lateinit property avatarRenderer has not been initialized`. AvatarRenderer is not used here. 2022-12-08 10:34:08 +01:00
ganfra ceec2018a7
Merge pull request #7686 from vector-im/dependabot/gradle/com.facebook.soloader-soloader-0.10.5 
Bump soloader from 0.10.4 to 0.10.5
 2022-12-07 20:24:13 +01:00
Onuray Sahin 055bf6d302 Revert unused companion object. 2022-12-07 21:41:22 +03:00
Benoit Marty 7d31cc9f55
Merge pull request #7730 from vector-im/dependabot/gradle/io.element.android-wysiwyg-0.9.0 
Bump wysiwyg from 0.8.0 to 0.9.0
 2022-12-07 18:14:05 +01:00
Florian Renaud 59859ec02e Prioritize call events against live broadcast 2022-12-07 18:11:52 +01:00
Florian Renaud bb7323a935 Rename some use cases 2022-12-07 18:11:52 +01:00
Florian Renaud 28c59e3290 Changelog 2022-12-07 18:11:52 +01:00
Florian Renaud 35c528405d Code cleanup 2022-12-07 18:11:52 +01:00
Florian Renaud 7a1dfef6d5 Display a notice in the timeline when a voice broadcast is stopped 2022-12-07 18:11:52 +01:00
Florian Renaud aa5270760e Hide typing events if there is a live voice broadcast 2022-12-07 18:11:51 +01:00
Florian Renaud 69beef4648 Show voice broadcast events in the room list 
fix factory
 2022-12-07 18:11:51 +01:00
Florian Renaud 1a3ca7b1a0 Filter event types from decrypted content 2022-12-07 18:11:51 +01:00
Florian Renaud 6e5461f300 Stop filtering events with reference relationship when computing latest previewable event 2022-12-07 18:11:51 +01:00
Florian Renaud 4d6c04baf9 Add provider for custom event types 2022-12-07 18:11:51 +01:00
Florian Renaud fdb8743ad3 Create provider package 2022-12-07 18:11:51 +01:00
Onuray Sahin f4429d4c9c Handle sync response to delete user and room account data. 2022-12-07 18:58:14 +03:00
Maxime NATUREL 23c2682f8d Fixing code style issues 2022-12-07 16:39:51 +01:00
Onuray Sahin 765202e05a Add helper functions to delete user and room account data. 2022-12-07 18:17:43 +03:00
Maxime NATUREL c580090f20
Merge pull request #7707 from vector-im/feature/mna/rename-and-signout-action-current-session 
[Session manager] Add actions to rename and signout current session (PSG-885)
 2022-12-07 16:16:44 +01:00
Valere 01533db4e0
Merge pull request #7713 from vector-im/feature/bca/to_device_tracing 
add to device tracing id
 2022-12-07 16:16:20 +01:00
Onuray Sahin d244f7324c Add api functions to delete account data. 2022-12-07 18:12:25 +03:00
Maxime NATUREL 88f7439880 Updating comment to clarify intention 2022-12-07 16:04:27 +01:00
Benoit Marty 6c94f1cd52 Quick tweak on the release script. 2022-12-07 15:50:26 +01:00
Maxime NATUREL a44c8dfca3 Renaming a method to avoid confusion 2022-12-07 15:10:21 +01:00
Benoit Marty d0b1a7bfd1
Merge pull request #7723 from vector-im/feature/bma/disableNightlyPopup 
Disable nightly popup
 2022-12-07 15:01:09 +01:00
SpiritCroc 09c20363bc Automatic SchildiChat string correction 
Change-Id: I0c114f2790d4f5c4ee6a254aa0dfab1c15ece5ca
 2022-12-07 14:56:12 +01:00
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
Maxime NATUREL f014866d06 Handling the case where device has no CryptoDeviceInfo 2022-12-07 14:34:45 +01:00
Benoit Marty c9c5483d22 Changelog 2022-12-07 14:10:23 +01:00
Benoit Marty 40bfffae9d Merge branch 'hotfix/1.5.11' into main 2022-12-07 14:03:49 +01:00