Merge branch 'fix-link-previews' into dev

This commit is contained in:
nielsandriesse 2020-07-08 10:51:44 +10:00
commit 0bec4df0e7

View File

@ -21,7 +21,6 @@ import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.net.CallRequestController;
import org.thoughtcrime.securesms.net.CompositeRequestController;
import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor;
import org.thoughtcrime.securesms.net.ContentProxySelector;
import org.thoughtcrime.securesms.net.RequestController;
import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.stickers.StickerRemoteUri;
@ -63,7 +62,7 @@ public class LinkPreviewRepository implements InjectableType {
public LinkPreviewRepository(@NonNull Context context) {
this.client = new OkHttpClient.Builder()
.proxySelector(new ContentProxySelector())
// .proxySelector(new ContentProxySelector()) // Loki: Signal's proxy appears to have been banned by YouTube
.addNetworkInterceptor(new ContentProxySafetyInterceptor())
.cache(null)
.build();