mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-28 14:08:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/bca/clean_up_legacy_crypto

Browse source
This commit is contained in:
Valere 2023-10-10 13:00:45 +02:00
commit 25ecd599f3
19 changed files with 381 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CHANGES.md
View file

@ -1,3 +1,21 @@
Changes in Element v1.6.6 (2023-10-05)
======================================
Bugfixes 🐛
----------
- Fixed JWT token for Jitsi openidtoken-jwt authentication ([#7758](https://github.com/vector-im/element-android/issues/7758))
- Fix crash when max shortcuts count is exceeded ([#8644](https://github.com/vector-im/element-android/issues/8644))
- Fix Login with QR code not working with rust crypto. ([#8653](https://github.com/vector-im/element-android/issues/8653))
Other changes
-------------
- Use 3PID capability to show / hide email UI in settings ([#8615](https://github.com/vector-im/element-android/issues/8615))
- If an external account manager is configured on the server, use it to delete other sessions and hide the multi session deletion. ([#8616](https://github.com/vector-im/element-android/issues/8616))
- Hide account deactivation UI for account managed externally. ([#8619](https://github.com/vector-im/element-android/issues/8619))
- Fix import of SAS Emoji string translations. ([#8623](https://github.com/vector-im/element-android/issues/8623))
- Open external account manager for delete other sessions using Chrome custom tabs. ([#8645](https://github.com/vector-im/element-android/issues/8645))
Changes in Element v1.6.5 (2023-07-25) Changes in Element v1.6.5 (2023-07-25)
====================================== ======================================

1
changelog.d/7758.bugfix
View file

@ -1 +0,0 @@
Fixed JWT token for Jitsi openidtoken-jwt authentication

1
changelog.d/8178.bugfix Normal file
View file

@ -0,0 +1 @@
Ensure the incoming call will not ring forever, in case the call is not ended by another way.

1
changelog.d/8615.misc
View file

@ -1 +0,0 @@
Use 3PID capability to show / hide email UI in settings

1
changelog.d/8616.misc
View file

@ -1 +0,0 @@
If an external account manager is configured on the server, use it to delete other sessions and hide the multi session deletion.

1
changelog.d/8619.misc
View file

@ -1 +0,0 @@
Hide account deactivation UI for account managed externally.

1
changelog.d/8623.misc
View file

@ -1 +0,0 @@
Fix import of SAS Emoji string translations.

1
changelog.d/8644.bugfix
View file

@ -1 +0,0 @@
Fix crash when max shortcuts count is exceeded

1
changelog.d/8645.misc
View file

@ -1 +0,0 @@
Open external account manager for delete other sessions using Chrome custom tabs.

1
changelog.d/8653.bugfix
View file

@ -1 +0,0 @@
Fix Login with QR code not working with rust crypto.

2
fastlane/metadata/android/en-US/changelogs/40106060.txt Normal file
View file

@ -0,0 +1,2 @@
Main changes in this version: mainly bug fixes.
Full changelog: https://github.com/vector-im/element-android/releases

2
matrix-sdk-android/build.gradle
View file

@ -62,7 +62,7 @@ android {
// that the app's state is completely cleared between tests. // that the app's state is completely cleared between tests.
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
buildConfigField "String", "SDK_VERSION", "\"1.6.6\"" buildConfigField "String", "SDK_VERSION", "\"1.6.8\""
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\"" buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
View file

@ -28,6 +28,7 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.JUnit4 import org.junit.runners.JUnit4
import org.junit.runners.MethodSorters import org.junit.runners.MethodSorters
import org.matrix.android.sdk.BuildConfig
import org.matrix.android.sdk.InstrumentedTest import org.matrix.android.sdk.InstrumentedTest
import org.matrix.android.sdk.api.query.QueryStringValue import org.matrix.android.sdk.api.query.QueryStringValue
import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.Session
@ -196,6 +197,7 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
@Test @Test
fun testNeedsRotationFromSharedToWorldReadable() { fun testNeedsRotationFromSharedToWorldReadable() {
Assume.assumeTrue("Test is flacky on legacy crypto", BuildConfig.FLAVOR == "rustCrypto")
testRotationDueToVisibilityChange(RoomHistoryVisibility.SHARED, RoomHistoryVisibilityContent("world_readable")) testRotationDueToVisibilityChange(RoomHistoryVisibility.SHARED, RoomHistoryVisibilityContent("world_readable"))
} }

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
View file

@ -218,8 +218,8 @@ class Rendezvous(
Timber.tag(TAG).i("No master key given by verifying device") Timber.tag(TAG).i("No master key given by verifying device")
} }
// request secrets from the verifying device // request secrets from other sessions.
Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId") Timber.tag(TAG).i("Requesting secrets from other sessions")
session.sharedSecretStorageService().requestMissingSecrets() session.sharedSecretStorageService().requestMissingSecrets()
} else { } else {

10
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SecretShareManager.kt
View file

@ -28,13 +28,9 @@ internal class SecretShareManager @Inject constructor(
private val outgoingRequestsProcessor: OutgoingRequestsProcessor) { private val outgoingRequestsProcessor: OutgoingRequestsProcessor) {
suspend fun requestSecretTo(deviceId: String, secretName: String) { suspend fun requestSecretTo(deviceId: String, secretName: String) {
Timber.v("SecretShareManager requesting $deviceId, $secretName") Timber.w("SecretShareManager requesting custom secrets not supported $deviceId, $secretName")
if (this.olmMachine.get().requestMissingSecretsFromOtherSessions()) { // rust stack only support requesting secrets defined in the spec (not custom secret yet)
// immediately send the requests requestMissingSecrets()
outgoingRequestsProcessor.processOutgoingRequests(this.olmMachine.get()) {
it is Request.ToDevice && it.eventType == EventType.REQUEST_SECRET
}
}
} }
suspend fun requestMissingSecrets() { suspend fun requestMissingSecrets() {

411
tools/emojis/emoji_picker_datasource_formatted.json
View file

@ -55,6 +55,8 @@
"face-exhaling", "face-exhaling",
"lying-face", "lying-face",
"shaking-face", "shaking-face",
"head-shaking-horizontally",
"head-shaking-vertically",
"relieved-face", "relieved-face",
"pensive-face", "pensive-face",
"sleepy-face", "sleepy-face",
@ -419,24 +421,42 @@
"person-walking", "person-walking",
"man-walking", "man-walking",
"woman-walking", "woman-walking",
"person-walking-facing-right",
"woman-walking-facing-right",
"man-walking-facing-right",
"person-standing", "person-standing",
"man-standing", "man-standing",
"woman-standing", "woman-standing",
"person-kneeling", "person-kneeling",
"man-kneeling", "man-kneeling",
"woman-kneeling", "woman-kneeling",
"person-kneeling-facing-right",
"woman-kneeling-facing-right",
"man-kneeling-facing-right",
"person-with-white-cane", "person-with-white-cane",
"person-with-white-cane-facing-right",
"man-with-white-cane", "man-with-white-cane",
"man-with-white-cane-facing-right",
"woman-with-white-cane", "woman-with-white-cane",
"woman-with-white-cane-facing-right",
"person-in-motorized-wheelchair", "person-in-motorized-wheelchair",
"person-in-motorized-wheelchair-facing-right",
"man-in-motorized-wheelchair", "man-in-motorized-wheelchair",
"man-in-motorized-wheelchair-facing-right",
"woman-in-motorized-wheelchair", "woman-in-motorized-wheelchair",
"woman-in-motorized-wheelchair-facing-right",
"person-in-manual-wheelchair", "person-in-manual-wheelchair",
"person-in-manual-wheelchair-facing-right",
"man-in-manual-wheelchair", "man-in-manual-wheelchair",
"man-in-manual-wheelchair-facing-right",
"woman-in-manual-wheelchair", "woman-in-manual-wheelchair",
"woman-in-manual-wheelchair-facing-right",
"person-running", "person-running",
"man-running", "man-running",
"woman-running", "woman-running",
"person-running-facing-right",
"woman-running-facing-right",
"man-running-facing-right",
"woman-dancing", "woman-dancing",
"man-dancing", "man-dancing",
"person-in-suit-levitating", "person-in-suit-levitating",
@ -509,7 +529,6 @@
"couple-with-heart-woman-man", "couple-with-heart-woman-man",
"couple-with-heart-man-man", "couple-with-heart-man-man",
"couple-with-heart-woman-woman", "couple-with-heart-woman-woman",
"family",
"family-man-woman-boy", "family-man-woman-boy",
"family-man-woman-girl", "family-man-woman-girl",
"family-man-woman-girl-boy", "family-man-woman-girl-boy",
@ -539,6 +558,11 @@
"bust-in-silhouette", "bust-in-silhouette",
"busts-in-silhouette", "busts-in-silhouette",
"people-hugging", "people-hugging",
"family",
"family-adult-adult-child",
"family-adult-adult-child-child",
"family-adult-child",
"family-adult-child-child",
"footprints" "footprints"
] ]
}, },
@ -633,6 +657,7 @@
"wing", "wing",
"black-bird", "black-bird",
"goose", "goose",
"phoenix",
"frog", "frog",
"crocodile", "crocodile",
"turtle", "turtle",
@ -709,6 +734,7 @@
"watermelon", "watermelon",
"tangerine", "tangerine",
"lemon", "lemon",
"lime",
"banana", "banana",
"pineapple", "pineapple",
"mango", "mango",
@ -740,6 +766,7 @@
"chestnut", "chestnut",
"ginger-root", "ginger-root",
"pea-pod", "pea-pod",
"brown-mushroom",
"bread", "bread",
"croissant", "croissant",
"baguette-bread", "baguette-bread",
@ -1366,6 +1393,7 @@
"balance-scale", "balance-scale",
"white-cane", "white-cane",
"link", "link",
"broken-chain",
"chains", "chains",
"hook", "hook",
"toolbox", "toolbox",
@ -1893,7 +1921,7 @@
"flag-turkmenistan", "flag-turkmenistan",
"flag-tunisia", "flag-tunisia",
"flag-tonga", "flag-tonga",
"flag-turkey", "flag-trkiye",
"flag-trinidad--tobago", "flag-trinidad--tobago",
"flag-tuvalu", "flag-tuvalu",
"flag-taiwan", "flag-taiwan",
@ -2432,6 +2460,7 @@
"j": [ "j": [
"face", "face",
"mouth", "mouth",
"zip",
"zipper", "zipper",
"zipper-mouth face", "zipper-mouth face",
"zipper_mouth_face", "zipper_mouth_face",
@ -2450,7 +2479,8 @@
"mild surprise", "mild surprise",
"scepticism", "scepticism",
"face", "face",
"surprise" "surprise",
"suspicious"
] ]
}, },
"neutral-face": { "neutral-face": {
@ -2486,8 +2516,7 @@
"face", "face",
"mouth", "mouth",
"quiet", "quiet",
"silent", "silent"
"hellokitty"
] ]
}, },
"dotted-line-face": { "dotted-line-face": {
@ -2544,6 +2573,7 @@
"unimpressed", "unimpressed",
"skeptical", "skeptical",
"dubious", "dubious",
"ugh",
"side_eye" "side_eye"
] ]
}, },
@ -2592,7 +2622,7 @@
] ]
}, },
"shaking-face": { "shaking-face": {
"a": "⊛ Shaking Face", "a": "Shaking Face",
"b": "1FAE8", "b": "1FAE8",
"j": [ "j": [
"earthquake", "earthquake",
@ -2604,6 +2634,24 @@
"blurry" "blurry"
] ]
}, },
"head-shaking-horizontally": {
"a": "⊛ Head Shaking Horizontally",
"b": "1F642-200D-2194-FE0F",
"j": [
"head shaking horizontally",
"no",
"shake"
]
},
"head-shaking-vertically": {
"a": "⊛ Head Shaking Vertically",
"b": "1F642-200D-2195-FE0F",
"j": [
"head shaking vertically",
"nod",
"yes"
]
},
"relieved-face": { "relieved-face": {
"a": "Relieved Face", "a": "Relieved Face",
"b": "1F60C", "b": "1F60C",
@ -3117,6 +3165,7 @@
"sad", "sad",
"sob", "sob",
"tear", "tear",
"sobbing",
"tears", "tears",
"upset", "upset",
"depressed" "depressed"
@ -3795,7 +3844,7 @@
] ]
}, },
"pink-heart": { "pink-heart": {
"a": "⊛ Pink Heart", "a": "Pink Heart",
"b": "1FA77", "b": "1FA77",
"j": [ "j": [
"cute", "cute",
@ -3851,7 +3900,7 @@
] ]
}, },
"light-blue-heart": { "light-blue-heart": {
"a": "⊛ Light Blue Heart", "a": "Light Blue Heart",
"b": "1FA75", "b": "1FA75",
"j": [ "j": [
"cyan", "cyan",
@ -3892,7 +3941,7 @@
] ]
}, },
"grey-heart": { "grey-heart": {
"a": "⊛ Grey Heart", "a": "Grey Heart",
"b": "1FA76", "b": "1FA76",
"j": [ "j": [
"gray", "gray",
@ -4197,7 +4246,7 @@
] ]
}, },
"leftwards-pushing-hand": { "leftwards-pushing-hand": {
"a": "⊛ Leftwards Pushing Hand", "a": "Leftwards Pushing Hand",
"b": "1FAF7", "b": "1FAF7",
"j": [ "j": [
"high five", "high five",
@ -4211,7 +4260,7 @@
] ]
}, },
"rightwards-pushing-hand": { "rightwards-pushing-hand": {
"a": "⊛ Rightwards Pushing Hand", "a": "Rightwards Pushing Hand",
"b": "1FAF8", "b": "1FAF8",
"j": [ "j": [
"high five", "high five",
@ -4611,9 +4660,11 @@
"manicure", "manicure",
"nail", "nail",
"polish", "polish",
"nail_care",
"beauty", "beauty",
"finger", "finger",
"fashion" "fashion",
"slay"
] ]
}, },
"selfie": { "selfie": {
@ -5561,6 +5612,7 @@
"b": "1F9D1-200D-1F3EB", "b": "1F9D1-200D-1F3EB",
"j": [ "j": [
"instructor", "instructor",
"lecturer",
"professor" "professor"
] ]
}, },
@ -5569,6 +5621,7 @@
"b": "1F468-200D-1F3EB", "b": "1F468-200D-1F3EB",
"j": [ "j": [
"instructor", "instructor",
"lecturer",
"man", "man",
"professor", "professor",
"teacher", "teacher",
@ -5580,6 +5633,7 @@
"b": "1F469-200D-1F3EB", "b": "1F469-200D-1F3EB",
"j": [ "j": [
"instructor", "instructor",
"lecturer",
"professor", "professor",
"teacher", "teacher",
"woman", "woman",
@ -5591,8 +5645,8 @@
"b": "1F9D1-200D-2696-FE0F", "b": "1F9D1-200D-2696-FE0F",
"j": [ "j": [
"justice", "justice",
"scales", "law",
"law" "scales"
] ]
}, },
"man-judge": { "man-judge": {
@ -5601,6 +5655,7 @@
"j": [ "j": [
"judge", "judge",
"justice", "justice",
"law",
"man", "man",
"scales", "scales",
"court", "court",
@ -5613,6 +5668,7 @@
"j": [ "j": [
"judge", "judge",
"justice", "justice",
"law",
"scales", "scales",
"woman", "woman",
"court", "court",
@ -6006,8 +6062,8 @@
"a": "Firefighter", "a": "Firefighter",
"b": "1F9D1-200D-1F692", "b": "1F9D1-200D-1F692",
"j": [ "j": [
"firetruck", "fire",
"fire" "firetruck"
] ]
}, },
"man-firefighter": { "man-firefighter": {
@ -6482,8 +6538,8 @@
"a": "Mx Claus", "a": "Mx Claus",
"b": "1F9D1-200D-1F384", "b": "1F9D1-200D-1F384",
"j": [ "j": [
"Claus, christmas", "christmas",
"christmas" "claus"
] ]
}, },
"superhero": { "superhero": {
@ -6881,6 +6937,27 @@
"female" "female"
] ]
}, },
"person-walking-facing-right": {
"a": "⊛ Person Walking Facing Right",
"b": "1F6B6-200D-27A1-FE0F",
"j": [
""
]
},
"woman-walking-facing-right": {
"a": "⊛ Woman Walking Facing Right",
"b": "1F6B6-200D-2640-FE0F-200D-27A1-FE0F",
"j": [
""
]
},
"man-walking-facing-right": {
"a": "⊛ Man Walking Facing Right",
"b": "1F6B6-200D-2642-FE0F-200D-27A1-FE0F",
"j": [
""
]
},
"person-standing": { "person-standing": {
"a": "Person Standing", "a": "Person Standing",
"b": "1F9CD", "b": "1F9CD",
@ -6938,6 +7015,27 @@
"pray" "pray"
] ]
}, },
"person-kneeling-facing-right": {
"a": "⊛ Person Kneeling Facing Right",
"b": "1F9CE-200D-27A1-FE0F",
"j": [
""
]
},
"woman-kneeling-facing-right": {
"a": "⊛ Woman Kneeling Facing Right",
"b": "1F9CE-200D-2640-FE0F-200D-27A1-FE0F",
"j": [
""
]
},
"man-kneeling-facing-right": {
"a": "⊛ Man Kneeling Facing Right",
"b": "1F9CE-200D-2642-FE0F-200D-27A1-FE0F",
"j": [
""
]
},
"person-with-white-cane": { "person-with-white-cane": {
"a": "Person with White Cane", "a": "Person with White Cane",
"b": "1F9D1-200D-1F9AF", "b": "1F9D1-200D-1F9AF",
@ -6947,6 +7045,13 @@
"person_with_probing_cane" "person_with_probing_cane"
] ]
}, },
"person-with-white-cane-facing-right": {
"a": "⊛ Person with White Cane Facing Right",
"b": "1F9D1-200D-1F9AF-200D-27A1-FE0F",
"j": [
""
]
},
"man-with-white-cane": { "man-with-white-cane": {
"a": "Man with White Cane", "a": "Man with White Cane",
"b": "1F468-200D-1F9AF", "b": "1F468-200D-1F9AF",
@ -6957,6 +7062,13 @@
"man_with_probing_cane" "man_with_probing_cane"
] ]
}, },
"man-with-white-cane-facing-right": {
"a": "⊛ Man with White Cane Facing Right",
"b": "1F468-200D-1F9AF-200D-27A1-FE0F",
"j": [
""
]
},
"woman-with-white-cane": { "woman-with-white-cane": {
"a": "Woman with White Cane", "a": "Woman with White Cane",
"b": "1F469-200D-1F9AF", "b": "1F469-200D-1F9AF",
@ -6967,6 +7079,13 @@
"woman_with_probing_cane" "woman_with_probing_cane"
] ]
}, },
"woman-with-white-cane-facing-right": {
"a": "⊛ Woman with White Cane Facing Right",
"b": "1F469-200D-1F9AF-200D-27A1-FE0F",
"j": [
""
]
},
"person-in-motorized-wheelchair": { "person-in-motorized-wheelchair": {
"a": "Person in Motorized Wheelchair", "a": "Person in Motorized Wheelchair",
"b": "1F9D1-200D-1F9BC", "b": "1F9D1-200D-1F9BC",
@ -6976,6 +7095,13 @@
"disability" "disability"
] ]
}, },
"person-in-motorized-wheelchair-facing-right": {
"a": "⊛ Person in Motorized Wheelchair Facing Right",
"b": "1F9D1-200D-1F9BC-200D-27A1-FE0F",
"j": [
""
]
},
"man-in-motorized-wheelchair": { "man-in-motorized-wheelchair": {
"a": "Man in Motorized Wheelchair", "a": "Man in Motorized Wheelchair",
"b": "1F468-200D-1F9BC", "b": "1F468-200D-1F9BC",
@ -6986,6 +7112,13 @@
"disability" "disability"
] ]
}, },
"man-in-motorized-wheelchair-facing-right": {
"a": "⊛ Man in Motorized Wheelchair Facing Right",
"b": "1F468-200D-1F9BC-200D-27A1-FE0F",
"j": [
""
]
},
"woman-in-motorized-wheelchair": { "woman-in-motorized-wheelchair": {
"a": "Woman in Motorized Wheelchair", "a": "Woman in Motorized Wheelchair",
"b": "1F469-200D-1F9BC", "b": "1F469-200D-1F9BC",
@ -6996,6 +7129,13 @@
"disability" "disability"
] ]
}, },
"woman-in-motorized-wheelchair-facing-right": {
"a": "⊛ Woman in Motorized Wheelchair Facing Right",
"b": "1F469-200D-1F9BC-200D-27A1-FE0F",
"j": [
""
]
},
"person-in-manual-wheelchair": { "person-in-manual-wheelchair": {
"a": "Person in Manual Wheelchair", "a": "Person in Manual Wheelchair",
"b": "1F9D1-200D-1F9BD", "b": "1F9D1-200D-1F9BD",
@ -7005,6 +7145,13 @@
"disability" "disability"
] ]
}, },
"person-in-manual-wheelchair-facing-right": {
"a": "⊛ Person in Manual Wheelchair Facing Right",
"b": "1F9D1-200D-1F9BD-200D-27A1-FE0F",
"j": [
""
]
},
"man-in-manual-wheelchair": { "man-in-manual-wheelchair": {
"a": "Man in Manual Wheelchair", "a": "Man in Manual Wheelchair",
"b": "1F468-200D-1F9BD", "b": "1F468-200D-1F9BD",
@ -7015,6 +7162,13 @@
"disability" "disability"
] ]
}, },
"man-in-manual-wheelchair-facing-right": {
"a": "⊛ Man in Manual Wheelchair Facing Right",
"b": "1F468-200D-1F9BD-200D-27A1-FE0F",
"j": [
""
]
},
"woman-in-manual-wheelchair": { "woman-in-manual-wheelchair": {
"a": "Woman in Manual Wheelchair", "a": "Woman in Manual Wheelchair",
"b": "1F469-200D-1F9BD", "b": "1F469-200D-1F9BD",
@ -7025,6 +7179,13 @@
"disability" "disability"
] ]
}, },
"woman-in-manual-wheelchair-facing-right": {
"a": "⊛ Woman in Manual Wheelchair Facing Right",
"b": "1F469-200D-1F9BD-200D-27A1-FE0F",
"j": [
""
]
},
"person-running": { "person-running": {
"a": "Person Running", "a": "Person Running",
"b": "1F3C3", "b": "1F3C3",
@ -7061,6 +7222,27 @@
"female" "female"
] ]
}, },
"person-running-facing-right": {
"a": "⊛ Person Running Facing Right",
"b": "1F3C3-200D-27A1-FE0F",
"j": [
""
]
},
"woman-running-facing-right": {
"a": "⊛ Woman Running Facing Right",
"b": "1F3C3-200D-2640-FE0F-200D-27A1-FE0F",
"j": [
""
]
},
"man-running-facing-right": {
"a": "⊛ Man Running Facing Right",
"b": "1F3C3-200D-2642-FE0F-200D-27A1-FE0F",
"j": [
""
]
},
"woman-dancing": { "woman-dancing": {
"a": "Woman Dancing", "a": "Woman Dancing",
"b": "1F483", "b": "1F483",
@ -7929,21 +8111,6 @@
"marriage" "marriage"
] ]
}, },
"family": {
"a": "Family",
"b": "1F46A-FE0F",
"j": [
"home",
"parents",
"child",
"mom",
"dad",
"father",
"mother",
"people",
"human"
]
},
"family-man-woman-boy": { "family-man-woman-boy": {
"a": "Family: Man, Woman, Boy", "a": "Family: Man, Woman, Boy",
"b": "1F468-200D-1F469-200D-1F466", "b": "1F468-200D-1F469-200D-1F466",
@ -8352,6 +8519,49 @@
"care" "care"
] ]
}, },
"family": {
"a": "Family",
"b": "1F46A-FE0F",
"j": [
"home",
"parents",
"child",
"mom",
"dad",
"father",
"mother",
"people",
"human"
]
},
"family-adult-adult-child": {
"a": "⊛ Family: Adult, Adult, Child",
"b": "1F9D1-200D-1F9D1-200D-1F9D2",
"j": [
"family: adult, adult, child"
]
},
"family-adult-adult-child-child": {
"a": "⊛ Family: Adult, Adult, Child, Child",
"b": "1F9D1-200D-1F9D1-200D-1F9D2-200D-1F9D2",
"j": [
"family: adult, adult, child, child"
]
},
"family-adult-child": {
"a": "⊛ Family: Adult, Child",
"b": "1F9D1-200D-1F9D2",
"j": [
"family: adult, child"
]
},
"family-adult-child-child": {
"a": "⊛ Family: Adult, Child, Child",
"b": "1F9D1-200D-1F9D2-200D-1F9D2",
"j": [
"family: adult, child, child"
]
},
"footprints": { "footprints": {
"a": "Footprints", "a": "Footprints",
"b": "1F463", "b": "1F463",
@ -8620,7 +8830,7 @@
] ]
}, },
"moose": { "moose": {
"a": "⊛ Moose", "a": "Moose",
"b": "1FACE", "b": "1FACE",
"j": [ "j": [
"animal", "animal",
@ -8635,7 +8845,7 @@
] ]
}, },
"donkey": { "donkey": {
"a": "⊛ Donkey", "a": "Donkey",
"b": "1FACF", "b": "1FACF",
"j": [ "j": [
"animal", "animal",
@ -9086,7 +9296,6 @@
"a": "Kangaroo", "a": "Kangaroo",
"b": "1F998", "b": "1F998",
"j": [ "j": [
"Australia",
"joey", "joey",
"jump", "jump",
"marsupial", "marsupial",
@ -9314,7 +9523,7 @@
] ]
}, },
"wing": { "wing": {
"a": "⊛ Wing", "a": "Wing",
"b": "1FABD", "b": "1FABD",
"j": [ "j": [
"angelic", "angelic",
@ -9327,7 +9536,7 @@
] ]
}, },
"black-bird": { "black-bird": {
"a": "⊛ Black Bird", "a": "Black Bird",
"b": "1F426-200D-2B1B", "b": "1F426-200D-2B1B",
"j": [ "j": [
"bird", "bird",
@ -9338,7 +9547,7 @@
] ]
}, },
"goose": { "goose": {
"a": "⊛ Goose", "a": "Goose",
"b": "1FABF", "b": "1FABF",
"j": [ "j": [
"bird", "bird",
@ -9349,6 +9558,17 @@
"goosebumps" "goosebumps"
] ]
}, },
"phoenix": {
"a": "⊛ Phoenix",
"b": "1F426-200D-1F525",
"j": [
"fantasy",
"firebird",
"phoenix",
"rebirth",
"reincarnation"
]
},
"frog": { "frog": {
"a": "Frog", "a": "Frog",
"b": "1F438", "b": "1F438",
@ -9588,7 +9808,7 @@
] ]
}, },
"jellyfish": { "jellyfish": {
"a": "⊛ Jellyfish", "a": "Jellyfish",
"b": "1FABC", "b": "1FABC",
"j": [ "j": [
"burn", "burn",
@ -9810,9 +10030,7 @@
"Buddhism", "Buddhism",
"flower", "flower",
"Hinduism", "Hinduism",
"India",
"purity", "purity",
"Vietnam",
"calm", "calm",
"meditation" "meditation"
] ]
@ -9894,7 +10112,7 @@
] ]
}, },
"hyacinth": { "hyacinth": {
"a": "⊛ Hyacinth", "a": "Hyacinth",
"b": "1FABB", "b": "1FABB",
"j": [ "j": [
"bluebonnet", "bluebonnet",
@ -10140,6 +10358,16 @@
"nature" "nature"
] ]
}, },
"lime": {
"a": "⊛ Lime",
"b": "1F34B-200D-1F7E9",
"j": [
"citrus",
"fruit",
"lime",
"tropical"
]
},
"banana": { "banana": {
"a": "Banana", "a": "Banana",
"b": "1F34C", "b": "1F34C",
@ -10432,7 +10660,7 @@
] ]
}, },
"ginger-root": { "ginger-root": {
"a": "⊛ Ginger Root", "a": "Ginger Root",
"b": "1FADA", "b": "1FADA",
"j": [ "j": [
"beer", "beer",
@ -10444,7 +10672,7 @@
] ]
}, },
"pea-pod": { "pea-pod": {
"a": "⊛ Pea Pod", "a": "Pea Pod",
"b": "1FADB", "b": "1FADB",
"j": [ "j": [
"beans", "beans",
@ -10457,6 +10685,17 @@
"green" "green"
] ]
}, },
"brown-mushroom": {
"a": "⊛ Brown Mushroom",
"b": "1F344-200D-1F7EB",
"j": [
"brown mushroom",
"food",
"fungus",
"nature",
"vegetable"
]
},
"bread": { "bread": {
"a": "Bread", "a": "Bread",
"b": "1F35E", "b": "1F35E",
@ -10863,7 +11102,8 @@
"rice", "rice",
"food", "food",
"japanese", "japanese",
"snack" "snack",
"senbei"
] ]
}, },
"rice-ball": { "rice-ball": {
@ -10874,7 +11114,9 @@
"Japanese", "Japanese",
"rice", "rice",
"food", "food",
"japanese" "japanese",
"onigiri",
"omusubi"
] ]
}, },
"cooked-rice": { "cooked-rice": {
@ -11251,7 +11493,8 @@
"dessert", "dessert",
"pudding", "pudding",
"sweet", "sweet",
"food" "food",
"flan"
] ]
}, },
"honey-pot": { "honey-pot": {
@ -12302,6 +12545,7 @@
"j": [ "j": [
"amusement park", "amusement park",
"play", "play",
"theme park",
"fun", "fun",
"park" "park"
] ]
@ -12312,6 +12556,7 @@
"j": [ "j": [
"amusement park", "amusement park",
"ferris", "ferris",
"theme park",
"wheel", "wheel",
"photo", "photo",
"carnival", "carnival",
@ -12325,6 +12570,7 @@
"amusement park", "amusement park",
"coaster", "coaster",
"roller", "roller",
"theme park",
"carnival", "carnival",
"playground", "playground",
"photo", "photo",
@ -15543,7 +15789,7 @@
] ]
}, },
"folding-hand-fan": { "folding-hand-fan": {
"a": "⊛ Folding Hand Fan", "a": "Folding Hand Fan",
"b": "1FAAD", "b": "1FAAD",
"j": [ "j": [
"cooling", "cooling",
@ -15730,7 +15976,7 @@
] ]
}, },
"hair-pick": { "hair-pick": {
"a": "⊛ Hair Pick", "a": "Hair Pick",
"b": "1FAAE", "b": "1FAAE",
"j": [ "j": [
"Afro", "Afro",
@ -16179,7 +16425,7 @@
] ]
}, },
"maracas": { "maracas": {
"a": "⊛ Maracas", "a": "Maracas",
"b": "1FA87", "b": "1FA87",
"j": [ "j": [
"instrument", "instrument",
@ -16190,7 +16436,7 @@
] ]
}, },
"flute": { "flute": {
"a": "⊛ Flute", "a": "Flute",
"b": "1FA88", "b": "1FA88",
"j": [ "j": [
"fife", "fife",
@ -17613,7 +17859,6 @@
"a": "Boomerang", "a": "Boomerang",
"b": "1FA83", "b": "1FA83",
"j": [ "j": [
"australia",
"rebound", "rebound",
"repercussion", "repercussion",
"weapon" "weapon"
@ -17735,6 +17980,18 @@
"url" "url"
] ]
}, },
"broken-chain": {
"a": "⊛ Broken Chain",
"b": "26D3-FE0F-200D-1F4A5",
"j": [
"break",
"breaking",
"broken chain",
"chain",
"cuffs",
"freedom"
]
},
"chains": { "chains": {
"a": "Chains", "a": "Chains",
"b": "26D3-FE0F", "b": "26D3-FE0F",
@ -19053,7 +19310,7 @@
] ]
}, },
"khanda": { "khanda": {
"a": "⊛ Khanda", "a": "Khanda",
"b": "1FAAF", "b": "1FAAF",
"j": [ "j": [
"religion", "religion",
@ -19474,12 +19731,13 @@
] ]
}, },
"wireless": { "wireless": {
"a": "⊛ Wireless", "a": "Wireless",
"b": "1F6DC", "b": "1F6DC",
"j": [ "j": [
"computer", "computer",
"internet", "internet",
"network", "network",
"wi-fi",
"wifi", "wifi",
"contactless", "contactless",
"signal" "signal"
@ -20019,7 +20277,8 @@
"0", "0",
"numbers", "numbers",
"blue-square", "blue-square",
"null" "null",
"zero"
] ]
}, },
"keycap-1": { "keycap-1": {
@ -20029,7 +20288,8 @@
"keycap", "keycap",
"blue-square", "blue-square",
"numbers", "numbers",
"1" "1",
"one"
] ]
}, },
"keycap-2": { "keycap-2": {
@ -20040,7 +20300,8 @@
"numbers", "numbers",
"2", "2",
"prime", "prime",
"blue-square" "blue-square",
"two"
] ]
}, },
"keycap-3": { "keycap-3": {
@ -20051,7 +20312,8 @@
"3", "3",
"numbers", "numbers",
"prime", "prime",
"blue-square" "blue-square",
"three"
] ]
}, },
"keycap-4": { "keycap-4": {
@ -20061,7 +20323,8 @@
"keycap", "keycap",
"4", "4",
"numbers", "numbers",
"blue-square" "blue-square",
"four"
] ]
}, },
"keycap-5": { "keycap-5": {
@ -20072,7 +20335,8 @@
"5", "5",
"numbers", "numbers",
"blue-square", "blue-square",
"prime" "prime",
"five"
] ]
}, },
"keycap-6": { "keycap-6": {
@ -20082,7 +20346,8 @@
"keycap", "keycap",
"6", "6",
"numbers", "numbers",
"blue-square" "blue-square",
"six"
] ]
}, },
"keycap-7": { "keycap-7": {
@ -20093,7 +20358,8 @@
"7", "7",
"numbers", "numbers",
"blue-square", "blue-square",
"prime" "prime",
"seven"
] ]
}, },
"keycap-8": { "keycap-8": {
@ -20103,7 +20369,8 @@
"keycap", "keycap",
"8", "8",
"blue-square", "blue-square",
"numbers" "numbers",
"eight"
] ]
}, },
"keycap-9": { "keycap-9": {
@ -20113,7 +20380,8 @@
"keycap", "keycap",
"blue-square", "blue-square",
"numbers", "numbers",
"9" "9",
"nine"
] ]
}, },
"keycap-10": { "keycap-10": {
@ -20123,7 +20391,8 @@
"keycap", "keycap",
"numbers", "numbers",
"10", "10",
"blue-square" "blue-square",
"ten"
] ]
}, },
"input-latin-uppercase": { "input-latin-uppercase": {
@ -21091,12 +21360,10 @@
"flag", "flag",
"gay", "gay",
"lgbt", "lgbt",
"glbt",
"queer", "queer",
"homosexual", "homosexual",
"lesbian", "lesbian",
"bisexual", "bisexual"
"transgender"
] ]
}, },
"transgender-flag": { "transgender-flag": {
@ -21108,6 +21375,7 @@
"pink", "pink",
"transgender", "transgender",
"white", "white",
"pride",
"lgbtq" "lgbtq"
] ]
}, },
@ -23961,11 +24229,12 @@
"tonga" "tonga"
] ]
}, },
"flag-turkey": { "flag-trkiye": {
"a": "Flag: Turkey", "a": "Flag: Türkiye",
"b": "1F1F9-1F1F7", "b": "1F1F9-1F1F7",
"j": [ "j": [
"flag", "flag",
"flag_turkey",
"turkey", "turkey",
"nation", "nation",
"country", "country",

2
vector-app/build.gradle
View file

@ -37,7 +37,7 @@ ext.versionMinor = 6
// Note: even values are reserved for regular release, odd values for hotfix release. // Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value // When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release. // is the value for the next regular release.
ext.versionPatch = 6 ext.versionPatch = 8
static def getGitTimestamp() { static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct' def cmd = 'git show -s --format=%ct'

10
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
View file

@ -34,6 +34,8 @@ import im.vector.app.features.call.vectorCallService
import im.vector.app.features.session.coroutineScope import im.vector.app.features.session.coroutineScope
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.asCoroutineDispatcher
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.matrix.android.sdk.api.extensions.orFalse import org.matrix.android.sdk.api.extensions.orFalse
import org.matrix.android.sdk.api.extensions.tryOrNull import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.logger.LoggerTag import org.matrix.android.sdk.api.logger.LoggerTag
@ -386,6 +388,14 @@ class WebRtcCallManager @Inject constructor(
// Maybe increase sync freq? but how to set back to default values? // Maybe increase sync freq? but how to set back to default values?
} }
} }
// ensure the incoming call will not ring forever
sessionScope?.launch {
delay(2 * 60 * 1000 /* 2 minutes */)
if (mxCall.state is CallState.LocalRinging) {
onCallEnded(mxCall.callId, EndCallReason.INVITE_TIMEOUT, rejected = false)
}
}
} }
override fun onCallAnswerReceived(callAnswerContent: CallAnswerContent) { override fun onCallAnswerReceived(callAnswerContent: CallAnswerContent) {

2
vector/src/main/res/raw/emoji_picker_datasource.json
View file

File diff suppressed because one or more lines are too long