Bring back conscrypt, improve provider initialization ordering.

This commit is contained in:
Greyson Parrelli
2019-05-01 09:00:26 -07:00
parent ec20b0e0e3
commit 7b4299d5da
6 changed files with 49 additions and 391 deletions

View File

@@ -26,6 +26,7 @@ import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.SignalServiceMessagePipe;
import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
import org.whispersystems.signalservice.api.crypto.ProfileCipher;
import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
@@ -210,7 +211,7 @@ public class RetrieveProfileJob extends BaseJob implements InjectableType {
if (!Util.equals(plaintextProfileName, recipient.getProfileName())) {
DatabaseFactory.getRecipientDatabase(context).setProfileName(recipient, plaintextProfileName);
}
} catch (ProfileCipher.InvalidCiphertextException | IOException e) {
} catch (InvalidCiphertextException | IOException e) {
Log.w(TAG, e);
}
}