From 2397e2eea9c9a373c1117942416c39e482f02b0b Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Tue, 18 Jul 2023 00:01:04 +0200 Subject: [PATCH] Update Kotlinter to 3.15.0 --- .editorconfig | 2 ++ app/build.gradle | 2 +- app/src/main/kotlin/com/github/gotify/Utils.kt | 12 ++++++------ app/src/main/kotlin/com/github/gotify/api/Api.kt | 2 +- .../kotlin/com/github/gotify/api/ApiException.kt | 2 +- .../main/kotlin/com/github/gotify/api/Callback.kt | 5 ++++- .../main/kotlin/com/github/gotify/api/CertUtils.kt | 2 +- .../kotlin/com/github/gotify/login/LoginActivity.kt | 2 +- .../com/github/gotify/messages/ListMessageAdapter.kt | 2 +- .../com/github/gotify/messages/MessagesActivity.kt | 2 +- .../com/github/gotify/picasso/PicassoHandler.kt | 4 ++-- .../com/github/gotify/service/WebSocketConnection.kt | 6 +++--- .../com/github/gotify/service/WebSocketService.kt | 2 +- 13 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1b8d08e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,2 @@ +[*.{kt,kts}] +ktlint_code_style = android \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a9c92a4..3628391 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'org.jmailen.kotlinter' version '3.13.0' + id 'org.jmailen.kotlinter' version '3.15.0' } android { diff --git a/app/src/main/kotlin/com/github/gotify/Utils.kt b/app/src/main/kotlin/com/github/gotify/Utils.kt index 07193e9..772d562 100644 --- a/app/src/main/kotlin/com/github/gotify/Utils.kt +++ b/app/src/main/kotlin/com/github/gotify/Utils.kt @@ -17,12 +17,6 @@ import com.google.android.material.snackbar.Snackbar import com.google.gson.Gson import com.squareup.picasso.Picasso.LoadedFrom import com.squareup.picasso.Target -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import okio.Buffer -import org.threeten.bp.OffsetDateTime import java.io.BufferedReader import java.io.IOException import java.io.InputStream @@ -31,6 +25,12 @@ import java.net.MalformedURLException import java.net.URI import java.net.URISyntaxException import java.net.URL +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import okio.Buffer +import org.threeten.bp.OffsetDateTime internal object Utils { val JSON: Gson = JSON().gson diff --git a/app/src/main/kotlin/com/github/gotify/api/Api.kt b/app/src/main/kotlin/com/github/gotify/api/Api.kt index 7b09a5a..a6640f6 100644 --- a/app/src/main/kotlin/com/github/gotify/api/Api.kt +++ b/app/src/main/kotlin/com/github/gotify/api/Api.kt @@ -1,7 +1,7 @@ package com.github.gotify.api -import retrofit2.Call import java.io.IOException +import retrofit2.Call internal object Api { @Throws(ApiException::class) diff --git a/app/src/main/kotlin/com/github/gotify/api/ApiException.kt b/app/src/main/kotlin/com/github/gotify/api/ApiException.kt index e746bfb..91f2c98 100644 --- a/app/src/main/kotlin/com/github/gotify/api/ApiException.kt +++ b/app/src/main/kotlin/com/github/gotify/api/ApiException.kt @@ -1,7 +1,7 @@ package com.github.gotify.api -import retrofit2.Response import java.io.IOException +import retrofit2.Response internal class ApiException : Exception { var body: String = "" diff --git a/app/src/main/kotlin/com/github/gotify/api/Callback.kt b/app/src/main/kotlin/com/github/gotify/api/Callback.kt index 8c1e1c8..0ef273c 100644 --- a/app/src/main/kotlin/com/github/gotify/api/Callback.kt +++ b/app/src/main/kotlin/com/github/gotify/api/Callback.kt @@ -51,7 +51,10 @@ internal class Callback private constructor( ) } - fun call(onSuccess: SuccessCallback = SuccessCallback {}, onError: ErrorCallback = ErrorCallback {}): retrofit2.Callback { + fun call( + onSuccess: SuccessCallback = SuccessCallback {}, + onError: ErrorCallback = ErrorCallback {} + ): retrofit2.Callback { return RetrofitCallback(merge(of(onSuccess, onError), errorCallback())) } diff --git a/app/src/main/kotlin/com/github/gotify/api/CertUtils.kt b/app/src/main/kotlin/com/github/gotify/api/CertUtils.kt index f75cfc7..60a295b 100644 --- a/app/src/main/kotlin/com/github/gotify/api/CertUtils.kt +++ b/app/src/main/kotlin/com/github/gotify/api/CertUtils.kt @@ -4,7 +4,6 @@ import android.annotation.SuppressLint import com.github.gotify.SSLSettings import com.github.gotify.Utils import com.github.gotify.log.Log -import okhttp3.OkHttpClient import java.io.IOException import java.security.GeneralSecurityException import java.security.KeyStore @@ -16,6 +15,7 @@ import javax.net.ssl.SSLContext import javax.net.ssl.TrustManager import javax.net.ssl.TrustManagerFactory import javax.net.ssl.X509TrustManager +import okhttp3.OkHttpClient internal object CertUtils { @SuppressLint("CustomX509TrustManager") diff --git a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt b/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt index ac31707..402ffd0 100644 --- a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt +++ b/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt @@ -31,8 +31,8 @@ import com.github.gotify.log.LogsActivity import com.github.gotify.log.UncaughtExceptionHandler import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText -import okhttp3.HttpUrl import java.security.cert.X509Certificate +import okhttp3.HttpUrl internal class LoginActivity : AppCompatActivity() { companion object { diff --git a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt index 0304528..04d092f 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt @@ -26,9 +26,9 @@ import com.github.gotify.databinding.MessageItemCompactBinding import com.github.gotify.messages.provider.MessageWithImage import com.squareup.picasso.Picasso import io.noties.markwon.Markwon -import org.threeten.bp.OffsetDateTime import java.text.DateFormat import java.util.Date +import org.threeten.bp.OffsetDateTime internal class ListMessageAdapter( private val context: Context, diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt index d535cde..927bdca 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt @@ -56,9 +56,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.navigation.NavigationView import com.google.android.material.snackbar.BaseTransientBottomBar.BaseCallback import com.google.android.material.snackbar.Snackbar +import java.io.IOException import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import java.io.IOException internal class MessagesActivity : AppCompatActivity(), diff --git a/app/src/main/kotlin/com/github/gotify/picasso/PicassoHandler.kt b/app/src/main/kotlin/com/github/gotify/picasso/PicassoHandler.kt index bddc3a4..1a80bdb 100644 --- a/app/src/main/kotlin/com/github/gotify/picasso/PicassoHandler.kt +++ b/app/src/main/kotlin/com/github/gotify/picasso/PicassoHandler.kt @@ -11,10 +11,10 @@ import com.github.gotify.client.model.Application import com.github.gotify.log.Log import com.squareup.picasso.OkHttp3Downloader import com.squareup.picasso.Picasso -import okhttp3.Cache -import okhttp3.OkHttpClient import java.io.File import java.io.IOException +import okhttp3.Cache +import okhttp3.OkHttpClient internal class PicassoHandler(private val context: Context, private val settings: Settings) { companion object { diff --git a/app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt b/app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt index f0b80ec..9ff0e4e 100644 --- a/app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt +++ b/app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt @@ -10,15 +10,15 @@ import com.github.gotify.Utils import com.github.gotify.api.CertUtils import com.github.gotify.client.model.Message import com.github.gotify.log.Log +import java.util.Calendar +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicLong import okhttp3.HttpUrl import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import okhttp3.WebSocket import okhttp3.WebSocketListener -import java.util.Calendar -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicLong internal class WebSocketConnection( private val baseUrl: String, diff --git a/app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt b/app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt index 108d054..de63a91 100644 --- a/app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt +++ b/app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt @@ -141,7 +141,7 @@ internal class WebSocketService : Service() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationSupport.createChannels( this, - (this.getSystemService(NOTIFICATION_SERVICE) as NotificationManager), + (getSystemService(NOTIFICATION_SERVICE) as NotificationManager), apps ) }