Commit graph

24206 commits

Author SHA1 Message Date
SpiritCroc
eeb4b8dc0d Switch to height 32 for sent custom emotes, as suggested by MSC2545
Change-Id: If59aed6fe9b6af1acfe69db0a89d073558279882
2023-04-27 10:48:13 +02:00
SpiritCroc
aa34c108b5 Labs: setting to clear highlighted message on scroll
Change-Id: If07012f29159bb10cbd90f410955b49684891945
2023-04-25 14:15:47 +02:00
SpiritCroc
0cc0a191bc Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc
Change-Id: I07acecb8587ee3bdf6b2eef1e130ffd578739416

Conflicts:
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
	vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/xml/vector_settings_voice_video.xml
2023-04-24 12:02:18 +02:00
SpiritCroc
2c823f6d82 [gplay-release] Fix typo in changelog
Change-Id: I22633a6ca24d337a66169bd52c0549348ed8906f
2023-04-23 11:46:10 +02:00
SpiritCroc
7e7110d8ca Increment version
Change-Id: I0e71f58242dcba7cb534049ad8a2147699c00c75
2023-04-23 11:03:51 +02:00
SpiritCroc
41c6fe5cb4 FEATURES.md: UnifiedPush has been included upstream for a while
Change-Id: Ib2ceabb38613925d1a99e33999657dd82e6764b5
2023-04-23 10:59:16 +02:00
SpiritCroc
9435780036 Fix long freeform reactions moving out sender from reaction info
Change-Id: Ic41b17546f6f0f52a6dfdb800788560788ec1d37
2023-04-23 10:59:16 +02:00
erebion
5a3b3e000e Translated using Weblate (Swedish)
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/sv/
2023-04-23 06:01:29 +00:00
misibacsi
f3e158a068 Translated using Weblate (Hungarian)
Currently translated at 54.3% (94 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/hu/
2023-04-23 06:01:29 +00:00
erebion
db34b97d0d Translated using Weblate (Norwegian Bokmål)
Currently translated at 72.2% (125 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/nb_NO/
2023-04-23 06:01:29 +00:00
misibacsi
8885f400f0 Translated using Weblate (Hungarian)
Currently translated at 28.3% (49 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/hu/
2023-04-21 09:01:31 +00:00
SpiritCroc
b88a41aaa8 Fix (upstream) crash for protected access settings
java.lang.IllegalStateException: Can't access the Fragment View's LifecycleOwner when getView() is null i.e., before onCreateView() or after onDestroyView()
	at androidx.fragment.app.Fragment.getViewLifecycleOwner(Fragment.java:10)
	at im.vector.app.features.settings.VectorSettingsPinFragment.refreshPinCodeStatus(VectorSettingsPinFragment.kt:1)
	at im.vector.app.features.settings.VectorSettingsPinFragment.bindPref(VectorSettingsPinFragment.kt:1)
	at im.vector.app.features.settings.VectorSettingsBaseFragment.onCreatePreferences(VectorSettingsBaseFragment.kt:8)
	at androidx.preference.PreferenceFragmentCompat.onCreate(PreferenceFragmentCompat.java:74)
	at androidx.fragment.app.Fragment.performCreate(Fragment.java:22)
	at androidx.fragment.app.FragmentStateManager.create(FragmentStateManager.java:52)
	at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:149)
	at androidx.fragment.app.FragmentManager.executeOpsTogether(FragmentManager.java:1135)
	at androidx.fragment.app.FragmentManager.removeRedundantOperationsAndExecute(FragmentManager.java:82)
	at androidx.fragment.app.FragmentManager.execPendingActions(FragmentManager.java:74)
	at androidx.fragment.app.FragmentManager$5.run(FragmentManager.java:4)
	at android.os.Handler.handleCallback(Handler.java:938)
	at android.os.Handler.dispatchMessage(Handler.java:99)
	at android.os.Looper.loop(Looper.java:236)
	at android.app.ActivityThread.main(ActivityThread.java:7876)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:656)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:967)

Change-Id: Iac3e08d95338417f69ee71ce0b185b825b9b0333
2023-04-20 11:19:12 +02:00
SpiritCroc
53ac5c7114 Automatic SchildiChat string correction
Change-Id: I8cd3a3f7bffb83728507be393cf344d2255e5ea6
2023-04-20 11:05:08 +02:00
SpiritCroc
dba3100fad Automatic upstream merge postprocessing
Change-Id: Ic7ffd668b4cfb1d235fe33832a4120140d2172e3
2023-04-20 11:05:06 +02:00
SpiritCroc
acdf419768 Merge tag 'v1.5.32' into sc
Note: mainly conflicts in differing implementations to fix duplicate
read receipts.

After a quick glance at the upstream implementation, my first impression
is that we likely want to keep our downstream implementation:
- Better performance by checking for the more recent receipt in the SDK
  upon receipt receival, instead on rendering the timeline
