mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 01:20:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
24860 commits 7 branches 124 tags 230 MiB
Commit graph

24860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valere
d4d9a1068a
Merge pull request #7628 from vector-im/feature/bca/rust_flavor 
Merging Element R in Element Android as a new flavor
 2023-04-20 14:13:06 +02: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
valere
8e6db1714b Clean and update doc 2023-04-20 09:53:48 +02:00
valere
b2c7f05a10 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-20 09:51:17 +02:00
dependabot[bot]
681eab7425
Bump fragment from 1.6.0-alpha09 to 1.6.0-beta01 
Bumps `fragment` from 1.6.0-alpha09 to 1.6.0-beta01.

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

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

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

---
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-19 23:57:12 +00:00
SpiritCroc
799279eb5d Do not ellipsize message previews due to trailing newline 
Change-Id: I8e6a43f6599e209f40e676a8bdb1754fb6a6e93e
 2023-04-19 17:09:45 +02:00
ganfra
83296727a2 version++ 2023-04-19 16:26:20 +02:00
ganfra
0dc70a5d75 Merge tag '1.5.32' into develop 
no message
 2023-04-19 16:25:55 +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
valere
425cbc9e68 quick doc on flavors and migration 2023-04-17 11:48:28 +02: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
valere
4d9596b56e do not launch in constructor 2023-04-14 16:48:24 +02:00
valere
ca8dc37012 fix scope usage 2023-04-14 15:45:33 +02:00
valere
0e503503d2 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-13 15:49:20 +02:00
Tulir Asokan
e27464d37d Add changelog file 2023-04-12 21:47:07 +03:00
Tulir Asokan
df9579d7d2 Sync Emojis 2023-04-12 21:44:03 +03:00
Tulir Asokan
91ed82749c Add variation selector 16 to all applicable emojis in import script 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2023-04-12 21:43:54 +03: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
networkException
7fff7a453d
Enable free style cropping for camera and gallery images 
This feature was disabled in 3ac2296464.

Resolves #2356

Signed-off-by: networkException <git@nwex.de>
 2023-04-11 22:47:04 +02: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
valere
26a640846e Merge branch 'develop' into feature/bca/rust_flavor 2023-04-11 10:26:36 +02: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
valere
70508544cd fix warning equals but no hashcode 2023-04-07 14:09:56 +02:00
valere
4ecbf87cda unused flow 2023-04-07 14:09:25 +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
valere
1b12db9270 Test framework cleaning 2023-04-07 11:34:27 +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
valere
89267256ef Fix use if internal API 2023-04-06 16:55:45 +02:00
valere
e554ecc030 fix flackiness source 2023-04-06 13:39:38 +02: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
valere
ee1580c50e Fix failing test 2023-04-06 09:59:00 +02:00