Skip to content

Commit

Permalink
Merge branch 'molly-7.26'
Browse files Browse the repository at this point in the history
  • Loading branch information
valldrac committed Nov 29, 2024
2 parents 6c5069e + 3d26e4d commit 6d55459
Show file tree
Hide file tree
Showing 1,197 changed files with 43,816 additions and 22,171 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body:
id: guidelines
attributes:
label: "Guidelines"
description: "Search issues here: https://github.com/signalapp/Signal-Android/issues"
description: "Search issues here: https://github.com/signalapp/Signal-Android/issues/?q=is%3Aissue+"
options:
- label: I have searched searched open and closed issues for duplicates
required: true
Expand Down
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java 17.0.2
20 changes: 12 additions & 8 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ apply {
from("fix-profm.gradle")
}

val canonicalVersionCode = 1479
val canonicalVersionName = "7.22.2"
val canonicalVersionCode = 1489
val canonicalVersionName = "7.26.1"
val currentHotfixVersion = 0
val maxHotfixVersions = 100
val mollyRevision = 2
val mollyRevision = 1

val sourceVersionNameWithRevision = "${canonicalVersionName}-${mollyRevision}"

Expand Down Expand Up @@ -83,7 +83,6 @@ android {
ndkVersion = signalNdkVersion

flavorDimensions += listOf("environment", "license", "distribution")
useLibrary("org.apache.http.legacy")
testBuildType = "instrumentation"

android.bundle.language.enableSplit = false
Expand Down Expand Up @@ -157,6 +156,7 @@ android {
}

buildFeatures {
buildConfig = true
viewBinding = true
compose = true
}
Expand Down Expand Up @@ -253,7 +253,6 @@ android {
"proguard/proguard-glide.pro",
"proguard/proguard-shortcutbadger.pro",
"proguard/proguard-retrofit.pro",
"proguard/proguard-webrtc.pro",
"proguard/proguard-klinker.pro",
"proguard/proguard-mobilecoin.pro",
"proguard/proguard-retrolambda.pro",
Expand Down Expand Up @@ -491,7 +490,6 @@ dependencies {
implementation(libs.molly.ringrtc)
implementation(libs.leolin.shortcutbadger)
implementation(libs.emilsjolander.stickylistheaders)
implementation(libs.apache.httpclient.android)
implementation(libs.glide.glide)
implementation(libs.roundedimageview)
implementation(libs.materialish.progress)
Expand All @@ -517,6 +515,7 @@ dependencies {
implementation(libs.dnsjava)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.accompanist.permissions)
implementation(libs.accompanist.drawablepainter)
implementation(libs.kotlin.stdlib.jdk8)
implementation(libs.kotlin.reflect)
"gmsImplementation"(libs.kotlinx.coroutines.play.services)
Expand All @@ -532,6 +531,13 @@ dependencies {
implementation(libs.molly.glide.webp.decoder)
implementation(libs.gosimple.nbvcxz)
"fossImplementation"("org.osmdroid:osmdroid-android:6.1.16")
implementation(libs.unifiedpush.connector) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
exclude(group = "com.google.protobuf", module = "protobuf-java")
}
implementation(libs.unifiedpush.connector.ui) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
}

"gmsImplementation"(project(":billing"))

Expand Down Expand Up @@ -570,8 +576,6 @@ dependencies {
androidTestImplementation(testLibs.androidx.test.core)
androidTestImplementation(testLibs.androidx.test.core.ktx)
androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
androidTestImplementation(testLibs.mockito.android)
androidTestImplementation(testLibs.mockito.kotlin)
androidTestImplementation(testLibs.mockk.android)
androidTestImplementation(testLibs.square.okhttp.mockserver)
androidTestImplementation(testLibs.diff.utils)
Expand Down
1 change: 1 addition & 0 deletions app/proguard/proguard.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-dontobfuscate
-keepattributes SourceFile,LineNumberTable
-keep class org.whispersystems.** { *; }
-keep class im.molly.** { *; }
-keep class org.signal.libsignal.net.** { *; }
-keep class org.signal.libsignal.protocol.** { *; }
-keep class org.signal.libsignal.usernames.** { *; }
Expand Down
Binary file modified app/src/androidTest/assets/backupTests/account_data_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_03.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_04.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_05.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_06.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_07.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_08.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_09.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_10.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_11.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_12.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_13.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_14.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_15.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_16.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_17.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_18.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_19.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_20.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_21.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_22.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_23.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_24.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_25.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_26.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/account_data_27.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_00.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_01.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_02.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_03.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_04.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_05.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_06.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_07.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_08.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_09.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_10.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_11.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_12.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_13.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_14.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_15.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_16.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_17.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_18.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_19.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_20.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_21.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_22.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_23.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_24.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_25.binproto
Binary file not shown.
Binary file modified app/src/androidTest/assets/backupTests/chat_26.binproto
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 6d55459

Please sign in to comment.