kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Picasso + refactors

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/github/gotify/api/CertUtils.java
View File

@@ -1,6 +1,7 @@
package com.github.gotify.api;
import android.annotation.SuppressLint;
import com.github.gotify.SSLSettings;
import com.github.gotify.Utils;
import com.github.gotify.log.Log;
import java.io.IOException;
@@ -19,16 +20,6 @@ import javax.net.ssl.X509TrustManager;
import okhttp3.OkHttpClient;
public class CertUtils {
public static class SSLSettings {
boolean validateSSL;
String cert;
public SSLSettings(boolean validateSSL, String cert) {
this.validateSSL = validateSSL;
this.cert = cert;
}
}
private static final X509TrustManager trustAll =
new X509TrustManager() {
@SuppressLint("TrustAllX509TrustManager")

9
app/src/main/java/com/github/gotify/api/ClientFactory.java
View File

@@ -1,5 +1,6 @@
package com.github.gotify.api;
import com.github.gotify.SSLSettings;
import com.github.gotify.Settings;
import com.github.gotify.Utils;
import com.github.gotify.client.ApiClient;
@@ -9,7 +10,7 @@ import com.github.gotify.client.auth.ApiKeyAuth;
import com.github.gotify.client.auth.HttpBasicAuth;
public class ClientFactory {
public static ApiClient unauthorized(String baseUrl, CertUtils.SSLSettings sslSettings) {
public static ApiClient unauthorized(String baseUrl, SSLSettings sslSettings) {
ApiClient client = new ApiClient();
client.setVerifyingSsl(sslSettings.validateSSL);
client.setSslCaCert(Utils.stringToInputStream(sslSettings.cert));
@@ -18,7 +19,7 @@ public class ClientFactory {
}
public static ApiClient basicAuth(
String baseUrl, CertUtils.SSLSettings sslSettings, String username, String password) {
String baseUrl, SSLSettings sslSettings, String username, String password) {
ApiClient client = unauthorized(baseUrl, sslSettings);
HttpBasicAuth auth = (HttpBasicAuth) client.getAuthentication("basicAuth");
auth.setUsername(username);
@@ -28,14 +29,14 @@ public class ClientFactory {
}
public static ApiClient clientToken(
String baseUrl, CertUtils.SSLSettings sslSettings, String token) {
String baseUrl, SSLSettings sslSettings, String token) {
ApiClient client = unauthorized(baseUrl, sslSettings);
ApiKeyAuth tokenAuth = (ApiKeyAuth) client.getAuthentication("clientTokenHeader");
tokenAuth.setApiKey(token);
return client;
}
public static VersionApi versionApi(String baseUrl, CertUtils.SSLSettings sslSettings) {
public static VersionApi versionApi(String baseUrl, SSLSettings sslSettings) {
return new VersionApi(unauthorized(baseUrl, sslSettings));
}