Skip to content

Commit 450a744

Browse files
committed
Merge branch 'molly-8.4'
2 parents 2e34b02 + 5fbb8e1 commit 450a744

File tree

757 files changed

+25153
-5836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

757 files changed

+25153
-5836
lines changed

app/build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ plugins {
1111
id("signal-locales")
1212
}
1313

14-
val canonicalVersionCode = 1663
15-
val canonicalVersionName = "8.2.2"
14+
val canonicalVersionCode = 1670
15+
val canonicalVersionName = "8.4.1"
1616
val currentHotfixVersion = 0
1717
val maxHotfixVersions = 100
1818
val mollyRevision = 3
@@ -455,6 +455,7 @@ dependencies {
455455
implementation(libs.androidx.concurrent.futures)
456456
implementation(libs.androidx.autofill)
457457
implementation(libs.androidx.biometric)
458+
implementation(libs.androidx.core.telecom)
458459
implementation(libs.androidx.sharetarget)
459460
implementation(libs.androidx.profileinstaller)
460461
implementation(libs.androidx.asynclayoutinflater)
@@ -478,7 +479,7 @@ dependencies {
478479
implementation(libs.conscrypt.android)
479480
implementation(libs.signal.aesgcmprovider)
480481
implementation(libs.libsignal.android)
481-
implementation(libs.molly.ringrtc)
482+
implementation(libs.signal.ringrtc)
482483
implementation(libs.leolin.shortcutbadger)
483484
implementation(libs.emilsjolander.stickylistheaders)
484485
implementation(libs.glide.glide)
@@ -588,16 +589,16 @@ licensee {
588589
allowDependency("im.molly", "native-utils", "1.0.0") {
589590
because("AGPL-3.0-or-later")
590591
}
591-
allowDependency("org.signal", "sqlcipher-android", "4.6.0-S1") {
592-
because("BSD-3-Clause")
593-
}
594592
allowUrl("http://opensource.org/licenses/bsd-license.php")
595593
allowUrl("https://www.gnu.org/licenses/agpl-3.0.html")
596594
allowUrl("https://www.gnu.org/licenses/agpl-3.0.txt")
597595
allowUrl("https://www.gnu.org/licenses/gpl-3.0.txt")
598596
allowUrl("http://jsoup.org/license") {
599597
because("MIT")
600598
}
599+
allowUrl("https://www.zetetic.net/sqlcipher/license/") {
600+
because("BSD-3-Clause")
601+
}
601602
}
602603

603604
fun getLastCommitTimestamp(): String {
-2 Bytes
Binary file not shown.
31 Bytes
Binary file not shown.
-29 Bytes
Binary file not shown.
1 Byte
Binary file not shown.
28 Bytes
Binary file not shown.
-26 Bytes
Binary file not shown.
-2 Bytes
Binary file not shown.
31 Bytes
Binary file not shown.
-29 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)