Merge pull request #21 from studyplus/feature/target_sdk_29

TargetSDK 29

Author: koji-1009

README.md

@@ -24,7 +24,7 @@ Add it in your root build.gradle at the end of repositories:
 
 ```groovy
     dependencies {
-        implementation 'com.github.studyplus:Studyplus-Android-SDK:2.5.2'
+        implementation 'com.github.studyplus:Studyplus-Android-SDK:2.6.0'
     }
 ```
 

build.gradle

@@ -2,13 +2,13 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.41'
-        kotlin_cotoutines_version = '1.2.1'
+        kotlin_version = '1.3.50'
+        kotlin_cotoutines_version = '1.3.1'
     }
     ext.versions = [
-            'compileSdk'      : 28,
+            'compileSdk'      : 29,
             'minSdk'          : 21,
-            'targetSdk'       : 28,
+            'targetSdk'       : 29,
             'annotation'      : '1.1.0',
             'core_ktx'        : '1.1.0',
             'appcompat'       : '1.1.0',
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Apr 25 19:30:00 JST 2019
+#Wed Sep 25 14:10:00 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

studyplus-android-sdk/build.gradle

@@ -7,8 +7,6 @@ android {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
 
-        consumerProguardFiles 'lib-proguard-rules.txt'
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -47,7 +45,7 @@ dependencies {
     implementation "androidx.annotation:annotation:$versions.annotation"
     implementation "androidx.core:core-ktx:$versions.core_ktx"
 
-    def okhttp = "3.14.2"
+    def okhttp = "4.2.0"
     implementation "com.squareup.okhttp3:okhttp:$okhttp"
 
     testImplementation 'junit:junit:4.12'

studyplus-android-sdk/lib-proguard-rules.txt

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_package_name" translatable="false">jp.studyplus.android.app.debug</string>
+</resources>

studyplus-android-sdk/src/debug/res/values/strings.xml

@@ -4,19 +4,21 @@ import jp.studyplus.android.sdk.BuildConfig
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
 import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody.Companion.toRequestBody
 import org.json.JSONObject
 import java.io.IOException
 
 internal class ApiService(private val client: OkHttpClient) {
     fun post(auth: String, json: String): Deferred<Long?> {
         val body = createPostBody(json)
         val request = Request.Builder()
-                .header("Accept", HEADER_JSON)
-                .header("Content-type", HEADER_JSON)
-                .addHeader("Authorization", auth)
-                .url("$ENDPOINT/v1/study_records")
-                .post(body)
-                .build()
+            .header("Accept", HEADER_JSON)
+            .header("Content-type", HEADER_JSON)
+            .addHeader("Authorization", auth)
+            .url("$ENDPOINT/v1/study_records")
+            .post(body)
+            .build()
 
         return execute(client.newCall(request))
     }
@@ -27,10 +29,9 @@ internal class ApiService(private val client: OkHttpClient) {
     }
 }
 
-private val JSON_MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8")
+private val JSON_MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
 
-internal fun createPostBody(json: String) =
-        RequestBody.create(JSON_MEDIA_TYPE, json)
+internal fun createPostBody(json: String) = json.toRequestBody(JSON_MEDIA_TYPE)
 
 internal fun execute(call: Call): Deferred<Long?> {
     val deferred = CompletableDeferred<Long?>()
@@ -51,7 +52,7 @@ internal fun execute(call: Call): Deferred<Long?> {
 
         override fun onResponse(call: Call, response: Response) {
             if (response.isSuccessful) {
-                val parsedJson = JSONObject(response.body()?.string() ?: EMPTY_JSON)
+                val parsedJson = JSONObject(response.body?.string() ?: EMPTY_JSON)
                 val recordId = parsedJson.optLong(RECORD_ID, INVALID_RECORD_ID)
 
                 if (recordId != INVALID_RECORD_ID) {

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

@@ -45,6 +45,7 @@ constructor(
 
     private fun isInstalledStudyplus(context: Context): Boolean {
         val packages = context.packageManager.getInstalledApplications(PackageManager.GET_META_DATA)
-        return packages.any { it.packageName == "jp.studyplus.android.app" }
+        val appName = context.getString(R.string.app_package_name)
+        return packages.any { it.packageName == appName }
     }
 }

studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/internal/auth/AuthTransit.kt

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_custom_scheme" translatable="false">studyplus://auth/external/start</string>
+    <string name="app_package_name" translatable="false">jp.studyplus.android.app</string>
 </resources>