Skip to content

Commit

Permalink
Merge branch 'main' into slowbackups
Browse files Browse the repository at this point in the history
  • Loading branch information
farewelltospring committed Jan 5, 2025
2 parents db926b0 + e478617 commit 369c8bb
Show file tree
Hide file tree
Showing 1,446 changed files with 62,334 additions and 37,303 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
5 changes: 2 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ on:
push:
branches:
- 'main'
- '4.**'
- '5.**'
- '7.**'

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down Expand Up @@ -36,7 +35,7 @@ jobs:

- name: Archive reports for failed build
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: reports
path: '*/build/reports'
2 changes: 1 addition & 1 deletion .github/workflows/diffuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
issue-number: ${{ github.event.pull_request.number }}
token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: diffuse-output
path: ${{ steps.diffuse.outputs.diff-file }}
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
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ You will need to [sign our CLA](https://signal.org/cla/) before your pull reques
### Follow the Code Style Guidelines
Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request.

You can run `./gradlew format` to automatically check conformance with some of these guidelines.

### Submit finished and well-tested pull requests
Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted.

Expand Down
12 changes: 4 additions & 8 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ plugins {

apply(from = "static-ips.gradle.kts")

val canonicalVersionCode = 1471
val canonicalVersionName = "7.21.0"
val canonicalVersionCode = 1491
val canonicalVersionName = "7.27.1"
val currentHotfixVersion = 0
val maxHotfixVersions = 100

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

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

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

buildFeatures {
buildConfig = true
viewBinding = true
compose = true
}
Expand Down Expand Up @@ -209,7 +209,6 @@ android {
buildConfigField("String[]", "SIGNAL_CDSI_IPS", rootProject.extra["cdsi_ips"] as String)
buildConfigField("String[]", "SIGNAL_SVR2_IPS", rootProject.extra["svr2_ips"] as String)
buildConfigField("String", "SIGNAL_AGENT", "\"OWA\"")
buildConfigField("String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\"")
buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97\"")
buildConfigField("String", "SVR2_MRENCLAVE", "\"9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570\"")
buildConfigField("String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\"")
Expand Down Expand Up @@ -271,7 +270,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 @@ -543,7 +541,6 @@ dependencies {
implementation(libs.signal.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 @@ -569,6 +566,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)
implementation(libs.kotlinx.coroutines.play.services)
Expand Down Expand Up @@ -618,8 +616,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
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.
Loading

0 comments on commit 369c8bb

Please sign in to comment.