filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,667 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

25667 Commits

Author SHA1 Message Date
Benoit Marty 343468717c Add a test 2024-02-02 13:56:44 +01:00
Benoit Marty d49f6bfbb6 Equivalent code. 2024-02-02 13:56:44 +01:00
Jorge Martin Espinosa d75ca516fc
Merge pull request #8741 from element-hq/fix/jme/update-login-splash-screen 
Make 'sign in' flow more important in the initial screen
 2024-02-02 09:58:16 +01:00
Benoit Marty 1277f6fdd9
Merge pull request #8744 from element-hq/feature/bma/usedDecryptedEvent 
[Crypto] Improve Event.getClearContent() and fix assignement issue.
 2024-02-02 09:47:22 +01:00
Benoit Marty 3611052386 Add changelog. 2024-02-02 09:46:44 +01:00
Benoit Marty 96648bbd0e
Merge pull request #8745 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.27.0 
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0
 2024-02-02 09:39:44 +01:00
dependabot[bot] 393c40e652
Bump io.element.android:wysiwyg from 2.25.0 to 2.27.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.25.0 to 2.27.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.25.0...2.27.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>
 2024-02-01 23:41:07 +00:00
Benoit Marty 7dc8c436cf Fix test. `getClearContent()` return the decrypted content for encrypted Event, and it is null in this case 2024-02-01 18:43:59 +01:00
Benoit Marty ec96f4e0ae Fix assignment issue. `sessionId` was used instead of `roomId`. 
This may fix issue of Event not decrypted if the key is coming late for the last Event displayed in the Room list.
 2024-02-01 18:11:44 +01:00
Benoit Marty e04bfe8981 Remove dead code 2024-02-01 18:02:04 +01:00
Benoit Marty a1140fd8fa Improve getClearContent() method: it should not fallback to the encrypted content when the content is not decrypted. 2024-02-01 17:28:29 +01:00
Benoit Marty a17c75a7da Remove unused import 2024-01-31 18:49:19 +01:00
Benoit Marty 054af4d6a3 changelog 2024-01-31 18:31:56 +01:00
Benoit Marty 6a30a2ed32 Keep the current message formatting when switching between composer mode (Regular, Reply, etc.) 2024-01-31 18:28:39 +01:00
Benoit Marty 423b9215c4 Store the `formattedText` to the draft, to be able to restore the formatting. #7466 2024-01-31 18:28:39 +01:00
Benoit Marty cc355a8e14
Merge pull request #8733 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.25.0 
Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0
 2024-01-31 08:42:23 +01:00
Jorge Martín 4cd7c60032 Make 'sign in' flow more important in the initial screen 2024-01-30 12:20:56 +01:00
SpiritCroc d7e7a319f0 Increment version 
Change-Id: Id67482f897e5f28851077bec9c84045120b731a7
 2024-01-21 10:42:22 +01:00
Benoit Marty d418525748
Merge pull request #8734 from element-hq/feature/bma/fixRelease 
Fix release script which download artifact
 2024-01-17 17:55:40 +01:00
Benoit Marty a5df7649a3
Merge pull request #8735 from davidegirardi/patch-1 
Point to Element security@ address and policy
 2024-01-17 09:55:26 +01:00
davidegirardi 34c75bd6c2
Point to Element security@ address and policy 2024-01-17 09:27:39 +01:00
Benoit Marty 122018dd7b fix typo 2024-01-15 10:56:15 +01:00
regzero76 0a20220ef1 Added translation using Weblate (Rusyn) 2024-01-13 13:09:12 +00:00
dependabot[bot] 0f3d22bc85
Bump io.element.android:wysiwyg from 2.24.0 to 2.25.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.24.0 to 2.25.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.24.0...2.25.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>
 2024-01-12 23:41:59 +00:00
