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

Fix multiple exception crash in rx message send flow.

Browse source
This commit is contained in:
Cody Henthorne 2024-04-01 14:27:11 -04:00 • committed by Greyson Parrelli
parent 08a407dc23
commit 133b7ef3f1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View file

@ -158,6 +158,7 @@ import javax.annotation.Nullable;
import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.core.Scheduler;
import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.exceptions.CompositeException;
import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import kotlin.Unit; import kotlin.Unit;
import okio.ByteString; import okio.ByteString;
@ -2164,7 +2165,9 @@ public class SignalServiceMessageSender {
.lastOrError() .lastOrError()
.blockingGet(); .blockingGet();
} catch (RuntimeException e) { } catch (RuntimeException e) {
Throwable cause = e.getCause(); Throwable cause = e instanceof CompositeException ? ((CompositeException) e).getExceptions().get(0)
: e.getCause();
if (cause instanceof IOException) { if (cause instanceof IOException) {
throw (IOException) cause; throw (IOException) cause;
} else if (cause instanceof InterruptedException) { } else if (cause instanceof InterruptedException) {