Merge pull request #1166 from RocketChat/fix/settings.oauth

[FIX] settings.oauth

Merge pull request #1166 from RocketChat/fix/settings.oauth
[FIX] settings.oauth
3e457b9d · Rafael Kellermann Streit · GitHub · 1aa74e2e · a6c52ad9 · 3e457b9d
Unverified Commit 3e457b9d authored Apr 23, 2018 by Rafael Kellermann Streit Committed by GitHub Apr 23, 2018
Show 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) {