1
0
mirror of https://github.com/vector-im/riotX-android synced 2025-10-05 15:52:47 +02:00

Merge branch 'release/1.6.38' into main

This commit is contained in:
Benoit Marty
2025-05-27 15:20:45 +02:00
8 changed files with 34 additions and 22 deletions

View File

@@ -1,3 +1,11 @@
Changes in Element v1.6.38 (2025-05-27)
=======================================
Other changes
-------------
- Filter mobile links: only open links which have an explicit empty path like `https://mobile.element.io/?hs_url=...` ([#9033](https://github.com/element-hq/element-android/issues/9033))
Changes in Element v1.6.36 (2025-03-14)
=======================================

View File

@@ -0,0 +1,2 @@
Main changes in this version: Filter mobile links: only open links which have an explicit empty path.
Full changelog: https://github.com/element-hq/element-android/releases

View File

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

View File

@@ -3021,14 +3021,8 @@
"smile",
"smiling",
"teeth",
"#1 best",
"eek",
"foot",
"friend",
"mouth",
"mutual",
"nervous",
"snapchat"
"nervous"
]
},
"face-exhaling": {
@@ -4347,7 +4341,8 @@
"creepy",
"demon",
"japanese_ogre",
"oni"
"oni",
"shrek"
]
},
"goblin": {
@@ -8470,7 +8465,6 @@
"palace",
"protect",
"british",
"foot",
"guardsman"
]
},
@@ -9530,7 +9524,8 @@
"monster",
"tale",
"trolling",
"mystical"
"mystical",
"shrek"
]
},
"person-getting-massage": {
@@ -12528,7 +12523,6 @@
"clue",
"crime",
"detective",
"fingerprint",
"forensics",
"identity",
"mystery",
@@ -12860,7 +12854,6 @@
"antlers",
"elk",
"mammal",
"shrek",
"canada",
"sweden",
"sven",
@@ -22449,7 +22442,6 @@
"b": "1FA89",
"j": [
"cupid",
"harp",
"instrument",
"love",
"music",
@@ -24482,9 +24474,9 @@
"hole",
"plant",
"scoop",
"shovel",
"snow",
"spade"
"spade",
"tool"
]
},
"alembic": {
@@ -27369,7 +27361,6 @@
"mess",
"paint",
"spill",
"splatter",
"stain"
]
},
@@ -29526,7 +29517,9 @@
"a": "⊛ Flag: Sark",
"b": "1F1E8-1F1F6",
"j": [
"flag"
"flag",
"cq",
"banner"
]
},
"flag-costa-rica": {

View File

@@ -1,3 +1,3 @@
#!/usr/bin/env bash
adb shell am start -a android.intent.action.VIEW -d "https://mobile.element.io?hs_url=https%3A%2F%2Fmozilla-test.modular.im"
adb shell am start -a android.intent.action.VIEW -d "https://mobile.element.io/?hs_url=https%3A%2F%2Felement.io"

View File

@@ -37,7 +37,7 @@ ext.versionMinor = 6
// 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
// is the value for the next regular release.
ext.versionPatch = 36
ext.versionPatch = 38
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'

View File

@@ -206,8 +206,17 @@
<data android:host="develop.element.io" />
<!-- Matching asset file: https://staging.element.io/.well-known/assetlinks.json -->
<data android:host="staging.element.io" />
<!-- Fix it https://github.com/element-hq/element-android/issues/8904 -->
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
<data android:host="mobile.element.io" />
<!-- accept only root path -->
<data android:path="/" />
</intent-filter>
</activity>

File diff suppressed because one or more lines are too long