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

Remove nullability of ClientFactory functions returns

Browse Source
This commit is contained in:
Niko Diamadis
2023-01-04 23:27:10 +01:00
parent 50a21abf93
commit cebf7f4afe
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,22 +39,22 @@ internal object ClientFactory {
arrayOf("clientTokenHeader"), arrayOf("clientTokenHeader"),
"$baseUrl/", sslSettings "$baseUrl/", sslSettings
) )
val tokenAuth = client.apiAuthorizations["clientTokenHeader"] as ApiKeyAuth? val tokenAuth = client.apiAuthorizations["clientTokenHeader"] as ApiKeyAuth
tokenAuth!!.apiKey = token tokenAuth.apiKey = token
return client return client
} }
fun versionApi(baseUrl: String, sslSettings: SSLSettings): VersionApi? { fun versionApi(baseUrl: String, sslSettings: SSLSettings): VersionApi {
return unauthorized(baseUrl, sslSettings).createService(VersionApi::class.java) 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) return clientToken(settings.url, settings.sslSettings(), settings.token)
.createService(UserApi::class.java) .createService(UserApi::class.java)
} }
private fun defaultClient( private fun defaultClient(
authentications: Array<String?>, authentications: Array<String>,
baseUrl: String, baseUrl: String,
sslSettings: SSLSettings sslSettings: SSLSettings
): ApiClient { ): ApiClient {

8
app/src/main/java/com/github/gotify/init/InitializationActivity.kt
View File

@@ -59,8 +59,8 @@ internal class InitializationActivity : AppCompatActivity() {
private fun tryAuthenticate() { private fun tryAuthenticate() {
ClientFactory.userApiWithToken(settings) ClientFactory.userApiWithToken(settings)
?.currentUser() .currentUser()
?.enqueue( .enqueue(
Callback.callInUI(this, { if (it != null) authenticated(it) }) { apiException -> Callback.callInUI(this, { if (it != null) authenticated(it) }) { apiException ->
failed(apiException) failed(apiException)
} }
@@ -124,7 +124,7 @@ internal class InitializationActivity : AppCompatActivity() {
errorCallback: Callback.ErrorCallback errorCallback: Callback.ErrorCallback
) { ) {
ClientFactory.versionApi(settings.url, settings.sslSettings()) ClientFactory.versionApi(settings.url, settings.sslSettings())
?.version .version
?.enqueue(Callback.callInUI(this, callback, errorCallback)) .enqueue(Callback.callInUI(this, callback, errorCallback))
} }
} }

4
app/src/main/java/com/github/gotify/login/LoginActivity.kt
View File

@@ -102,8 +102,8 @@ internal class LoginActivity : AppCompatActivity() {
try { try {
ClientFactory.versionApi(url, tempSslSettings()) ClientFactory.versionApi(url, tempSslSettings())
?.version .version
?.enqueue(Callback.callInUI(this, onValidUrl(url), onInvalidUrl(url))) .enqueue(Callback.callInUI(this, onValidUrl(url), onInvalidUrl(url)))
} catch (e: Exception) { } catch (e: Exception) {
binding.checkurlProgress.visibility = View.GONE binding.checkurlProgress.visibility = View.GONE
binding.checkurl.visibility = View.VISIBLE binding.checkurl.visibility = View.VISIBLE

4
app/src/main/java/com/github/gotify/service/WebSocketService.kt
View File

@@ -112,8 +112,8 @@ internal class WebSocketService : Service() {
getString(R.string.websocket_closed), getString(R.string.websocket_reconnect) getString(R.string.websocket_closed), getString(R.string.websocket_reconnect)
) )
ClientFactory.userApiWithToken(settings) ClientFactory.userApiWithToken(settings)
?.currentUser() .currentUser()
?.enqueue(Callback.call({ doReconnect() }) { exception -> .enqueue(Callback.call({ doReconnect() }) { exception ->
if (exception.code == 401) { if (exception.code == 401) {
showForegroundNotification( showForegroundNotification(
getString(R.string.user_action), getString(R.string.user_action),