Merge request changes

- Moved certificate-related utilities to separate class

- Added settings method to return an entire SSLSettings object; refactored
  methods using separate parameters to take single SSLSettings parameter

- Advanced Settings section on login page now hides / shows along with
  other buttons to prevent it from showing up in front of the loading
  spinner

- Fixed star imports

- Refactored applySslSettings as per code from merge request

- Fixed formatting

app/src/main/java/com/github/gotify/service/WebSocketConnection.java

@@ -3,6 +3,7 @@ package com.github.gotify.service;
 import android.os.Handler;
 import com.github.gotify.Utils;
 import com.github.gotify.api.Callback;
+import com.github.gotify.api.CertUtils;
 import com.github.gotify.client.JSON;
 import com.github.gotify.client.model.Message;
 import com.github.gotify.log.Log;
@@ -32,12 +33,17 @@ public class WebSocketConnection {
     private Runnable onReconnected;
     private boolean isClosed;
 
-    WebSocketConnection(String baseUrl, boolean validateSSL, String cert, String token) {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder()
-                .readTimeout(0, TimeUnit.MILLISECONDS)
-                .pingInterval(1, TimeUnit.MINUTES)
-                .connectTimeout(10, TimeUnit.SECONDS);
-        Utils.applySslSettings(builder, new Utils.SSLSettings(validateSSL, cert));
+    WebSocketConnection(String baseUrl, CertUtils.SSLSettings settings, String token) {
+        //        client = new ApiClient()
+        //                .setVerifyingSsl(validateSSL)
+        //                .setSslCaCert(Utils.stringToInputStream(cert))
+        //                .getHttpClient();
+        OkHttpClient.Builder builder =
+                new OkHttpClient.Builder()
+                        .readTimeout(0, TimeUnit.MILLISECONDS)
+                        .pingInterval(1, TimeUnit.MINUTES)
+                        .connectTimeout(10, TimeUnit.SECONDS);
+        CertUtils.applySslSettings(builder, settings);
 
         client = builder.build();
 

app/src/main/java/com/github/gotify/service/WebSocketService.java

@@ -42,7 +42,9 @@ public class WebSocketService extends Service {
         super.onCreate();
         settings = new Settings(this);
         missingMessageUtil =
-                new MissedMessageUtil(ClientFactory.clientToken(settings.url(), settings.validateSSL(), settings.cert(), settings.token()));
+                new MissedMessageUtil(
+                        ClientFactory.clientToken(
+                                settings.url(), settings.sslSettings(), settings.token()));
         Log.i("Create " + getClass().getSimpleName());
     }
 
@@ -79,7 +81,7 @@ public class WebSocketService extends Service {
         }
 
         connection =
-                new WebSocketConnection(settings.url(), settings.validateSSL(), settings.cert(), settings.token())
+                new WebSocketConnection(settings.url(), settings.sslSettings(), settings.token())
                         .onOpen(this::onOpen)
                         .onClose(() -> foreground(getString(R.string.websocket_closed)))
                         .onBadRequest(this::onBadRequest)