Fixed Picasso + refactors

- Removed comment

- Moved SSLSettings to its own top-level class

- Fixed picasso not setting SSL settings and failing to load images over
  self-signed connection
This commit is contained in:
Galen Abell
2018-11-10 10:40:48 -05:00
parent 8e2d90ef50
commit 78a7f1319e
7 changed files with 45 additions and 24 deletions

View File

@@ -1,6 +1,7 @@
package com.github.gotify.service;
import android.os.Handler;
import com.github.gotify.SSLSettings;
import com.github.gotify.Utils;
import com.github.gotify.api.Callback;
import com.github.gotify.api.CertUtils;
@@ -33,11 +34,7 @@ public class WebSocketConnection {
private Runnable onReconnected;
private boolean isClosed;
WebSocketConnection(String baseUrl, CertUtils.SSLSettings settings, String token) {
// client = new ApiClient()
// .setVerifyingSsl(validateSSL)
// .setSslCaCert(Utils.stringToInputStream(cert))
// .getHttpClient();
WebSocketConnection(String baseUrl, SSLSettings settings, String token) {
OkHttpClient.Builder builder =
new OkHttpClient.Builder()
.readTimeout(0, TimeUnit.MILLISECONDS)