Handling a case where the "clientId" is not present (but it is "appId" on old servers).

a6c52ad9 · Filipe de Lima Brito · b67c3726 · a6c52ad9
Commit a6c52ad9 authored Apr 23, 2018 by Filipe de Lima Brito
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

LoginPresenter.kt ...droid/authentication/login/presentation/LoginPresenter.kt +3 -3

No files found.
--- a/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
@@ -280,9 +280,9 @@ class LoginPresenter @Inject constructor(
    }
    private fun getOauthClientId(listMap: List<Map<String, Any>>, serviceName: String): String? {
-        return listMap.find { map -> map.containsValue(serviceName) }
+        return listMap.find { map -> map.containsValue(serviceName) }?.let {
-            ?.get("clientId")
+            it["clientId"] ?: it["appId"]
-            .toString()
+        }.toString()
    }
    private suspend fun saveAccount(username: String) {