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

Merge branch 'release/1.6.26' into main

Browse source
This commit is contained in:
Benoit Marty 2024-12-20 10:08:35 +01:00
commit c3fa399b60
10 changed files with 144 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES.md
View file

@ -1,3 +1,11 @@
Changes in Element v1.6.26 (2024-12-20)
=======================================
Other changes
-------------
- Bump org.matrix.rustcomponents:crypto-android from 0.5.0 to 0.6.0 based on matrix-sdk-crypto-0.9.0 ([#8960](https://github.com/element-hq/element-android/issues/8960))
Changes in Element v1.6.24 (2024-11-19) Changes in Element v1.6.24 (2024-11-19)
======================================= =======================================

8
Gemfile.lock
View file

@ -207,8 +207,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0) trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0) uber (< 0.2.0)
retriable (3.1.2) retriable (3.1.2)
rexml (3.2.9) rexml (3.3.9)
strscan
rouge (2.0.7) rouge (2.0.7)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
rubyzip (2.3.2) rubyzip (2.3.2)
@ -224,7 +223,6 @@ GEM
simctl (1.6.10) simctl (1.6.10)
CFPropertyList CFPropertyList
naturally naturally
strscan (3.1.0)
terminal-notifier (2.0.0) terminal-notifier (2.0.0)
terminal-table (3.0.2) terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3) unicode-display_width (>= 1.1.1, < 3)
@ -239,13 +237,13 @@ GEM
unf_ext (0.0.9.1) unf_ext (0.0.9.1)
unicode-display_width (2.5.0) unicode-display_width (2.5.0)
word_wrap (1.0.0) word_wrap (1.0.0)
xcodeproj (1.24.0) xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0) CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3) atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0) claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1) colored2 (~> 3.1)
nanaimo (~> 0.3.0) nanaimo (~> 0.3.0)
rexml (~> 3.2.4) rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0) xcpretty (0.3.0)
rouge (~> 2.0.7) rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1) xcpretty-travis-formatter (1.0.1)

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

@ -0,0 +1,2 @@
Main changes in this version: crypto sdk upgrade.
Full changelog: https://github.com/element-hq/element-android/releases

4
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.24\"" buildConfigField "String", "SDK_VERSION", "\"1.6.26\""
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()}\""
@ -221,7 +221,7 @@ dependencies {
implementation libs.google.phonenumber implementation libs.google.phonenumber
implementation("org.matrix.rustcomponents:crypto-android:0.5.0") implementation("org.matrix.rustcomponents:crypto-android:0.6.0")
// api project(":library:rustCrypto") // api project(":library:rustCrypto")
testImplementation libs.tests.junit testImplementation libs.tests.junit

29
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo024.kt
View file

@ -17,6 +17,7 @@
package org.matrix.android.sdk.internal.crypto.store.db.migration package org.matrix.android.sdk.internal.crypto.store.db.migration
import io.realm.DynamicRealm import io.realm.DynamicRealm
import org.matrix.android.sdk.internal.extensions.safeRemove
import org.matrix.android.sdk.internal.util.database.RealmMigrator import org.matrix.android.sdk.internal.util.database.RealmMigrator
internal class MigrateCryptoTo024(realm: DynamicRealm) : RealmMigrator(realm, 24) { internal class MigrateCryptoTo024(realm: DynamicRealm) : RealmMigrator(realm, 24) {
@ -32,20 +33,20 @@ internal class MigrateCryptoTo024(realm: DynamicRealm) : RealmMigrator(realm, 24
get("CryptoRoomEntity")?.removeField("outboundSessionInfo") get("CryptoRoomEntity")?.removeField("outboundSessionInfo")
// Warning: order is important, first remove classes that depends on others. // Warning: order is important, first remove classes that depends on others.
remove("UserEntity") safeRemove("UserEntity")
remove("DeviceInfoEntity") safeRemove("DeviceInfoEntity")
remove("CrossSigningInfoEntity") safeRemove("CrossSigningInfoEntity")
remove("KeyInfoEntity") safeRemove("KeyInfoEntity")
remove("TrustLevelEntity") safeRemove("TrustLevelEntity")
remove("KeysBackupDataEntity") safeRemove("KeysBackupDataEntity")
remove("OlmInboundGroupSessionEntity") safeRemove("OlmInboundGroupSessionEntity")
remove("OlmSessionEntity") safeRemove("OlmSessionEntity")
remove("AuditTrailEntity") safeRemove("AuditTrailEntity")
remove("OutgoingKeyRequestEntity") safeRemove("OutgoingKeyRequestEntity")
remove("KeyRequestReplyEntity") safeRemove("KeyRequestReplyEntity")
remove("WithHeldSessionEntity") safeRemove("WithHeldSessionEntity")
remove("SharedSessionEntity") safeRemove("SharedSessionEntity")
remove("OutboundGroupSessionInfoEntity") safeRemove("OutboundGroupSessionInfoEntity")
} }
} }
} }

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
View file

