From a51bb8e23f6fafd254a90d323e552031610b696c Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 2 Nov 2021 10:56:13 -0400 Subject: [PATCH] Add LeakCanary to flipper builds. --- app/build.gradle | 1 + .../thoughtcrime/securesms/emoji/EmojiFiles.kt | 10 ++++++---- app/witness-verifications.gradle | 8 ++++---- dependencies.gradle | 4 +++- donations/app/witness-verifications.gradle | 4 ++-- donations/lib/witness-verifications.gradle | 4 ++-- libsignal/service/build.gradle | 1 + .../internal/push/NowhereBufferedSink.java | 5 +++++ libsignal/service/witness-verifications.gradle | 17 +++++++++++++---- 9 files changed, 37 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e3c0627b4..16c4fe0e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -533,6 +533,7 @@ dependencies { flipperImplementation libs.facebook.flipper flipperImplementation libs.facebook.soloader + flipperImplementation libs.square.leakcanary testImplementation testLibs.junit.junit testImplementation testLibs.assertj.core diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt index 7bfd2845e..0c8a1531a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiFiles.kt @@ -8,7 +8,9 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.registerKotlinModule import okio.HashingSink -import okio.Okio +import okio.blackholeSink +import okio.buffer +import okio.source import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream @@ -97,11 +99,11 @@ object EmojiFiles { val file = version.getFile(context, uuid) try { - HashingSink.md5(Okio.blackhole()).use { hashingSink -> - Okio.buffer(Okio.source(getInputStream(context, file))).use { source -> + HashingSink.md5(blackholeSink()).use { hashingSink -> + getInputStream(context, file).source().buffer().use { source -> source.readAll(hashingSink) - return hashingSink.hash().toByteArray() + return hashingSink.hash.toByteArray() } } } catch (e: Exception) { diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle index 1559838ed..5f713b4e8 100644 --- a/app/witness-verifications.gradle +++ b/app/witness-verifications.gradle @@ -459,14 +459,14 @@ dependencyVerification { ['com.pnikosis:materialish-progress:1.5', 'd71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54'], - ['com.squareup.okhttp3:okhttp:3.12.10', - '3cb8e21cd3ab10d390448f5a475c960732efab583a09c39f06f866a7ed819ebc'], + ['com.squareup.okhttp3:okhttp:3.12.13', + '508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82'], ['com.squareup.okhttp:okhttp:2.7.4', 'c88be9af1509d5aeec9394a818c0fa08e26fad9d64ba134e6f977e0bb20cb114'], - ['com.squareup.okio:okio:1.17.5', - '19a7ff48d86d3cf4497f7f250fbf295f430c13a528dd5b7b203f821802b886ad'], + ['com.squareup.okio:okio:2.2.2', + 'e58c97406a6bb1138893750299ac63c6aa04b38b6b49eae1bfcad1a63ef9ba1b'], ['com.takisoft.fix:colorpicker:0.9.1', 'f5d0dbabe406a1800498ca9c1faf34db36e021d8488bf10360f29961fe3ab0d1'], diff --git a/dependencies.gradle b/dependencies.gradle index e1ca99f2d..4996531e7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -83,7 +83,9 @@ dependencyResolutionManagement { alias('greenrobot-eventbus').to('org.greenrobot:eventbus:3.0.0') alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.9.9.2') alias('jackson-module-kotlin').to('com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0') - alias('square-okhttp3').to('com.squareup.okhttp3:okhttp:3.12.10') + alias('square-okhttp3').to('com.squareup.okhttp3:okhttp:3.12.13') + alias('square-okio').to('com.squareup.okio:okio:2.2.2') + alias('square-leakcanary').to('com.squareup.leakcanary:leakcanary-android:2.7') alias('threeten-threetenbp').to('org.threeten:threetenbp:1.3.6') alias('rxjava3-rxjava').to('io.reactivex.rxjava3:rxjava:3.0.13') alias('rxjava3-rxandroid').to('io.reactivex.rxjava3:rxandroid:3.0.0') diff --git a/donations/app/witness-verifications.gradle b/donations/app/witness-verifications.gradle index b66a3fd8d..0d4df45e4 100644 --- a/donations/app/witness-verifications.gradle +++ b/donations/app/witness-verifications.gradle @@ -144,8 +144,8 @@ dependencyVerification { ['com.google.protobuf:protobuf-javalite:3.11.4', '8cacea2f7a042dabae295c509dcdbfe32a49aa3708eec6ddb8efd8593aa0b4a3'], - ['com.squareup.okhttp3:okhttp:3.12.10', - '3cb8e21cd3ab10d390448f5a475c960732efab583a09c39f06f866a7ed819ebc'], + ['com.squareup.okhttp3:okhttp:3.12.13', + '508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82'], ['com.squareup.okio:okio:1.15.0', '693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2'], diff --git a/donations/lib/witness-verifications.gradle b/donations/lib/witness-verifications.gradle index 631521db3..480ebe1da 100644 --- a/donations/lib/witness-verifications.gradle +++ b/donations/lib/witness-verifications.gradle @@ -99,8 +99,8 @@ dependencyVerification { ['com.google.protobuf:protobuf-javalite:3.11.4', '8cacea2f7a042dabae295c509dcdbfe32a49aa3708eec6ddb8efd8593aa0b4a3'], - ['com.squareup.okhttp3:okhttp:3.12.10', - '3cb8e21cd3ab10d390448f5a475c960732efab583a09c39f06f866a7ed819ebc'], + ['com.squareup.okhttp3:okhttp:3.12.13', + '508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82'], ['com.squareup.okio:okio:1.15.0', '693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2'], diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle index e88224c63..aa8da57d3 100644 --- a/libsignal/service/build.gradle +++ b/libsignal/service/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation libs.signal.client.java api libs.square.okhttp3 + api libs.square.okio implementation libs.threeten.threetenbp api libs.rxjava3.rxjava diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java index a566c9827..57aa5843c 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java @@ -173,4 +173,9 @@ public class NowhereBufferedSink implements BufferedSink { public boolean isOpen() { return false; } + + @Override + public Buffer getBuffer() { + return null; + } } diff --git a/libsignal/service/witness-verifications.gradle b/libsignal/service/witness-verifications.gradle index e31418f32..c1eef2383 100644 --- a/libsignal/service/witness-verifications.gradle +++ b/libsignal/service/witness-verifications.gradle @@ -18,15 +18,24 @@ dependencyVerification { ['com.googlecode.libphonenumber:libphonenumber:8.12.17', '729483057ef874b01537da8395d67e23b419d504f8ff29ddf5f69da21bf816ac'], - ['com.squareup.okhttp3:okhttp:3.12.10', - '3cb8e21cd3ab10d390448f5a475c960732efab583a09c39f06f866a7ed819ebc'], + ['com.squareup.okhttp3:okhttp:3.12.13', + '508234e024ef7e270ab1a6d5b356f5b98e786511239ca986d684fd1e2cf7bc82'], - ['com.squareup.okio:okio:1.15.0', - '693fa319a7e8843300602b204023b7674f106ebcb577f2dd5807212b66118bd2'], + ['com.squareup.okio:okio:2.2.2', + 'e58c97406a6bb1138893750299ac63c6aa04b38b6b49eae1bfcad1a63ef9ba1b'], ['io.reactivex.rxjava3:rxjava:3.0.13', '598abaf71dbc970dd0727e6d5f4f786dc999df5b972cbf261316a32e155b2c69'], + ['org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60', + '09b4375a065cf127abc998c5dcf22b1664c45af42b489499d7a8f4f8ab793fb1'], + + ['org.jetbrains.kotlin:kotlin-stdlib:1.2.60', + '6a130298f5171ac52a1e2496f7eae785b6f56416ea3ccb99e4344d04d83ff071'], + + ['org.jetbrains:annotations:13.0', + 'ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478'], + ['org.reactivestreams:reactive-streams:1.0.3', '1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865'],