From cebf7f4afeda8a5b343de719f95d01a5bea750e3 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Wed, 4 Jan 2023 23:27:10 +0100
Subject: [PATCH] Remove nullability of ClientFactory functions returns

---
 .../main/java/com/github/gotify/api/ClientFactory.kt   | 10 +++++-----
 .../com/github/gotify/init/InitializationActivity.kt   |  8 ++++----
 .../main/java/com/github/gotify/login/LoginActivity.kt |  4 ++--
 .../java/com/github/gotify/service/WebSocketService.kt |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/api/ClientFactory.kt b/app/src/main/java/com/github/gotify/api/ClientFactory.kt
index 15c02f8..8ccce0a 100644
--- a/app/src/main/java/com/github/gotify/api/ClientFactory.kt
+++ b/app/src/main/java/com/github/gotify/api/ClientFactory.kt
@@ -39,22 +39,22 @@ internal object ClientFactory {
             arrayOf("clientTokenHeader"),
             "$baseUrl/", sslSettings
         )
-        val tokenAuth = client.apiAuthorizations["clientTokenHeader"] as ApiKeyAuth?
-        tokenAuth!!.apiKey = token
+        val tokenAuth = client.apiAuthorizations["clientTokenHeader"] as ApiKeyAuth
+        tokenAuth.apiKey = token
         return client
     }
 
-    fun versionApi(baseUrl: String, sslSettings: SSLSettings): VersionApi? {
+    fun versionApi(baseUrl: String, sslSettings: SSLSettings): VersionApi {
         return unauthorized(baseUrl, sslSettings).createService(VersionApi::class.java)
     }
 
-    fun userApiWithToken(settings: Settings): UserApi? {
+    fun userApiWithToken(settings: Settings): UserApi {
         return clientToken(settings.url, settings.sslSettings(), settings.token)
             .createService(UserApi::class.java)
     }
 
     private fun defaultClient(
-        authentications: Array<String?>,
+        authentications: Array<String>,
         baseUrl: String,
         sslSettings: SSLSettings
     ): ApiClient {
diff --git a/app/src/main/java/com/github/gotify/init/InitializationActivity.kt b/app/src/main/java/com/github/gotify/init/InitializationActivity.kt
index 10939b4..ef4f2d5 100644
--- a/app/src/main/java/com/github/gotify/init/InitializationActivity.kt
+++ b/app/src/main/java/com/github/gotify/init/InitializationActivity.kt
@@ -59,8 +59,8 @@ internal class InitializationActivity : AppCompatActivity() {
 
     private fun tryAuthenticate() {
         ClientFactory.userApiWithToken(settings)
-                ?.currentUser()
-                ?.enqueue(
+                .currentUser()
+                .enqueue(
                     Callback.callInUI(this, { if (it != null) authenticated(it) }) { apiException ->
                         failed(apiException)
                     }
@@ -124,7 +124,7 @@ internal class InitializationActivity : AppCompatActivity() {
         errorCallback: Callback.ErrorCallback
     ) {
         ClientFactory.versionApi(settings.url, settings.sslSettings())
-            ?.version
-            ?.enqueue(Callback.callInUI(this, callback, errorCallback))
+            .version
+            .enqueue(Callback.callInUI(this, callback, errorCallback))
     }
 }
diff --git a/app/src/main/java/com/github/gotify/login/LoginActivity.kt b/app/src/main/java/com/github/gotify/login/LoginActivity.kt
index 02b0bf8..7167a68 100644
--- a/app/src/main/java/com/github/gotify/login/LoginActivity.kt
+++ b/app/src/main/java/com/github/gotify/login/LoginActivity.kt
@@ -102,8 +102,8 @@ internal class LoginActivity : AppCompatActivity() {
 
         try {
             ClientFactory.versionApi(url, tempSslSettings())
-                ?.version
-                ?.enqueue(Callback.callInUI(this, onValidUrl(url), onInvalidUrl(url)))
+                .version
+                .enqueue(Callback.callInUI(this, onValidUrl(url), onInvalidUrl(url)))
         } catch (e: Exception) {
             binding.checkurlProgress.visibility = View.GONE
             binding.checkurl.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/github/gotify/service/WebSocketService.kt b/app/src/main/java/com/github/gotify/service/WebSocketService.kt
index 3456261..8a89cc4 100644
--- a/app/src/main/java/com/github/gotify/service/WebSocketService.kt
+++ b/app/src/main/java/com/github/gotify/service/WebSocketService.kt
@@ -112,8 +112,8 @@ internal class WebSocketService : Service() {
             getString(R.string.websocket_closed), getString(R.string.websocket_reconnect)
         )
         ClientFactory.userApiWithToken(settings)
-            ?.currentUser()
-            ?.enqueue(Callback.call({ doReconnect() }) { exception ->
+            .currentUser()
+            .enqueue(Callback.call({ doReconnect() }) { exception ->
                 if (exception.code == 401) {
                     showForegroundNotification(
                         getString(R.string.user_action),