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

24861 Commits

Author SHA1 Message Date
valere ee1580c50e Fix failing test 2023-04-06 09:59:00 +02:00
valere 2077d972bc Fix test deadlock with await latch 2023-04-06 09:58:45 +02:00
valere 3e1b59d062 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-06 08:53:20 +02:00
Florian Renaud 9490ddf53f
Merge pull request #8301 from vector-im/dependabot/gradle/org.checkerframework-checker-3.33.0 
Bump org.checkerframework:checker from 3.32.0 to 3.33.0
 2023-04-06 08:48:32 +02:00
Florian Renaud 10216c70cf
Merge pull request #8291 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.13.9 
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.8 to 8.13.9
 2023-04-06 08:47:43 +02:00
dependabot[bot] ba83e1bbd6
Bump fragment from 1.6.0-alpha08 to 1.6.0-alpha09 
Bumps `fragment` from 1.6.0-alpha08 to 1.6.0-alpha09.

Updates `androidx.fragment:fragment-ktx` from 1.6.0-alpha08 to 1.6.0-alpha09

Updates `androidx.fragment:fragment-testing` from 1.6.0-alpha08 to 1.6.0-alpha09

Updates `androidx.fragment:fragment-testing-manifest` from 1.6.0-alpha08 to 1.6.0-alpha09

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing-manifest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-05 23:57:37 +00:00
valere 17c41fca88 async backup throws now 2023-04-05 19:27:56 +02:00
Florian Renaud 867356f7cb
Merge pull request #8262 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.8.1 
Bump androidx.work:work-runtime-ktx from 2.8.0 to 2.8.1
 2023-04-05 18:02:51 +02:00
Florian Renaud 90160a9681
Merge pull request #8304 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.16.0 
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.14.0 to 0.16.0
 2023-04-05 18:01:58 +02:00
valere 1b57770955 put back retry rule, flackiness 2023-04-05 17:58:56 +02:00
Benoit Marty 673c59b3f8
Merge pull request #8310 from vector-im/feature/fga/fix_multiple_read_receipts 
Fix multiple read receipts for the same user in timeline #7882
 2023-04-05 17:56:11 +02:00
Benoit Marty ac65934454
Merge pull request #8298 from vector-im/sync-emojis 
Sync Emojis
 2023-04-05 17:55:38 +02:00
valere a5a95995e1 test flakiness 2023-04-05 16:37:36 +02:00
valere d023d9df7d fix sas test 2023-04-05 15:12:59 +02:00
SpiritCroc 5ea7f03e25 Fix FooteredTextView measurements for overlong pill spans 
Together with https://github.com/vector-im/element-android/pull/8260,
fixes https://github.com/SchildiChat/SchildiChat-android/issues/28

Change-Id: I3c11d1ec89383330fedb4a958d70e89047915024
 2023-04-05 15:03:28 +02:00
ganfra fe69d8e3fa Fix multiple read receipts for the same user in timeline #7882 2023-04-05 13:08:12 +02:00
valere b45b90dcdf Fix verification bottomsheet not updating 2023-04-05 12:12:40 +02:00
SpiritCroc ea2a0e2193 Automatic SchildiChat string correction 
Change-Id: Id3c60521d8640b6253bf8b4e788147b381357bcc
 2023-04-05 11:37:42 +02:00
SpiritCroc 6db0a52db4 Automatic upstream merge postprocessing 
Change-Id: I6864bdf70ee6c5039e10c742fdbb9947f5a79ebb
 2023-04-05 11:37:41 +02:00
SpiritCroc 965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
 2023-04-05 11:28:26 +02:00
SpiritCroc 4c771bde7f [TMP] Automatic upstream merge preparation 
Change-Id: Iaeede6c1ba4afc5f3481582fe52fd20bfb67421d
 2023-04-05 11:17:40 +02:00
SpiritCroc 877d65a8c8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ifbb9c4cdf4e4d86ee2b72b7c4ca4e5216aa0840c
 2023-04-05 11:17:40 +02:00
SpiritCroc 2756877d5b Revert "[TMP] Get widgets / stickers working again" 
This reverts commit c47b9ee64d.
 2023-04-05 11:15:39 +02:00
SpiritCroc 1e3b77824e Fix crash caused by empty span when removing leading newlines 
Change-Id: I9045bf1314b15d3672d1837bca29fa4af4c0fdbd
 2023-04-05 10:25:10 +02:00
SpiritCroc 16afd70294 tmp_icon.sh: Script to quickly try out new launcher icons 
People suggest new icons in png formats, and I'm tired of searching this
scripts, so let's push it to main

Change-Id: Ie3cb2f7f82383c60188ae8499ad64b61264435d8
 2023-04-05 10:19:32 +02:00
