Update SDK

Author: koji-1009

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

@@ -5,105 +5,89 @@ import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
-import jp.studyplus.android.sdk.internal.api.ApiClient
-import jp.studyplus.android.sdk.internal.api.CertificationStore
-import jp.studyplus.android.sdk.internal.api.PostCallback
-import jp.studyplus.android.sdk.internal.auth.AuthTransit
+import jp.studyplus.android.sdk.internal.api.Repository
+import jp.studyplus.android.sdk.internal.auth.Preference
+import jp.studyplus.android.sdk.internal.auth.Transit
 import jp.studyplus.android.sdk.record.StudyRecord
-import java.io.IOException
 
-class Studyplus private constructor() {
+class Studyplus(
+    context: Context,
+    private val consumerKey: String,
+    private val consumerSecret: String,
+) {
 
-    private var consumerKey: String? = null
-    private var consumerSecret: String? = null
+    private val store = Preference(context)
 
     /**
-     * ConsumerKey, ConsumerSecretKeyをStudyplus SDKに設定
-     *
-     * @since 2.0.0
-     */
-    fun setup(consumerKey: String, consumerSecret: String) {
-        this.consumerKey = consumerKey
-        this.consumerSecret = consumerSecret
-    }
-
-    /**
-     * [setup]で設定されたConsumerKeyがすでに認証済みかどうかを判定
+     * 設定されたConsumerKeyがすでに認証済みかどうかを判定
      *
      * @return true: 認証済み、 false: 未認証
      * @since 2.0.0
      */
-    fun isAuthenticated(context: Context): Boolean =
-        CertificationStore.create(context.applicationContext).isAuthenticated()
+    @SuppressWarnings("unused")
+    fun isAuthenticated() = store.isAuthenticated
 
     /**
-     * [setup]で設定されたConsumerKey, ConsumerSecretKeyによるStudyplus連携認証
+     * 設定されたConsumerKey, ConsumerSecretKeyによるStudyplus連携認証
      *
      * @since 2.0.0
      */
-    fun startAuth(activity: Activity, requestCode: Int) {
-        check(consumerKey != null && consumerSecret != null) { "Please call setup method before this method call." }
-
-        AuthTransit(consumerKey!!, consumerSecret!!).start(activity, requestCode)
-    }
+    @SuppressWarnings("unused")
+    fun startAuth(activity: Activity, requestCode: Int) =
+        Transit(consumerKey, consumerSecret).start(activity, requestCode)
 
     /**
      * [startAuth]の結果をStudyplusSDKに保存
      *
      * @since 2.0.0
      */
-    fun setAuthResult(context: Context, data: Intent?) {
-        if (data == null) {
-            Log.e("StudyplusSDK", "The data is null. Please check your code. If the data that received from Studyplus app is null, please contact Studyplus Dev team.")
-            return
-        }
-
-        CertificationStore.create(context.applicationContext).update(data)
-    }
+    @SuppressWarnings("unused")
+    fun setAuthResult(data: Intent) = store.update(data)
 
     /**
      * Studyplus連携認証解除
      *
      * @since 2.6.1
      */
-    fun cancelAuth(context: Context) {
-        CertificationStore.remove(context)
-    }
+    @SuppressWarnings("unused")
+    fun cancelAuth() = store.remove()
 
     /**
      * Studyplusとの認証情報を利用して学習記録をStudyplusへ投稿
      *
      * @since 2.0.0
      */
-    fun postRecord(context: Context, studyRecord: StudyRecord, listener: OnPostRecordListener?) {
-        check(isAuthenticated(context)) { "Please check your application's authentication before this method call." }
+    @SuppressWarnings("unused")
+    fun postRecord(record: StudyRecord, callback: PostCallback) {
+        if (!isAuthenticated()) {
+            callback.onFailure(StudyplusError.LoginRequired)
+            return
+        }
 
-        ApiClient.postStudyRecords(context, studyRecord, object : PostCallback {
-            override fun onSuccess(recordId: Long?) {
-                runOnUiThread {
-                    listener?.onResult(success = true, recordId = recordId)
+        Repository().post(
+            store = store,
+            record = record,
+            callback = object : PostCallback {
+                override fun onSuccess() {
+                    runOnUiThread {
+                        callback.onSuccess()
+                    }
                 }
-            }
 
-            override fun onFailure(e: IOException) {
-                runOnUiThread {
-                    listener?.onResult(success = false, throwable = e)
+                override fun onFailure(e: StudyplusError) {
+                    runOnUiThread {
+                        callback.onFailure(e)
+                    }
                 }
-            }
-        })
+            })
     }
 
     private fun runOnUiThread(task: () -> Unit) {
         Handler(Looper.getMainLooper()).post { task() }
     }
+}
 
-    companion object {
-        interface OnPostRecordListener {
-            fun onResult(success: Boolean, recordId: Long? = null, throwable: Throwable? = null)
-        }
-
-        @JvmStatic
-        val instance by lazy { Studyplus() }
-    }
+interface PostCallback {
+    fun onSuccess()
+    fun onFailure(e: StudyplusError)
 }

studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/StudyplusError.kt

@@ -0,0 +1,18 @@
+package jp.studyplus.android.sdk
+
+sealed class StudyplusError {
+    class IOException(val throwable: Throwable) : StudyplusError();
+    object BadRequest : StudyplusError();
+    object LoginRequired : StudyplusError();
+    object ServerError : StudyplusError();
+    object Unknown : StudyplusError();
+
+    companion object {
+        fun byCode(code: Int) = when (code) {
+            400 -> BadRequest
+            401 -> LoginRequired
+            in 500..599 -> ServerError
+            else -> Unknown
+        }
+    }
+}

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

@@ -3,7 +3,7 @@ package jp.studyplus.android.sdk.internal.api
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
-internal object ApiManager {
+internal object Manager {
     val client: OkHttpClient = OkHttpClient.Builder()
         .connectTimeout(60, TimeUnit.SECONDS)
         .writeTimeout(60, TimeUnit.SECONDS)

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

@@ -0,0 +1,46 @@
+package jp.studyplus.android.sdk.internal.api
+
+import jp.studyplus.android.sdk.BuildConfig
+import jp.studyplus.android.sdk.PostCallback
+import jp.studyplus.android.sdk.StudyplusError
+import jp.studyplus.android.sdk.internal.auth.Preference
+import jp.studyplus.android.sdk.record.StudyRecord
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import java.io.IOException
+
+internal class Repository(private val client: OkHttpClient = Manager.client) {
+    fun post(store: Preference, record: StudyRecord, callback: PostCallback) {
+        val body = record
+            .json()
+            .toRequestBody("application/json; charset=utf-8".toMediaType())
+
+        val request = Request.Builder()
+            .header("Accept", "application/json")
+            .header("Content-type", "application/json")
+            .header("Authorization", "OAuth ${store.accessToken}")
+            .url("${BuildConfig.API_ENDPOINT}/v1/study_records")
+            .post(body)
+            .build()
+
+        client.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                callback.onFailure(StudyplusError.IOException(e))
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                if (!response.isSuccessful) {
+                    callback.onFailure(StudyplusError.byCode(response.code))
+                    return
+                }
+
+                callback.onSuccess()
+            }
+        })
+    }
+}