- null seems to always map to main, which caused us jumping receipts in
  the past, which we have addressed by now

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt

Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de
2023-04-20 10:53:09 +02:00
SpiritCroc
d1fd7c9b99 [TMP] Automatic upstream merge preparation
Change-Id: Iebe105d1fcaf151ee431f68fde653ecf5c32ba1f
2023-04-20 10:39:16 +02:00
SpiritCroc
f48f34aaff Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ibb06cba68e52b3667da93522adf8a734d57f8c23
2023-04-20 10:39:16 +02:00
SpiritCroc
799279eb5d Do not ellipsize message previews due to trailing newline
Change-Id: I8e6a43f6599e209f40e676a8bdb1754fb6a6e93e
2023-04-19 17:09:45 +02:00
ganfra
8dcb5f7098 Merge branch 'release/1.5.32' into main 2023-04-19 16:25:54 +02:00
ganfra
ca849e40a4 Adding fastlane file for version 1.5.32 2023-04-19 16:17:31 +02:00
ganfra
0143cf7ea8 Changelog for version 1.5.32 2023-04-19 16:15:35 +02:00
dependabot[bot]
40bbd3ebd1
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.9 to 8.13.10 (#8338)
Bumps [com.googlecode.libphonenumber:libphonenumber](https://github.com/google/libphonenumber) from 8.13.9 to 8.13.10.
- [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.9...v8.13.10)

---
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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-18 10:15:36 +00:00
Jorge Martin Espinosa
09e4b4b7ec
Merge pull request #8337 from vector-im/dependabot/github_actions/danger/danger-js-11.2.6
Bump danger/danger-js from 11.2.4 to 11.2.6
2023-04-18 08:47:46 +02:00
dependabot[bot]
2b582d3a48
Bump danger/danger-js from 11.2.4 to 11.2.6
Bumps [danger/danger-js](https://github.com/danger/danger-js) from 11.2.4 to 11.2.6.
- [Release notes](https://github.com/danger/danger-js/releases)
- [Changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/danger/danger-js/compare/11.2.4...11.2.6)

---
updated-dependencies:
- dependency-name: danger/danger-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-17 23:56:47 +00:00
SpiritCroc
423f841a2a Increment version
Change-Id: I2a76553af45c7056f04cc1cfa0909ab86c4f147a
2023-04-15 17:02:00 +02:00
SpiritCroc
f16a7edf51 Sticker room summary preview: prefer sticker body like on desktop
Change-Id: If3dda509b1acddccf44b3e3267f098de3ee35611
2023-04-15 10:42:04 +02:00
Yoan Pintas
110b5cfcb4
Add pills for permalink supported hosts (#8324) 2023-04-12 12:35:01 +00:00
Yoan Pintas
fb837fed5a
Keep screen on while recording voicebroadcast (#8313) 2023-04-12 13:55:20 +02:00
Yoan Pintas
99aa9493d6
Update read marker when we go back in live (#8306) 2023-04-12 07:18:02 +00:00
SpiritCroc
9e0ec534d5 [merge] More appropriate pill size for downstream text size
https://developer.android.com/reference/com/google/android/material/chip/ChipDrawable

Change-Id: Ib21bb1426547c8a49f55e2ecd836f83d9dfe1654
2023-04-11 17:27:21 +02:00
dependabot[bot]
7f42eb3fb6
Bump peter-evans/create-pull-request from 4 to 5 (#8322) 2023-04-11 10:07:31 +00:00
Jorge Martin Espinosa
64508cd2d9
Merge pull request #8311 from vector-im/dependabot/gradle/fragment-1.6.0-alpha09
Bump fragment from 1.6.0-alpha08 to 1.6.0-alpha09
2023-04-10 09:09:00 +02:00
SpiritCroc
89750f74a4 Ensure unique IDs across all emoji autocompletion types
Change-Id: I522eaf4fb8af214ff9b6a0ac744093cbe6b8b6e4
2023-04-07 12:40:46 +02:00
SpiritCroc
cb593ebb14 Move standard emojis to top of autocompletion
Now that we can limit emojis per category while allowing to expand them,
makes sense to show standard emojis on top, above custom emotes,
especially when users have lots of emotes.

Change-Id: I822cc091bf595795fa08fef32f0737073a43163a
2023-04-07 12:38:10 +02:00
Benoit Marty
e5657a6f23
Merge pull request #8315 from vector-im/dependabot/gradle/flipper-0.189.0
Bump flipper from 0.188.0 to 0.189.0
2023-04-07 11:19:10 +02:00
SpiritCroc
07a0d315f5 Merge remote-tracking branch 'origin/sc_beta' into sc
Change-Id: I61bf897abe30e5763047852bdc4128f6df3a1660
2023-04-07 11:09:14 +02:00
dependabot[bot]
0ec7e7dc34
Bump flipper from 0.188.0 to 0.189.0
Bumps `flipper` from 0.188.0 to 0.189.0.

Updates `com.facebook.flipper:flipper` from 0.188.0 to 0.189.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.188.0...v0.189.0)

Updates `com.facebook.flipper:flipper-network-plugin` from 0.188.0 to 0.189.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.188.0...v0.189.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-07 00:09:19 +00:00
Linerly
ec54ab3d43 Translated using Weblate (Indonesian)
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
2023-04-06 17:01:29 +00:00
waclaw66
456a54e192 Translated using Weblate (Czech)
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
2023-04-06 17:01:28 +00:00
dependabot[bot]
eef5ef7d2d
Bump androidx.core:core-ktx from 1.9.0 to 1.10.0 (#8312)
Bumps androidx.core:core-ktx from 1.9.0 to 1.10.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  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-04-06 09:50:00 +00: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
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
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
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
SpiritCroc
ea2a0e2193 Automatic SchildiChat string correction
Change-Id: Id3c60521d8640b6253bf8b4e788147b381357bcc
2023-04-05 11:37:42 +02:00