SpiritCroc a902199fe2 Automatic SchildiChat string correction 
Change-Id: I86ce37dcc2bd6cc92d00585768b746d5f647acb8
 2024-01-10 19:59:28 +01:00
SpiritCroc 3d58efb75a Automatic upstream merge postprocessing 
Change-Id: I0e54ab321170944352d07898179705e3ac667e49
 2024-01-10 19:59:26 +01:00
SpiritCroc 4573a4235e Merge tag 'v1.6.10' into sc 
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
 2024-01-10 19:57:20 +01:00
SpiritCroc 20131ab024 [TMP] Automatic upstream merge preparation 
Change-Id: I489ac980279e10d82764fca5e6942efc805d355c
 2024-01-10 18:09:25 +01:00
SpiritCroc e40ac752e9 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I1823e449896c1b47d87f7dac6bd01349b3f902fd
 2024-01-10 18:09:25 +01:00
Benoit Marty 42696eb31d Fix parsing after artifact url change on GitHub 2024-01-09 14:04:55 +01:00
Benoit Marty ee16ef06e9 version++ 2024-01-09 12:20:07 +01:00
Benoit Marty a080826242 Merge tag 'v1.6.10' into develop 
tag
 2024-01-09 12:16:39 +01:00
Benoit Marty 493093c2a7 Merge branch 'release/1.6.10' into main 2024-01-09 12:16:21 +01:00
Benoit Marty ac79b2ee63 Adding fastlane file for version 1.6.10 2024-01-09 12:16:15 +01:00
Benoit Marty 5c6e1d5378 Changelog for version 1.6.10 2024-01-09 12:15:28 +01:00
Benoit Marty 4c8ffbd169
Merge pull request #8727 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.24.0 
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0
 2024-01-08 09:02:03 +01:00
dependabot[bot] 924913165e
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.22.0 to 2.24.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.22.0...2.24.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>
 2024-01-05 23:19:07 +00:00
ganfra e596196f99
Merge pull request #8716 from element-hq/feature/fga/fix_event_edition_reply 
Fix a bunch of issues related to edition and reply #5969
 2024-01-02 14:02:52 +01:00
manuroe 7a2520b03c
Merge pull request #8724 from element-hq/manu/issue_triaging_cleanup 
GH actions: remove triaging process and old GH projects
 2024-01-02 12:11:22 +01:00
manuroe 60d4221016 GH actions: remove triaging process and old GH projects 2024-01-02 11:00:54 +01:00
ganfra 2ada4c8491 Fix quality 2024-01-02 08:17:26 +01:00
ganfra 320aae1430 Also fix pills with rich text editor 2024-01-02 08:17:26 +01:00
ganfra b72039e735 Fix a bunch of issues related to edition and reply #5969 2024-01-02 08:17:26 +01:00
Jorge Martin Espinosa c46b3148e4
Try fixing exodus CI job (#8721) 
* Ignore tracker count retrieved by exodus job so the report can be created

* Ignore Sentry, since it's a known and optional tracker
 2024-01-02 08:16:27 +01:00
Benoit Marty dff9b82185 Revert change on those files, that should fix Weblate conflict 
I am receiving 1 mail per hour about that
 2023-12-22 09:48:03 +01:00
Benoit Marty 25d1945cdc
Merge pull request #8577 from element-hq/sync-analytics-plan 
Sync analytics plan
 2023-12-21 14:19:59 +01:00
Benoit Marty 03966f1c13 Fix KDoc (I know I should not edit this, but its fine) 2023-12-21 09:38:03 +01:00
Benoit Marty e818f86896
Merge pull request #8666 from yostyle/yostyle/fix_crypto_migration 
Move crypto migration
 2023-12-21 09:33:17 +01:00
Benoit Marty d610f75f1b Fix compilation issue. 
This extension is only used for Test
 2023-12-21 09:30:46 +01:00
Benoit Marty 7242ad48c2 No need to use `also` here. 2023-12-21 09:29:31 +01:00