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

Only fallback to unidentified socket when a auth error occurs.

Browse source 
Fixes #12395
This commit is contained in:
Cody Henthorne 2022-08-22 13:59:35 -04:00 • committed by Greyson Parrelli
parent c6c30f25a2
commit f0a109245b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1775,8 +1775,11 @@ public class SignalServiceMessageSender {
} catch (WebSocketUnavailableException e) { } catch (WebSocketUnavailableException e) {
Log.i(TAG, "[sendMessage][" + timestamp + "] Unidentified pipe unavailable, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")"); Log.i(TAG, "[sendMessage][" + timestamp + "] Unidentified pipe unavailable, falling back... (" + e.getClass().getSimpleName() + ": " + e.getMessage() + ")");
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, e); Throwable cause = e;
Log.w(TAG, "[sendMessage][" + timestamp + "] Unidentified pipe failed, falling back..."); if (e.getCause() != null) {
cause = e.getCause();
}
Log.w(TAG, "[sendMessage][" + timestamp + "] Unidentified pipe failed, falling back... (" + cause.getClass().getSimpleName() + ": " + cause.getMessage() + ")");
} }
} }

3
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
View file

@ -207,8 +207,7 @@ public final class SignalWebSocket {
return request(requestMessage); return request(requestMessage);
} }
return Single.just(r); return Single.just(r);
}) });
.onErrorResumeNext(t -> request(requestMessage));
} catch (IOException e) { } catch (IOException e) {
return Single.error(e); return Single.error(e);
} }