Merge branch 'master' into develop/binding

Author: lm2343635

demoapp/src/main/java/com/mushare/demoapp/data/LoginDataSource.kt

@@ -17,13 +17,16 @@ class LoginDataSource {
             //pluto?.registerByEmail(username, password, "Test", {
             //pluto?.resendValidationEmail(username, {
             pluto?.loginWithAccount(username, password, {
-                pluto.myInfo({
-                    val fakeUser = LoggedInUser(java.util.UUID.randomUUID().toString(), it.name)
-                    onComplete(Result.Success(fakeUser))
-                }, {
-                    onComplete(Result.Error(IOException("Error getting account info $it")))
-                    Log.e("getInfo", "failed $it")
-                })
+                pluto.myInfo(
+                    success = {
+                        val fakeUser = LoggedInUser(java.util.UUID.randomUUID().toString(), it.name)
+                        onComplete(Result.Success(fakeUser))
+                    },
+                    error = {
+                        onComplete(Result.Error(IOException("Error getting account info $it")))
+                        Log.e("getInfo", "failed $it")
+                    }
+                )
             }, {
                 onComplete(Result.Error(IOException("Error logging in $it")))
                 Log.e("login", "failed $it")

demoapp/src/main/java/com/mushare/demoapp/ui/login/ProfileActivity.kt

@@ -114,14 +114,17 @@ class ProfileActivity : AppCompatActivity() {
     }
 
     private fun updateUserInfo(completion: (() -> Unit)? = null) {
-        Pluto.getInstance()?.myInfo(success = { user ->
-            nameEditText.get()?.setText(user.name)
-            userIdEditText.get()?.setText(user.userId)
-            avatarImageView.get()?.let {
-                Glide.with(this).load(user.avatar).into(it)
+        Pluto.getInstance()?.myInfo(
+            isForceRefresh = false,
+            success = { user ->
+                nameEditText.get()?.setText(user.name)
+                userIdEditText.get()?.setText(user.userId)
+                avatarImageView.get()?.let {
+                    Glide.with(this).load(user.avatar).into(it)
+                }
+                completion?.let { it() }
             }
-            completion?.let { it() }
-        })
+        )
 
     }
 }

pluto-kotlin-client-sdk/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 
 buildscript {
     ext.versionCode = 13
-    ext.versionName = '0.5.1'
+    ext.versionName = '0.6.1'
 }
 
 android {

pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt

@@ -9,11 +9,25 @@ import retrofit2.Response
 import java.io.ByteArrayOutputStream
 import java.io.File
 
+val Pluto.currentUser: PlutoUser?
+    get() {
+        if (state != Pluto.State.signin) {
+            return null
+        }
+        return data.user
+    }
+
 fun Pluto.myInfo(
+    isForceRefresh: Boolean = false,
     success: (PlutoUser) -> Unit,
     error: ((PlutoError) -> Unit)? = null,
     handler: Pluto.PlutoRequestHandler? = null
 ) {
+    val currentUser = data.user
+    if (!isForceRefresh && currentUser != null) {
+        success(currentUser)
+        return
+    }
     getAuthorizationHeader(
         completion = { header ->
             if (header == null) {

pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto.kt

@@ -46,7 +46,9 @@ class Pluto private constructor() {
 
     internal val data by lazy { PlutoModel(context) }
 
-    val state: MutableLiveData<State> by lazy { MutableLiveData(State.loading) }
+    val state: MutableLiveData<State> by lazy {
+        MutableLiveData(if (data.isTokenNull) State.notSignin else State.signin)
+    }
 
     internal val gson: Gson by lazy { GsonBuilder().serializeNulls().create() }
     internal val plutoService: PlutoService by lazy {

pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoModel.kt

@@ -77,6 +77,9 @@ internal class PlutoModel(context: Context) {
             infoJSONString = gson.toJson(value)
         }
 
+    val isTokenNull: Boolean
+        get() = accessToken == null || refreshToken == null
+
     fun updateAccessToken(jwt: String): Boolean {
         val body = JwtUtils.decodeBody(jwt) ?: return false
         return try {