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

[FIX] setting.oauth

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 2013
-        versionName "2.0.3"
+        versionCode 2014
+        versionName "2.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -26,11 +26,11 @@ private const val TYPE_LOGIN_USER_EMAIL = 0
 private const val TYPE_LOGIN_CAS = 1
 private const val TYPE_LOGIN_OAUTH = 2
 private const val TYPE_LOGIN_DEEP_LINK = 3
+private const val SERVICE_NAME_FACEBOOK = "facebook"
 private const val SERVICE_NAME_GITHUB = "github"
 private const val SERVICE_NAME_GOOGLE = "google"
 private const val SERVICE_NAME_LINKEDIN = "linkedin"
 private const val SERVICE_NAME_GILAB = "gitlab"
-private const val SERVICE_NAME_FACEBOOK = "facebook"
 
 class LoginPresenter @Inject constructor(
     private val view: LoginView,
@@ -279,9 +279,10 @@ class LoginPresenter @Inject constructor(
         }
     }
 
-    private fun getOauthClientId(listMap: List<Map<String, String>>, serviceName: String): String? {
+    private fun getOauthClientId(listMap: List<Map<String, Any>>, serviceName: String): String? {
         return listMap.find { map -> map.containsValue(serviceName) }
-            ?.get("appId")
+            ?.get("clientId")
+            .toString()
     }
 
     private suspend fun saveAccount(username: String) {

app/src/main/java/chat/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt

@@ -30,7 +30,7 @@ private const val JSON_CREDENTIAL_SECRET = "credentialSecret"
 const val INTENT_OAUTH_CREDENTIAL_TOKEN = "credential_token"
 const val INTENT_OAUTH_CREDENTIAL_SECRET = "credential_secret"
 
-// Shows a WebView to the user authenticate with your Gitlab credentials.
+// Shows a WebView to the user authenticate with its OAuth credential.
 class OauthWebViewActivity : AppCompatActivity() {
     private lateinit var webPageUrl: String
     private lateinit var state: String