empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Upgrade eventbus to 3.3.1

Browse source
This commit is contained in:
Grzegorz Bobryk 2023-10-10 23:06:25 +02:00 • committed by Cody Henthorne
parent 0dd17673f5
commit 89199b81ab
5 changed files with 57 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle
View file

@ -11,6 +11,7 @@ plugins {
id 'com.squareup.wire'
id 'translations'
id 'licenses'
id 'kotlin-kapt'
}
apply from: 'static-ips.gradle'
@ -449,6 +450,12 @@ android {
}
}
kapt {
arguments {
arg('eventBusIndex', 'org.thoughtcrime.securesms.SecuresmsEventBusIndex')
}
}
dependencies {
implementation libs.androidx.fragment.ktx
lintChecks project(':lintchecks')
@ -534,7 +541,8 @@ dependencies {
implementation libs.glide.glide
implementation libs.roundedimageview
implementation libs.materialish.progress
implementation libs.greenrobot.eventbus
implementation libs.greenrobot.eventbus.core
kapt libs.greenrobot.eventbus.annotation
implementation libs.google.zxing.android.integration
implementation libs.google.zxing.core
implementation libs.google.flexbox

11
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View file

@ -34,6 +34,7 @@ import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.AndroidLogger;
import org.signal.core.util.logging.Log;
import org.signal.core.util.tracing.Tracer;
import org.signal.devicetransfer.TransferEventBusIndex;
import org.signal.glide.SignalGlideCodecs;
import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
import org.signal.ringrtc.CallManager;
@ -112,7 +113,7 @@ import rxdogtag2.RxDogTag;
/**
* Will be called once when the TextSecure process is created.
*
* <p>
* We're using this as an insertion point to patch up the Android PRNG disaster,
* to initialize the job manager, and to check for GCM registration freshness.
*
@ -153,7 +154,13 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
.addBlocking("security-provider", this::initializeSecurityProvider)
.addBlocking("crash-handling", this::initializeCrashHandling)
.addBlocking("rx-init", this::initializeRx)
.addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
.addBlocking("event-bus", () -> EventBus
.builder()
.logNoSubscriberMessages(false)
.logSubscriberExceptions(BuildConfig.DEBUG)
.addIndex(new TransferEventBusIndex())
.addIndex(new SecuresmsEventBusIndex())
.installDefaultEventBus())
.addBlocking("app-dependencies", this::initializeAppDependencies)
.addBlocking("first-launch", this::initializeFirstEverAppLaunch)
.addBlocking("app-migrations", this::initializeApplicationMigrations)

4
dependencies.gradle
View file

@ -20,6 +20,7 @@ dependencyResolutionManagement {
version('android-gradle-plugin', '8.0.2')
version('accompanist', '0.28.0')
version('nanohttpd', '2.3.1')
version('eventbus', '3.3.1')
// Android Plugins
library('android-library', 'com.android.library', 'com.android.library.gradle.plugin').versionRef('android-gradle-plugin')
@ -120,7 +121,8 @@ dependencyResolutionManagement {
library('signal-android-database-sqlcipher', 'org.signal:sqlcipher-android:4.5.4-S2')
// Third Party
library('greenrobot-eventbus', 'org.greenrobot:eventbus:3.0.0')
library('greenrobot-eventbus-core', 'org.greenrobot', 'eventbus').versionRef('eventbus')
library('greenrobot-eventbus-annotation', 'org.greenrobot', 'eventbus-annotation-processor').versionRef('eventbus')
library('jackson-core', 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2')
library('jackson-module-kotlin', 'com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0')
library('square-okhttp3', 'com.squareup.okhttp3:okhttp:3.12.13')

10
device-transfer/lib/build.gradle
View file

@ -1,15 +1,23 @@
plugins {
id 'signal-library'
id 'kotlin-kapt'
}
android {
namespace 'org.signal.devicetransfer'
}
kapt {
arguments {
arg('eventBusIndex', 'org.signal.devicetransfer.TransferEventBusIndex')
}
}
dependencies {
implementation project(':core-util')
implementation libs.libsignal.android
api libs.greenrobot.eventbus
api libs.greenrobot.eventbus.core
kapt libs.greenrobot.eventbus.annotation
testImplementation (testLibs.robolectric.robolectric) {
exclude group: 'com.google.protobuf', module: 'protobuf-java'

30
gradle/verification-metadata.xml
View file

@ -3730,6 +3730,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="de.greenrobot" name="java-common" version="2.3.1">
<artifact name="java-common-2.3.1.jar">
<sha256 value="145d1bc69dd6e4d89268514a45226a0f2edde366eb9f20797f035de8974e9f43" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="dnsjava" name="dnsjava" version="2.1.9">
<artifact name="dnsjava-2.1.9.jar">
<sha256 value="072bba34267ffad8907c30a99a6b68f900782f3191454d278e395e289d478446" origin="Generated by Gradle"/>
@ -4419,9 +4424,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
<sha256 value="a6e082b23c6e32ed673c7e0556b65c70f62df739aab04383a729b33ffb38aafa" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.greenrobot" name="eventbus" version="3.0.0">
<artifact name="eventbus-3.0.0.jar">
<sha256 value="180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c" origin="Generated by Gradle"/>
<component group="org.greenrobot" name="eventbus" version="3.3.1">
<artifact name="eventbus-3.3.1.aar">
<sha256 value="c9385f4a570f8b2ef6f8f752690077ed538c358fd4755032ab80501755838f11" origin="Generated by Gradle"/>
</artifact>
<artifact name="eventbus-3.3.1.module">
<sha256 value="5f87af7e294cabe20cf9187ceee1e5683e44556959922d69498f3dfb60b18950" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.greenrobot" name="eventbus-annotation-processor" version="3.3.1">
<artifact name="eventbus-annotation-processor-3.3.1.jar">
<sha256 value="ae7a9d1c12afc46fa3923824793dfa46ac388f90d66b9a24e8936102e7c8c907" origin="Generated by Gradle"/>
</artifact>
<artifact name="eventbus-annotation-processor-3.3.1.module">
<sha256 value="17d398e2537675a8d7c49a4f6ffc85336f225bf195abdd92dc8c03c8c68d4ad0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.greenrobot" name="eventbus-java" version="3.3.1">
<artifact name="eventbus-java-3.3.1.jar">
<sha256 value="85f642378a25d5e41a69f8ba6cfb2fbe674e406b5437403e9f955f793d6cd991" origin="Generated by Gradle"/>
</artifact>
<artifact name="eventbus-java-3.3.1.module">
<sha256 value="4be991e7d1fe7901a6ac06ab4506624b0d5caf7c6844d1356d999e66ef198fc1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.hamcrest" name="hamcrest" version="2.2">