feat: thread to coroutine (#36)

zipizigi · Jan 8, 2024 · a9397b6 · a9397b6
1 parent 45efdbe
commit a9397b6
Show file tree

Hide file tree

Showing 39 changed files with 847 additions and 824 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -44,6 +44,6 @@ jobs:
         uses: ScaCap/action-ktlint@master
         with:
           github_token: ${{ secrets.github_token }}
-          ktlint_version: 1.0.1
+          ktlint_version: 1.1.0
           file_glob: '!**/src/test/**'
           reporter: github-pr-check # github-pr-check,github-pr-review,github-check
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -45,15 +45,15 @@ android {
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
         getByName("debug") {
             isMinifyEnabled = false
             isShrinkResources = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
@@ -78,6 +78,7 @@ android {
 }
 
 dependencies {
+    implementation(libs.kotlin.coroutine)
 
     implementation(libs.androidx.appcompat)
     implementation(libs.material)

diff --git a/app/src/main/kotlin/me/zipi/navitotesla/AppExecutors.kt b/app/src/main/kotlin/me/zipi/navitotesla/AppExecutors.kt
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/AppRepository.kt b/app/src/main/kotlin/me/zipi/navitotesla/AppRepository.kt
@@ -1,7 +1,6 @@
 package me.zipi.navitotesla
 
-import android.content.Context
-import androidx.lifecycle.LiveData
+import androidx.room.withTransaction
 import me.zipi.navitotesla.api.TeslaApi
 import me.zipi.navitotesla.api.TeslaAuthApi
 import me.zipi.navitotesla.db.AppDatabase
@@ -15,65 +14,56 @@ import retrofit2.converter.gson.GsonConverterFactory
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
-class AppRepository private constructor(context: Context, private val database: AppDatabase) {
-    val teslaApi: TeslaApi
+class AppRepository private constructor(private val database: AppDatabase) {
+    val teslaApi: TeslaApi = Retrofit.Builder()
+        .baseUrl("https://owner-api.teslamotors.com")
+        .addConverterFactory(GsonConverterFactory.create())
+        .client(
+            OkHttpClient.Builder()
+                .connectTimeout(120, TimeUnit.SECONDS)
+                .readTimeout(120, TimeUnit.SECONDS)
+                .addInterceptor(Interceptor { chain: Interceptor.Chain ->
+                    val token = PreferencesUtil.loadTokenSync()
+                    val accessToken = token?.accessToken ?: ""
+                    val request = chain.request().newBuilder()
+                        .addHeader("User-Agent", "Navi_To_Tesla")
+                        .addHeader("Accept", "*/*")
+                        .addHeader("Content-Type", "application/json")
+                        .addHeader("Authorization", "Bearer $accessToken")
+                        .build()
+                    chain.proceed(request)
+                })
+                .addInterceptor(HttpRetryInterceptor(20))
+                .build()
+        )
+        .build().create(TeslaApi::class.java)
 
-    val teslaAuthApi: TeslaAuthApi
-
-    init {
-        teslaApi = Retrofit.Builder()
-            .baseUrl("https://owner-api.teslamotors.com")
-            .addConverterFactory(GsonConverterFactory.create())
-            .client(
-                OkHttpClient.Builder()
-                    .connectTimeout(120, TimeUnit.SECONDS)
-                    .readTimeout(120, TimeUnit.SECONDS)
-                    .addInterceptor(Interceptor { chain: Interceptor.Chain ->
-                        val token = PreferencesUtil.loadToken(context)
-                        val accessToken = token?.accessToken ?: ""
-                        val request = chain.request().newBuilder()
-                            .addHeader("User-Agent", "Navi_To_Tesla")
-                            .addHeader("Accept", "*/*")
-                            .addHeader("Content-Type", "application/json")
-                            .addHeader("Authorization", "Bearer $accessToken")
-                            .build()
-                        chain.proceed(request)
-                    })
-                    .addInterceptor(HttpRetryInterceptor(20))
-                    .build()
-            )
-            .build().create(TeslaApi::class.java)
-        teslaAuthApi = Retrofit.Builder()
-            .baseUrl("https://auth.tesla.com")
-            .addConverterFactory(GsonConverterFactory.create())
-            .client(
-                OkHttpClient.Builder()
-                    .connectTimeout(120, TimeUnit.SECONDS)
-                    .readTimeout(120, TimeUnit.SECONDS)
-                    .addInterceptor(Interceptor { chain: Interceptor.Chain ->
-                        val request = chain.request().newBuilder()
-                            .addHeader("User-Agent", "Navi_To_Tesla")
-                            .addHeader("Accept", "*/*")
-                            .addHeader("Content-Type", "application/json")
-                            .build()
-                        chain.proceed(request)
-                    })
-                    .addInterceptor(HttpRetryInterceptor(20))
-                    .build()
-            )
-            .build().create(TeslaAuthApi::class.java)
-    }
-    @Suppress("unused")
-    fun getPoi(poiName: String): LiveData<PoiAddressEntity> {
+    val teslaAuthApi: TeslaAuthApi = Retrofit.Builder()
+        .baseUrl("https://auth.tesla.com")
+        .addConverterFactory(GsonConverterFactory.create())
+        .client(
+            OkHttpClient.Builder()
+                .connectTimeout(120, TimeUnit.SECONDS)
+                .readTimeout(120, TimeUnit.SECONDS)
+                .addInterceptor(Interceptor { chain: Interceptor.Chain ->
+                    val request = chain.request().newBuilder()
+                        .addHeader("User-Agent", "Navi_To_Tesla")
+                        .addHeader("Accept", "*/*")
+                        .addHeader("Content-Type", "application/json")
+                        .build()
+                    chain.proceed(request)
+                })
+                .addInterceptor(HttpRetryInterceptor(20))
+                .build()
+        )
+        .build().create(TeslaAuthApi::class.java)
+
+    suspend fun getPoiSync(poiName: String): PoiAddressEntity? {
         return database.poiAddressDao().findPoi(poiName)
     }
 
-    fun getPoiSync(poiName: String): PoiAddressEntity? {
-        return database.poiAddressDao().findPoiSync(poiName)
-    }
-
-    fun savePoi(poiName: String, address: String, registered: Boolean) {
-        database.runInTransaction {
+    suspend fun savePoi(poiName: String, address: String, registered: Boolean) {
+        database.withTransaction {
             database.poiAddressDao().insertPoi(
                 PoiAddressEntity(
                     poi = poiName,
@@ -85,34 +75,35 @@ class AppRepository private constructor(context: Context, private val database:
         }
     }
 
-    fun clearExpiredPoi() {
+    suspend fun clearExpiredPoi() {
         // remove expire poi. (20% over)
         val expireDate: Long =
             (Date().time - PoiAddressEntity.expireDay * 1000 * 60 * 60 * 24 * 1.2).toLong()
         for (entity in database.poiAddressDao().findExpired(expireDate)) {
-            database.runInTransaction {
+            database.withTransaction {
                 database.poiAddressDao().delete(entity)
             }
         }
     }
 
-    fun clearAllPoi() {
-        database.runInTransaction {
+    suspend fun clearAllPoi() {
+        database.withTransaction {
             database.poiAddressDao().deleteAllNotRegistered()
         }
     }
 
     companion object {
-        private var instance: AppRepository? = null
-        fun getInstance(context: Context, database: AppDatabase): AppRepository {
-            if (instance == null) {
-                synchronized(AppRepository::class.java) {
-                    if (instance == null) {
-                        instance = AppRepository(context, database)
-                    }
+        private lateinit var instance: AppRepository
+        fun initialize(database: AppDatabase) {
+            if (!this::instance.isInitialized) {
+                synchronized(AppDatabase::class) {
+                    instance = AppRepository(database)
                 }
             }
-            return instance!!
+        }
+
+        fun getInstance(): AppRepository {
+            return instance
         }
     }
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/Application.kt b/app/src/main/kotlin/me/zipi/navitotesla/Application.kt
@@ -5,20 +5,23 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import me.zipi.navitotesla.background.TokenWorker
 import me.zipi.navitotesla.db.AppDatabase
 import me.zipi.navitotesla.util.AnalysisUtil
+import me.zipi.navitotesla.util.PreferencesUtil
 import me.zipi.navitotesla.util.RemoteConfigUtil
 
 class Application : Application() {
     override fun onCreate() {
         super.onCreate()
-        AppRepository.getInstance(this, database)
+        PreferencesUtil.initialize(this.applicationContext)
+        AppDatabase.initialize(this.applicationContext)
+        AppRepository.initialize(database)
         RemoteConfigUtil.initialize()
-        AnalysisUtil.initialize(this)
+        AnalysisUtil.initialize(this.applicationContext)
         if (!BuildConfig.DEBUG) {
             TokenWorker.startBackgroundWork(this)
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)
         }
     }
 
     private val database: AppDatabase
-        get() = AppDatabase.getInstance(this)
+        get() = AppDatabase.getInstance()
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/api/GithubApi.kt b/app/src/main/kotlin/me/zipi/navitotesla/api/GithubApi.kt
@@ -1,14 +1,14 @@
 package me.zipi.navitotesla.api
 
 import me.zipi.navitotesla.model.Github.Release
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Path
 
 interface GithubApi {
     @GET("/repos/{owner}/{repo}/releases?per_page=10")
-    fun getReleases(
+    suspend fun getReleases(
         @Path("owner") owner: String,
         @Path("repo") repo: String
-    ): Call<List<Release>>
+    ): Response<List<Release>>
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/api/KakaoMapApi.kt b/app/src/main/kotlin/me/zipi/navitotesla/api/KakaoMapApi.kt
@@ -1,13 +1,13 @@
 package me.zipi.navitotesla.api
 
 import me.zipi.navitotesla.model.KakaoMap
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Headers
 import retrofit2.http.POST
 import retrofit2.http.Query
 
 interface KakaoMapApi {
     @POST("/v2/local/search/keyword.json")
     @Headers("Accept: application/json")
-    fun search(@Query("query") query: String): Call<KakaoMap.Response<KakaoMap.Place>>
+    suspend fun search(@Query("query") query: String): Response<KakaoMap.Response<KakaoMap.Place>>
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/api/NaverMapApi.kt b/app/src/main/kotlin/me/zipi/navitotesla/api/NaverMapApi.kt
@@ -1,13 +1,13 @@
 package me.zipi.navitotesla.api
 
 import me.zipi.navitotesla.model.NaverMap
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Headers
 import retrofit2.http.POST
 import retrofit2.http.Query
 
 interface NaverMapApi {
     @POST("/search2/searchMore.naver")
     @Headers("Accept: application/json")
-    fun search(@Query("query") query: String): Call<NaverMap.Response>
+    suspend fun search(@Query("query") query: String): Response<NaverMap.Response>
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/api/TMapApi.kt b/app/src/main/kotlin/me/zipi/navitotesla/api/TMapApi.kt
@@ -1,13 +1,13 @@
 package me.zipi.navitotesla.api
 
 import me.zipi.navitotesla.model.TMap.SearchPoiResponse
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Headers
 import retrofit2.http.Query
 
 interface TMapApi {
     @GET("/tmap/pois")
     @Headers("Accept: application/json")
-    fun search(@Query("searchKeyword") query: String): Call<SearchPoiResponse>
+    suspend fun search(@Query("searchKeyword") query: String): Response<SearchPoiResponse>
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/api/TeslaApi.kt b/app/src/main/kotlin/me/zipi/navitotesla/api/TeslaApi.kt
@@ -3,19 +3,19 @@ package me.zipi.navitotesla.api
 import me.zipi.navitotesla.model.ShareRequest
 import me.zipi.navitotesla.model.TeslaApiResponse
 import me.zipi.navitotesla.model.Vehicle
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface TeslaApi {
     @GET("/api/1/vehicles")
-    fun vehicles(): Call<TeslaApiResponse.ListType<Vehicle>>
+    suspend fun vehicles(): Response<TeslaApiResponse.ListType<Vehicle>>
 
     @POST("/api/1/vehicles/{id}/command/share")
-    fun share(
+    suspend fun share(
         @Path("id") id: Long,
         @Body request: ShareRequest
-    ): Call<TeslaApiResponse.ObjectType<TeslaApiResponse.Result>>
+    ): Response<TeslaApiResponse.ObjectType<TeslaApiResponse.Result>>
 }
diff --git a/app/src/main/kotlin/me/zipi/navitotesla/api/TeslaAuthApi.kt b/app/src/main/kotlin/me/zipi/navitotesla/api/TeslaAuthApi.kt
@@ -2,11 +2,11 @@ package me.zipi.navitotesla.api
 
 import me.zipi.navitotesla.model.TeslaRefreshTokenRequest
 import me.zipi.navitotesla.model.Token
-import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface TeslaAuthApi {
     @POST("/oauth2/v3/token")
-    fun refreshAccessToken(@Body request: TeslaRefreshTokenRequest): Call<Token>
+    suspend fun refreshAccessToken(@Body request: TeslaRefreshTokenRequest): Response<Token>
 }