Merge pull request #34 from studyplus/v3.0.0

v3.0.0

Author: koji-1009

Gemfile.lock

@@ -13,7 +13,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.2.2)
+    danger (8.2.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -25,7 +25,7 @@ GEM
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
-      terminal-table (~> 1)
+      terminal-table (>= 1, < 4)
     danger-android_lint (0.0.8)
       danger-plugin-api (~> 1.0)
       oga
@@ -64,7 +64,7 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
+    terminal-table (3.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     unicode-display_width (1.7.0)
 

build.gradle

@@ -2,12 +2,12 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.30'
+        kotlin_version = '1.4.31'
     }
     ext.versions = [
-            'compileSdk': 29,
+            'compileSdk': 30,
             'minSdk'    : 21,
-            'targetSdk' : 29,
+            'targetSdk' : 30,
     ]
     repositories {
         google()

sdk-example-kt/build.gradle

@@ -13,6 +13,8 @@ android {
     }
     buildTypes {
         release {
+            signingConfig signingConfigs.debug
+
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -28,8 +30,4 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
-
-    testImplementation "junit:junit:4.13"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

sdk-example-kt/src/androidTest/java/jp/studyplus/android/sdk_example_kt/ExampleInstrumentedTest.kt

@@ -8,7 +8,9 @@ import android.view.View
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import jp.studyplus.android.sdk.PostCallback
 import jp.studyplus.android.sdk.Studyplus
+import jp.studyplus.android.sdk.StudyplusError
 import jp.studyplus.android.sdk.record.StudyRecord
 import jp.studyplus.android.sdk.record.StudyRecordAmountTotal
 
@@ -18,19 +20,22 @@ class MainActivity : AppCompatActivity() {
         const val REQUEST_CODE_AUTH = 1
     }
 
+    private val instance by lazy {
+        Studyplus(
+            context = this,
+            consumerKey = getString(R.string.consumer_key),
+            consumerSecret = getString(R.string.consumer_secret),
+        )
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        Studyplus.instance.setup(
-            getString(R.string.consumer_key),
-            getString(R.string.consumer_secret)
-        )
-
         findViewById<View>(R.id.start_auth)?.apply {
             setOnClickListener {
                 try {
-                    Studyplus.instance.startAuth(this@MainActivity, REQUEST_CODE_AUTH)
+                    instance.startAuth(this@MainActivity, REQUEST_CODE_AUTH)
                 } catch (e: ActivityNotFoundException) {
                     e.printStackTrace()
                     Toast.makeText(context, "Need for Studyplus 5.+", Toast.LENGTH_LONG).show()
@@ -40,7 +45,7 @@ class MainActivity : AppCompatActivity() {
 
         findViewById<View>(R.id.cancel_auth)?.apply {
             setOnClickListener {
-                Studyplus.instance.cancelAuth(this@MainActivity)
+                instance.cancelAuth()
                 updateAuthText()
             }
         }
@@ -52,19 +57,15 @@ class MainActivity : AppCompatActivity() {
                     amount = StudyRecordAmountTotal(30),
                     comment = "勉強した！！！"
                 )
-                Studyplus.instance.postRecord(this@MainActivity, record,
-                    object : Studyplus.Companion.OnPostRecordListener {
-                        override fun onResult(success: Boolean, recordId: Long?, throwable: Throwable?) {
-                            if (success) {
-                                Toast.makeText(context, "Post Study Record!! ($recordId)", Toast.LENGTH_LONG).show()
-                            } else {
-                                throwable?.apply {
-                                    Toast.makeText(context, "error!!", Toast.LENGTH_LONG).show()
-                                    printStackTrace()
-                                }
-                            }
-                        }
-                    })
+                instance.postRecord(record, object : PostCallback {
+                    override fun onSuccess() {
+                        Toast.makeText(context, "Post Study Record!!", Toast.LENGTH_LONG).show()
+                    }
+
+                    override fun onFailure(e: StudyplusError) {
+                        Toast.makeText(context, "error!!", Toast.LENGTH_LONG).show()
+                    }
+                })
             }
         }
     }
@@ -76,18 +77,24 @@ class MainActivity : AppCompatActivity() {
 
     private fun updateAuthText() {
         val authStatusText = findViewById<TextView>(R.id.auth_status)
-        authStatusText.text = when (Studyplus.instance.isAuthenticated(this)) {
+        authStatusText.text = when (instance.isAuthenticated()) {
             true -> getString(R.string.status_authenticated)
             else -> getString(R.string.status_unauthenticated)
         }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != RESULT_OK || data == null) {
+            Toast.makeText(this, "error!!", Toast.LENGTH_LONG).show()
+            return
+        }
+
         when (requestCode) {
             REQUEST_CODE_AUTH -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    Studyplus.instance.setAuthResult(this, data)
-                    Toast.makeText(this@MainActivity, "Success!!", Toast.LENGTH_LONG).show()
+                    instance.setAuthResult(data)
+                    Toast.makeText(this, "Success!!", Toast.LENGTH_LONG).show()
                 }
             }
         }

sdk-example-kt/src/main/java/jp/studyplus/android/sdk_example_kt/MainActivity.kt

@@ -38,15 +38,15 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     implementation "androidx.annotation:annotation:1.1.0"
 
     implementation platform("com.squareup.okhttp3:okhttp-bom:4.9.1")
     implementation "com.squareup.okhttp3:okhttp"
 
-    testImplementation "junit:junit:4.13"
-    testImplementation "org.robolectric:robolectric:4.3.1"
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.robolectric:robolectric:4.5.1"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testImplementation "com.squareup.okhttp3:mockwebserver"
 }

sdk-example-kt/src/test/java/jp/studyplus/android/sdk_example_kt/ExampleUnitTest.kt

@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="jp.studyplus.android.sdk">
+
+    <queries>
+        <package android:name="jp.studyplus.android.app.debug" />
+    </queries>
+
+</manifest>

studyplus-android-sdk/build.gradle

@@ -3,4 +3,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <queries>
+        <package android:name="jp.studyplus.android.app" />
+    </queries>
+
 </manifest>

studyplus-android-sdk/src/debug/AndroidManifest.xml

@@ -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)
 }