@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.extensions
import io.realm.RealmList import io.realm.RealmList
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.RealmObjectSchema import io.realm.RealmObjectSchema
import io.realm.RealmSchema
import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
import org.matrix.android.sdk.internal.util.fatalError import org.matrix.android.sdk.internal.util.fatalError
@ -52,3 +53,9 @@ internal fun RealmObjectSchema?.forceRefreshOfHomeServerCapabilities(): RealmObj
obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0) obj.setLong(HomeServerCapabilitiesEntityFields.LAST_UPDATED_TIMESTAMP, 0)
} }
} }
internal fun RealmSchema.safeRemove(className: String) {
if (get(className) != null) {
remove(className)
}
}

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/decorator/UpdatedReplyDecorator.kt
View file

@ -59,7 +59,7 @@ internal class UpdatedReplyDecorator(
val isRedactedEvent = timelineEventEntity.root?.asDomain()?.isRedacted() ?: false val isRedactedEvent = timelineEventEntity.root?.asDomain()?.isRedacted() ?: false
val replyText = localEchoEventFactory val replyText = localEchoEventFactory
.bodyForReply(currentTimelineEvent.getLastMessageContent(), true).formattedText ?: "" .bodyForReply(currentTimelineEvent.getLastMessageContent(), true).takeFormatted()
val newContent = localEchoEventFactory.createReplyTextContent( val newContent = localEchoEventFactory.createReplyTextContent(
timelineEventMapper.map(timelineEventEntity), timelineEventMapper.map(timelineEventEntity),

152
tools/emojis/emoji_picker_datasource_formatted.json
View file

@ -3553,7 +3553,9 @@
"monocle", "monocle",
"rich", "rich",
"stuffy", "stuffy",
"wealthy" "wealthy",
"exploration",
"inspection"
] ]
}, },
"confused-face": { "confused-face": {
@ -4311,7 +4313,9 @@
"crap", "crap",
"dirt", "dirt",
"dog", "dog",
"smiling" "smiling",
"bad",
"needs_improvement"
] ]
}, },
"clown-face": { "clown-face": {
@ -4319,7 +4323,8 @@
"b": "1F921", "b": "1F921",
"j": [ "j": [
"clown", "clown",
"face" "face",
"mock"
] ]
}, },
"ogre": { "ogre": {
@ -4409,7 +4414,8 @@
"paul", "paul",
"weird", "weird",
"outer_space", "outer_space",
"et" "et",
"external"
] ]
}, },
"alien-monster": { "alien-monster": {
@ -4685,7 +4691,8 @@
"iwazaru", "iwazaru",
"mouth", "mouth",
"mute", "mute",
"no speaking" "no speaking",
"ignore"
] ]
}, },
"love-letter": { "love-letter": {
@ -5213,7 +5220,8 @@
"impact", "impact",
"red", "red",
"spark", "spark",
"symbol" "symbol",
"break"
] ]
}, },
"dizzy": { "dizzy": {
@ -5229,7 +5237,9 @@
"shoot", "shoot",
"magic", "magic",
"circle", "circle",
"symbol" "symbol",
"animations",
"transitions"
] ]
}, },
"sweat-droplets": { "sweat-droplets": {
@ -5304,7 +5314,8 @@
"words", "words",
"chatting", "chatting",
"chat", "chat",
"comment" "comment",
"literals"
] ]
}, },
"eye-in-speech-bubble": { "eye-in-speech-bubble": {
@ -8543,7 +8554,9 @@
"face", "face",
"hard", "hard",
"helmet", "helmet",
"safety" "safety",
"add_ci",
"update_ci"
] ]
}, },
"man-construction-worker": { "man-construction-worker": {
@ -12397,7 +12410,8 @@
"shadows", "shadows",
"silhouettes", "silhouettes",
"two", "two",
"users" "users",
"contributors"
] ]
}, },
"people-hugging": { "people-hugging": {
@ -14463,7 +14477,8 @@
"grass", "grass",
"lawn", "lawn",
"spring", "spring",
"sprouting" "sprouting",
"seed"
] ]
}, },
"potted-plant": { "potted-plant": {
@ -15534,7 +15549,8 @@
"j": [ "j": [
"breakfast", "breakfast",
"food", "food",
"chicken" "chicken",
"easter_egg"
] ]
}, },
"cooking": { "cooking": {
@ -15684,7 +15700,8 @@
"box", "box",
"food", "food",
"japanese", "japanese",
"lunch" "lunch",
"assets"
] ]
}, },
"rice-cracker": { "rice-cracker": {
@ -16662,7 +16679,9 @@
"i18n", "i18n",
"global", "global",
"wide", "wide",
"www" "www",
"internationalization",
"localization"
] ]
}, },
"world-map": { "world-map": {
@ -16837,7 +16856,8 @@
"crane", "crane",
"wip", "wip",
"working", "working",
"progress" "progress",
"architectural"
] ]
}, },
"brick": { "brick": {
@ -16848,7 +16868,8 @@
"clay", "clay",
"mortar", "mortar",
"wall", "wall",
"construction" "construction",
"infrastructure"
] ]
}, },
"rock": { "rock": {
@ -17912,7 +17933,8 @@
"truck", "truck",
"vehicle", "vehicle",
"cars", "cars",
"transportation" "transportation",
"resources"
] ]
}, },
"articulated-lorry": { "articulated-lorry": {
@ -18159,7 +18181,8 @@
"emergency light", "emergency light",
"flashing", "flashing",
"rotating", "rotating",
"vehicle" "vehicle",
"warning"
] ]
}, },
"horizontal-traffic-light": { "horizontal-traffic-light": {
@ -18215,7 +18238,8 @@
"roadwork", "roadwork",
"sign", "sign",
"striped", "striped",
"yellow" "yellow",
"work_in_progress"
] ]
}, },
"anchor": { "anchor": {
@ -18515,7 +18539,8 @@
"outer_space", "outer_space",
"fly", "fly",
"shuttle", "shuttle",
"vehicle" "vehicle",
"deploy"
] ]
}, },
"flying-saucer": { "flying-saucer": {
@ -19825,7 +19850,8 @@
"weather", "weather",
"lightning bolt", "lightning bolt",
"fast", "fast",
"sign" "sign",
"speed"
] ]
}, },
"snowflake": { "snowflake": {
@ -19897,7 +19923,8 @@
"litaf", "litaf",
"tool", "tool",
"cook", "cook",
"snapstreak" "snapstreak",
"remove"
] ]
}, },
"droplet": { "droplet": {
@ -20624,7 +20651,8 @@
"j": [ "j": [
"goal", "goal",
"net", "net",
"sports" "sports",
"catch"
] ]
}, },
"flag-in-hole": { "flag-in-hole": {
@ -21156,7 +21184,8 @@
"paint", "paint",
"draw", "draw",
"colors", "colors",
"activity" "activity",
"improve"
] ]
}, },
"thread": { "thread": {
@ -21936,7 +21965,8 @@
"fashion", "fashion",
"woman", "woman",
"gloss", "gloss",
"lip" "lip",
"style"
] ]
}, },
"ring": { "ring": {
@ -22440,7 +22470,8 @@
"gadgets", "gadgets",
"dial", "dial",
"iphone", "iphone",
"smartphone" "smartphone",
"responsive_design"
] ]
}, },
"mobile-phone-with-arrow": { "mobile-phone-with-arrow": {
@ -22796,7 +22827,8 @@
"video", "video",
"photography", "photography",
"gadgets", "gadgets",
"photo" "photo",
"snapshots"
] ]
}, },
"video-camera": { "video-camera": {
@ -22871,7 +22903,8 @@
"icon", "icon",
"mag", "mag",
"magnifier", "magnifier",
"pointing" "pointing",
"seo"
] ]
}, },
"candle": { "candle": {
@ -23097,7 +23130,8 @@
"documents", "documents",
"office", "office",
"curled", "curled",
"curly page" "curly page",
"license"
] ]
}, },
"scroll": { "scroll": {
@ -23503,7 +23537,8 @@
"mail", "mail",
"gift", "gift",
"cardboard", "cardboard",
"moving" "moving",
"container"
] ]
}, },
"closed-mailbox-with-raised-flag": { "closed-mailbox-with-raised-flag": {
@ -23601,7 +23636,8 @@
"school", "school",
"study", "study",
"lead", "lead",
"pencil2" "pencil2",
"typos"
] ]
}, },
"black-nib": { "black-nib": {
@ -23691,7 +23727,8 @@
"compose", "compose",
"document", "document",
"memorandum", "memorandum",
"note" "note",
"documentation"
] ]
}, },
"briefcase": { "briefcase": {
@ -23835,7 +23872,8 @@
"metrics", "metrics",
"pointing", "pointing",
"positive chart", "positive chart",
"upwards" "upwards",
"analytics"
] ]
}, },
"chart-decreasing": { "chart-decreasing": {
@ -23996,7 +24034,8 @@
"card", "card",
"file", "file",
"business", "business",
"stationery" "stationery",
"database"
] ]
}, },
"file-cabinet": { "file-cabinet": {
@ -24035,7 +24074,8 @@
"private", "private",
"security", "security",
"password", "password",
"padlock" "padlock",
"privacy"
] ]
}, },
"unlocked": { "unlocked": {
@ -24078,7 +24118,8 @@
"locked", "locked",
"secure", "secure",
"security", "security",
"privacy" "privacy",
"secret"
] ]
}, },
"key": { "key": {
@ -24636,7 +24677,8 @@
"doctor", "doctor",
"heart", "heart",
"medicine", "medicine",
"health" "health",
"healthcheck"
] ]
}, },
"xray": { "xray": {
@ -24961,7 +25003,8 @@
"cemetery", "cemetery",
"casket", "casket",
"funeral", "funeral",
"box" "box",
"remove"
] ]
}, },
"headstone": { "headstone": {
@ -25243,7 +25286,10 @@
"passport", "passport",
"custom", "custom",
"blue-square", "blue-square",
"border" "border",
"permissions",
"authorization",
"roles"
] ]
}, },
"customs": { "customs": {
@ -25324,7 +25370,9 @@
"sign", "sign",
"driving", "driving",
"yellow-diamond", "yellow-diamond",
"kids" "kids",
"experience",
"usability"
] ]
}, },
"no-entry": { "no-entry": {
@ -25541,7 +25589,8 @@
"top", "top",
"black", "black",
"pointing", "pointing",
"upwards" "upwards",
"upgrade"
] ]
}, },
"upright-arrow": { "upright-arrow": {
@ -25611,7 +25660,8 @@
"black", "black",
"downwards", "downwards",
"down arrow", "down arrow",
"pointing" "pointing",
"downgrade"
] ]
}, },
"downleft-arrow": { "downleft-arrow": {
@ -26255,7 +26305,8 @@
"arrows", "arrows",
"rightwards", "rightwards",
"symbol", "symbol",
"twisted" "twisted",
"merge"
] ]
}, },
"repeat-button": { "repeat-button": {
@ -26415,7 +26466,8 @@
"left", "left",
"pointing", "pointing",
"symbol", "symbol",
"triangle" "triangle",
"revert"
] ]
}, },
"last-track-button": { "last-track-button": {
@ -26753,7 +26805,8 @@
"more", "more",
"increase", "increase",
"heavy", "heavy",
"symbol" "symbol",
"add"
] ]
}, },
"minus": { "minus": {
@ -26769,7 +26822,8 @@
"calculation", "calculation",
"subtract", "subtract",
"less", "less",
"symbol" "symbol",
"remove"
] ]
}, },
"divide": { "divide": {
@ -26995,7 +27049,8 @@
"black", "black",
"green", "green",
"logo", "logo",
"universal" "universal",
"reuse"
] ]
}, },
"fleurdelis": { "fleurdelis": {
@ -27097,7 +27152,8 @@
"green", "green",
"heavy", "heavy",
"symbol", "symbol",
"white" "white",
"pass_tests"
] ]
}, },
"check-box-with-check": { "check-box-with-check": {

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 = 24 ext.versionPatch = 26
static def getGitTimestamp() { static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct' def cmd = 'git show -s --format=%ct'

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

File diff suppressed because one or more lines are too long