Jorge Martín c6e612c058 version++ 2023-04-05 10:18:30 +02:00
Jorge Martín 9e45a31d8f Merge branch 'release/1.5.30' into develop 2023-04-05 10:17:45 +02:00
Jorge Martín 0b09a51bb2 Merge branch 'release/1.5.30' 2023-04-05 10:17:33 +02:00
Jorge Martín 76cea42d4b Adding fastlane file for version 1.5.30 2023-04-05 09:40:08 +02:00
Jorge Martín b61a184297 Changelog for version 1.5.30 2023-04-05 09:38:41 +02:00
valere b704b64255 Fix backup tests 2023-04-05 09:15:07 +02:00
dependabot[bot] be80b46327
Bump flipper from 0.187.0 to 0.188.0 (#8303) 2023-04-04 15:38:11 +00:00
Yoan Pintas da5a3eaad8
Jump to unread marker instead of first unread message (#8305) 2023-04-04 12:50:49 +00:00
Benoit Marty 29777f50fa
Merge pull request #8256 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-04-04 14:19:48 +02:00
Vri 776e63476c Translated using Weblate (German) 
Currently translated at 100.0% (2610 of 2610 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2023-04-04 11:50:05 +02:00
Szimszon c966a94b93 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (95 of 95 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2023-04-04 11:50:05 +02:00
Jeff Huang 4ca560f80f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2610 of 2610 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-04-04 11:50:05 +02:00
Peter Chen 38832715ff Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2610 of 2610 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-04-04 11:50:05 +02:00
dependabot[bot] dcf0541fe0
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.14.0 to 0.16.0 
Bumps [com.gabrielittner.threetenbp:lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.14.0 to 0.16.0.
- [Release notes](https://github.com/gabrielittner/lazythreetenbp/releases)
- [Changelog](https://github.com/gabrielittner/lazythreetenbp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gabrielittner/lazythreetenbp/compare/0.14.0...0.16.0)

---
updated-dependencies:
- dependency-name: com.gabrielittner.threetenbp:lazythreetenbp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-04 00:02:23 +00:00
dependabot[bot] 8480c41c3d
Bump org.checkerframework:checker from 3.32.0 to 3.33.0 
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework) from 3.32.0 to 3.33.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.32.0...checker-framework-3.33.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-03 23:58:28 +00:00
Jorge Martin Espinosa 55033ea5b0
Merge pull request #8297 from vector-im/dependabot/gradle/io.sentry-sentry-android-6.17.0 
Bump io.sentry:sentry-android from 6.16.0 to 6.17.0
 2023-04-03 12:26:05 +02:00
Jorge Martín 2830459b6a Fix crash when re-enabling analytics. 2023-04-03 11:30:14 +02:00
bmarty acf92908cc Sync Emojis 2023-04-03 00:03:19 +00:00
SpiritCroc 76d1c81495 [TEST] Restructure RR deduplication logic and avoid threads 
We probably should add an extra check to only set main_or_null to events
which actually exist in the main thread

Change-Id: I8db0010e8717b6941917225fcce6646685814665
 2023-04-02 13:02:50 +02:00
SpiritCroc 5ef2341bec [TEST] Fix another case of wrong read receipt location, to be observed 
Context: https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/995

So comparing timestamps for main vs null read receipts does not seem to
work at all... so better only use that as fallback in case we really
don't know which event came later...?

Change-Id: I8f7df95735d1478784ec5f8bf3b0b1a70c534a29
 2023-04-02 12:38:25 +02:00
SpiritCroc f4e9559eca In threads, reply fallback shouldn't cause stickers to render as bubble 
Change-Id: I9539c77520e2d1563c3e782d649c2868e08ad81a
 2023-04-01 16:23:45 +02:00
SpiritCroc 5f787db4f1 Send-as-sticker button for sticker-enabled custom emotes 
Add some primitive support for sending MSC2545 stickers, at least for
stickers that also support sending as custom emote.
Also, this introduces support to sending stickers as reply this way 🎉

Change-Id: I85b245c2c40b9662342459e50285c081d37f324b
 2023-04-01 16:15:22 +02:00
SpiritCroc dab8f0b51c increment_version.sh: weblate now auto-pushes, no need to manage here 
Change-Id: I1d671cc682e02c9e8bc29634471ac18c2e41c112
 2023-04-01 11:23:33 +02:00
SpiritCroc c3077c1ff9 Increment version 
Change-Id: I62c495d2a018f29ad88afc6058972608273b357d
 2023-04-01 11:20:55 +02:00
SpiritCroc 1d0686d82d Properly ellipsize autocompletion headers 
For example for long emote/sticker pack names

Change-Id: I7f1bd44ad6b70dfdd25825b1156d40bcee2e3df8
 2023-04-01 11:11:57 +02:00