Kotlin Coroutinesの利用

Author: koji-1009

studyplus-android-sdk2/build.gradle

@@ -33,6 +33,8 @@ android {
         version = versionName
         group = "jp.studyplus.android.sdk"
 
+        consumerProguardFiles 'lib-proguard-rules.txt'
+
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -44,9 +46,6 @@ android {
             initWith(buildTypes.debug)
         }
         release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
             buildConfigField "String", "API_ENDPOINT", quote("https://external-api.studyplus.jp")
         }
     }
@@ -66,19 +65,18 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
 
     implementation 'com.google.code.gson:gson:2.8.5'
-
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
 
     def retrofit = "2.4.0"
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit"
     testImplementation "com.squareup.retrofit2:retrofit-mock:$retrofit"
 
-    implementation "io.reactivex.rxjava2:rxjava:2.2.2"
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
 
     testImplementation 'junit:junit:4.12'
 }

studyplus-android-sdk2/proguard-rules.pro renamed to studyplus-android-sdk2/lib-proguard-rules.pro

@@ -20,5 +20,14 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep public class jp.studyplus.android.sdk.* { public *; }
--keep public class jp.studyplus.android.sdk.record.** { public *; }
+# ServiceLoader support
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembernames class kotlinx.** {
+    volatile <fields>;
+}
+
+# Network Rsponse
+-keepnames class jp.studyplus.android.sdk.internal.api.response.** { *; }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/Studyplus.kt

@@ -4,12 +4,11 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 import jp.studyplus.android.sdk.internal.api.ApiClient
 import jp.studyplus.android.sdk.internal.api.CertificationStore
 import jp.studyplus.android.sdk.internal.auth.AuthTransit
 import jp.studyplus.android.sdk.record.StudyRecord
+import kotlinx.coroutines.runBlocking
 
 class Studyplus private constructor() {
 
@@ -72,13 +71,15 @@ class Studyplus private constructor() {
             throw IllegalStateException("Please check your application's authentication before this method call.")
         }
 
-        ApiClient.apiClient.postStudyRecords(context, studyRecord)
-                .subscribeOn(Schedulers.newThread())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        { listener?.onResult(success = true, recordId = it.recordId) },
-                        { listener?.onResult(success = false, throwable = it) }
-                )
+        runBlocking {
+            try {
+                val deferred = ApiClient.postStudyRecords(context, studyRecord)
+                val result = deferred.await()
+                listener?.onResult(success = true, recordId = result.recordId)
+            } catch (t: Throwable) {
+                listener?.onResult(success = false, throwable = t)
+            }
+        }
     }
 
     companion object {

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/ApiClient.kt

@@ -1,30 +1,14 @@
 package jp.studyplus.android.sdk.internal.api
 
 import android.content.Context
-import io.reactivex.Observable
 import jp.studyplus.android.sdk.internal.api.response.PostStudyRecordsResponse
 import jp.studyplus.android.sdk.record.StudyRecord
-import retrofit2.Retrofit
+import kotlinx.coroutines.Deferred
 
-internal class ApiClient
-constructor(retrofit: Retrofit) {
+internal object ApiClient {
+    private val apiService by lazy { ApiManager.retrofit.create(ApiService::class.java) }
 
-    companion object {
-        val apiClient by lazy { ApiClient(ApiManager.retrofit) }
-        lateinit var apiService: ApiService
-
-        private fun getOAuthAccessToken(context: Context): Observable<String> {
-            return Observable.just(CertificationStore.create(context))
-                    .map { it.apiCertification() }
-                    .map { "OAuth $it" }
-        }
-    }
-
-    init {
-        apiService = retrofit.create(ApiService::class.java)
-    }
-
-    fun postStudyRecords(context: Context, studyRecord: StudyRecord): Observable<PostStudyRecordsResponse> {
-        return getOAuthAccessToken(context).flatMap { apiService.postStudyRecords(it, studyRecord) }
+    fun postStudyRecords(context: Context, studyRecord: StudyRecord): Deferred<PostStudyRecordsResponse> {
+        return apiService.postStudyRecords(CertificationStore.create(context).getOAuthAccessToken(), studyRecord)
     }
-}
+}

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/ApiManager.kt

@@ -1,28 +1,28 @@
 package jp.studyplus.android.sdk.internal.api
 
+import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import jp.studyplus.android.sdk.BuildConfig
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 internal object ApiManager {
 
-    private val client by lazy {
+    private val client: OkHttpClient by lazy {
         OkHttpClient.Builder()
                 .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
                 .build()
     }
 
-    val retrofit by lazy {
+    val retrofit: Retrofit by lazy {
         Retrofit.Builder()
                 .client(client)
                 .baseUrl(BuildConfig.API_ENDPOINT)
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(CoroutineCallAdapterFactory())
                 .addConverterFactory(GsonConverterFactory.create())
-                .build()!!
+                .build()
     }
 }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/ApiService.kt

@@ -1,9 +1,12 @@
 package jp.studyplus.android.sdk.internal.api
 
-import io.reactivex.Observable
 import jp.studyplus.android.sdk.internal.api.response.PostStudyRecordsResponse
 import jp.studyplus.android.sdk.record.StudyRecord
-import retrofit2.http.*
+import kotlinx.coroutines.Deferred
+import retrofit2.http.Body
+import retrofit2.http.Header
+import retrofit2.http.Headers
+import retrofit2.http.POST
 
 internal interface ApiService {
     @Headers(value = [
@@ -13,6 +16,6 @@ internal interface ApiService {
     @POST("/v1/study_records")
     fun postStudyRecords(
             @Header("Authorization") oauth: String,
-            @Body studyRecord: StudyRecord)
-            : Observable<PostStudyRecordsResponse>
+            @Body studyRecord: StudyRecord
+    ): Deferred<PostStudyRecordsResponse>
 }

studyplus-android-sdk2/src/main/java/jp/studyplus/android/sdk/internal/api/CertificationStore.kt

@@ -29,7 +29,10 @@ private constructor(private val preferences: SharedPreferences) {
         return !token.isNullOrEmpty()
     }
 
-    fun apiCertification(): String = preferences.getString(KEY_ACCESS_TOKEN, "")
+    fun getOAuthAccessToken(): String {
+        val certification = preferences.getString(KEY_ACCESS_TOKEN, "")
+        return "OAuth $certification"
+    }
 
     fun update(data: Intent) {
         val code = data.getStringExtra(EXTRA_SP_AUTH_RESULT_CODE).orEmpty()