mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-29 06:28:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
24206 commits 6 branches 120 tags 229 MiB
Commit graph

24206 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
dependabot[bot]
95b30bb8e9
Bump io.sentry:sentry-android from 6.16.0 to 6.17.0 
Bumps [io.sentry:sentry-android](https://github.com/getsentry/sentry-java) from 6.16.0 to 6.17.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.16.0...6.17.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-31 23:58:28 +00:00
ganfra
c94ee5c6fe
Merge pull request #8295 from vector-im/feature/fga/acceptable_use_policy 
Replace Terms and Conditions with Acceptable Use Policy.
 2023-03-31 15:22:03 +02:00
ganfra
ac65defe56 Replace Terms and Conditions with Acceptable Use Policy. 2023-03-30 20:41:05 +02:00
Yoan Pintas
93cd197c78
Fix custom sticker url loading (#8290) 2023-03-30 09:34:42 +00:00
Yoan Pintas
ed121c051b
Add user completion for matrix ids (#8271) 2023-03-30 08:04:59 +00:00
dependabot[bot]
af4424f1c5
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.8 to 8.13.9 
Bumps [com.googlecode.libphonenumber:libphonenumber](https://github.com/google/libphonenumber) from 8.13.8 to 8.13.9.
- [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.13.8...v8.13.9)

---
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>
 2023-03-29 23:58:03 +00:00
Jorge Martin Espinosa
1227f048bb
Merge pull request #8288 from vector-im/dependabot/gradle/com.google.firebase-firebase-bom-31.4.0 
Bump com.google.firebase:firebase-bom from 31.3.0 to 31.4.0
 2023-03-29 12:40:21 +02:00
dependabot[bot]
35cf6cb9e0
Bump com.google.firebase:firebase-bom from 31.3.0 to 31.4.0 
Bumps com.google.firebase:firebase-bom from 31.3.0 to 31.4.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-28 23:57:22 +00:00
Yoan Pintas
ca6dd3a0a1
Bump vanniktechEmoji from 0.16.0-SNAPSHOT to 0.16.0 Release (#8281) 2023-03-28 18:20:17 +00:00
Benoit Marty
716bd9a2e6
Merge pull request #8272 from vector-im/dependabot/gradle/mavericks-3.0.2 
Bump mavericks from 3.0.1 to 3.0.2
 2023-03-27 15:22:58 +02:00
SpiritCroc
9b384c0971 Update to vanniktechEmoji 0.16.0 to fix compile 
Revert "Use vanniktechEmoji "0.16.0-SNAPSHOT""

This reverts commit a1f4ffbf17.

Change-Id: I66c1490349f26de0f8f7159f4d18027c487b2220
 2023-03-27 12:18:03 +02:00
SpiritCroc
cf7a93b5bb Tweak bug report screen for internal builds 
I always get confused by the missing switch, so just disable it instead
of hiding.

Change-Id: I894be7dd9d5e50e793960f16ee8b04df20effc41
 2023-03-27 11:54:30 +02:00
dependabot[bot]
e76225f7d1
Bump com.google.firebase:firebase-bom from 31.2.3 to 31.3.0 (#8277) 
Bumps com.google.firebase:firebase-bom from 31.2.3 to 31.3.0.

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-27 08:16:11 +00:00
SpiritCroc
236c44a5a5 Easier access to more custom emotes 
- Expand button
- More emotes by default

Change-Id: Id18f0b36099465d83156fcee2d3b016f299402f4
 2023-03-25 13:53:58 +01:00
SpiritCroc
1004bd19e3 [TEST] Don't set main_or_null read receipt to old events 
Context:
https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/951

If main RR updates after null RR, but to an older event than the null
RR, we still want to keep the null one.

Change-Id: Ib865965b6975536421b15146c863b9ea46f793b0
 2023-03-25 08:32:22 +01:00
dependabot[bot]
c3114abb05
Bump org.owasp:dependency-check-gradle from 8.1.2 to 8.2.1 (#8273) 
Bumps org.owasp:dependency-check-gradle from 8.1.2 to 8.2.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-24 09:25:58 +00:00
dependabot[bot]
483879c5ef
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.13.0 to 0.14.0 (#8275) 
Bumps [com.gabrielittner.threetenbp:lazythreetenbp](https://github.com/gabrielittner/lazythreetenbp) from 0.13.0 to 0.14.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.13.0...0.14.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-24 09:28:28 +01:00
dependabot[bot]
7d8e31d34d
Bump mavericks from 3.0.1 to 3.0.2 
Bumps `mavericks` from 3.0.1 to 3.0.2.

Updates `com.airbnb.android:mavericks` from 3.0.1 to 3.0.2
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/v3.0.1...v3.0.2)

Updates `com.airbnb.android:mavericks-testing` from 3.0.1 to 3.0.2
- [Release notes](https://github.com/airbnb/mavericks/releases)
- [Changelog](https://github.com/airbnb/mavericks/blob/main/CHANGELOG.md)
- [Commits](https://github.com/airbnb/mavericks/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: com.airbnb.android:mavericks
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.airbnb.android:mavericks-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-23 23:57:54 +00:00
dependabot[bot]
c3f1bc7fca
Bump androidx.activity:activity-ktx from 1.6.1 to 1.7.0 (#8264) 2023-03-23 14:22:14 +00:00