Merge branch 'develop' into android-draw

app/src/main/AndroidManifest.xml

@@ -20,8 +20,8 @@
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true">
 
         <activity
@@ -30,17 +30,18 @@
             android:screenOrientation="portrait"
             android:theme="@style/AuthenticationTheme"
             android:windowSoftInputMode="adjustResize">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
-
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
@@ -66,7 +67,7 @@
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
         <activity
-            android:name=".webview.cas.ui.CasWebViewActivity"
+            android:name=".webview.sso.ui.SsoWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
@@ -80,12 +81,12 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.about.ui.AboutActivity"
             android:theme="@style/AppTheme" />
@@ -118,6 +119,7 @@
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
+
         <service
             android:name=".push.GcmListenerService"
             android:exported="false">
@@ -125,6 +127,7 @@
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </service>
+
         <service
             android:name=".chatroom.service.MessageService"
             android:exported="true"
@@ -135,4 +138,4 @@
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file

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

@@ -25,8 +25,9 @@ import javax.inject.Inject
 
 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 TYPE_LOGIN_SAML = 2
+private const val TYPE_LOGIN_OAUTH = 3
+private const val TYPE_LOGIN_DEEP_LINK = 4
 private const val SERVICE_NAME_FACEBOOK = "facebook"
 private const val SERVICE_NAME_GITHUB = "github"
 private const val SERVICE_NAME_GOOGLE = "google"
@@ -82,14 +83,19 @@ class LoginPresenter @Inject constructor(
         }
     }
 
-    fun authenticateWithCas(token: String) {
-        credentialToken = token
+    fun authenticateWithCas(casToken: String) {
+        credentialToken = casToken
         doAuthentication(TYPE_LOGIN_CAS)
     }
 
-    fun authenticateWithOauth(token: String, secret: String) {
-        credentialToken = token
-        credentialSecret = secret
+    fun authenticateWithSaml(samlToken: String) {
+        credentialToken = samlToken
+        doAuthentication(TYPE_LOGIN_SAML)
+    }
+
+    fun authenticateWithOauth(oauthToken: String, oauthSecret: String) {
+        credentialToken = oauthToken
+        credentialSecret = oauthSecret
         doAuthentication(TYPE_LOGIN_OAUTH)
     }
 
@@ -99,7 +105,6 @@ class LoginPresenter @Inject constructor(
         deepLinkUserId = deepLinkInfo.userId
         deepLinkToken = deepLinkInfo.token
         tokenRepository.save(serverUrl, Token(deepLinkUserId, deepLinkToken))
-
         doAuthentication(TYPE_LOGIN_DEEP_LINK)
     }
 
@@ -124,8 +129,11 @@ class LoginPresenter @Inject constructor(
 
     private fun setupCasView() {
         if (settings.isCasAuthenticationEnabled()) {
-            val token = generateRandomString(17)
-            view.setupCasButtonListener(settings.casLoginUrl().casUrl(currentServer, token), token)
+            val casToken = generateRandomString(17)
+            view.setupCasButtonListener(
+                settings.casLoginUrl().casUrl(currentServer, casToken),
+                casToken
+            )
             view.showCasButton()
         }
     }
@@ -216,7 +224,7 @@ class LoginPresenter @Inject constructor(
 //                        totalSocialAccountsEnabled++
                     }
                     if (settings.isTwitterAuthenticationEnabled()) {
-                        //TODO: Remove until we have this implemented
+                        //TODO: Remove until Twitter provides support to OAuth2
 //                        view.enableLoginByTwitter()
 //                        totalSocialAccountsEnabled++
                     }
@@ -261,8 +269,23 @@ class LoginPresenter @Inject constructor(
                                 customOauthUrl,
                                 state,
                                 serviceName,
-                                getCustomOauthServiceNameColor(service),
-                                getCustomOauthButtonColor(service)
+                                getServiceNameColor(service),
+                                getServiceButtonColor(service)
+                            )
+                            totalSocialAccountsEnabled++
+                        }
+                    }
+
+                    getSamlServices(services).let {
+                        val samlToken = generateRandomString(17)
+
+                        for (service in it) {
+                            view.addSamlServiceButton(
+                                currentServer.samlUrl(getSamlProvider(service), samlToken),
+                                samlToken,
+                                getSamlServiceName(service),
+                                getServiceNameColor(service),
+                                getServiceButtonColor(service)
                             )
                             totalSocialAccountsEnabled++
                         }
@@ -307,6 +330,10 @@ class LoginPresenter @Inject constructor(
                             delay(3, TimeUnit.SECONDS)
                             client.loginWithCas(credentialToken)
                         }
+                        TYPE_LOGIN_SAML -> {
+                            delay(3, TimeUnit.SECONDS)
+                            client.loginWithSaml(credentialToken)
+                        }
                         TYPE_LOGIN_OAUTH -> {
                             client.loginWithOauth(credentialToken, credentialSecret)
                         }
@@ -319,7 +346,7 @@ class LoginPresenter @Inject constructor(
                             }
                         }
                         else -> {
-                            throw IllegalStateException("Expected TYPE_LOGIN_USER_EMAIL, TYPE_LOGIN_CAS, TYPE_LOGIN_OAUTH or TYPE_LOGIN_DEEP_LINK")
+                            throw IllegalStateException("Expected TYPE_LOGIN_USER_EMAIL, TYPE_LOGIN_CAS,TYPE_LOGIN_SAML, TYPE_LOGIN_OAUTH or TYPE_LOGIN_DEEP_LINK")
                         }
                     }
                 }
@@ -365,6 +392,18 @@ class LoginPresenter @Inject constructor(
         }.toString()
     }
 
+    private fun getSamlServices(listMap: List<Map<String, Any>>): List<Map<String, Any>>  {
+        return listMap.filter { map -> map["service"] == "saml" }
+    }
+
+    private fun getSamlServiceName(service: Map<String, Any>): String {
+        return service["buttonLabelText"].toString()
+    }
+
+    private fun getSamlProvider(service: Map<String, Any>): String {
+        return (service["clientConfig"] as Map<*, *>)["provider"].toString()
+    }
+
     private fun getCustomOauthServices(listMap: List<Map<String, Any>>): List<Map<String, Any>> {
         return listMap.filter { map -> map["custom"] == true }
     }
@@ -389,11 +428,11 @@ class LoginPresenter @Inject constructor(
         return service["scope"].toString()
     }
 
-    private fun getCustomOauthButtonColor(service: Map<String, Any>): Int {
+    private fun getServiceButtonColor(service: Map<String, Any>): Int {
         return service["buttonColor"].toString().parseColor()
     }
 
-    private fun getCustomOauthServiceNameColor(service: Map<String, Any>): Int {
+    private fun getServiceNameColor(service: Map<String, Any>): Int {
         return service["buttonLabelColor"].toString().parseColor()
     }
 

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

@@ -87,7 +87,7 @@ interface LoginView : LoadingView, MessageView {
      * Enables and shows the oauth view if there is login via social accounts enabled by the server settings.
      *
      * REMARK: We must show at maximum *three* social accounts views ([enableLoginByFacebook], [enableLoginByGithub], [enableLoginByGoogle],
-     * [enableLoginByLinkedin], [enableLoginByMeteor], [enableLoginByTwitter], [enableLoginByGitlab] or [addCustomOauthServiceButton]) for the oauth view.
+     * [enableLoginByLinkedin], [enableLoginByMeteor], [enableLoginByTwitter], [enableLoginByGitlab], [addCustomOauthServiceButton] or [addSamlServiceButton]) for the oauth view.
      * If the possibility of login via social accounts exceeds 3 different ways we should set up the FAB ([setupFabListener]) to show the remaining view(s).
      */
     fun enableOauthView()
@@ -197,7 +197,7 @@ interface LoginView : LoadingView, MessageView {
      * @state A random string generated by the app, which you'll verify later (to protect against forgery attacks).
      * @serviceName The custom OAuth service name.
      * @serviceNameColor The custom OAuth service name color (just stylizing).
-     * @buttonColor The color of the custom OAuth button (just stylizing).
+     * @buttonColor The custom OAuth button color (just stylizing).
      * @see [enableOauthView]
      */
     fun addCustomOauthServiceButton(
@@ -208,6 +208,23 @@ interface LoginView : LoadingView, MessageView {
         buttonColor: Int
     )
 
+    /**
+     *  Adds a SAML button in the oauth view.
+     *
+     * @samlUrl The SAML url to sets up the button (the listener).
+     * @serviceName The SAML service name.
+     * @serviceNameColor The SAML service name color (just stylizing).
+     * @buttonColor The SAML button color (just stylizing).
+     * @see [enableOauthView]
+     */
+    fun addSamlServiceButton(
+        samlUrl: String,
+        samlToken: String,
+        serviceName: String,
+        serviceNameColor: Int,
+        buttonColor: Int
+    )
+
     /**
      * Setups the FloatingActionButton to show more social accounts views (expanding the oauth view interface to show the remaining view(s)).
      */

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -25,8 +25,8 @@ import chat.rocket.android.authentication.login.presentation.LoginView
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.TextHelper
 import chat.rocket.android.util.extensions.*
-import chat.rocket.android.webview.cas.ui.INTENT_CAS_TOKEN
-import chat.rocket.android.webview.cas.ui.casWebViewIntent
+import chat.rocket.android.webview.sso.ui.INTENT_SSO_TOKEN
+import chat.rocket.android.webview.sso.ui.ssoWebViewIntent
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_SECRET
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_TOKEN
 import chat.rocket.android.webview.oauth.ui.oauthWebViewIntent
@@ -42,12 +42,12 @@ import kotlinx.android.synthetic.main.fragment_authentication_log_in.*
 import timber.log.Timber
 import javax.inject.Inject
 
-
 internal const val REQUEST_CODE_FOR_CAS = 1
-internal const val REQUEST_CODE_FOR_OAUTH = 2
-internal const val MULTIPLE_CREDENTIALS_READ = 3
-internal const val NO_CREDENTIALS_EXIST = 4
-internal const val SAVE_CREDENTIALS = 5
+internal const val REQUEST_CODE_FOR_SAML = 2
+internal const val REQUEST_CODE_FOR_OAUTH = 3
+internal const val MULTIPLE_CREDENTIALS_READ = 4
+internal const val NO_CREDENTIALS_EXIST = 5
+internal const val SAVE_CREDENTIALS = 6
 
 lateinit var googleApiClient: GoogleApiClient
 
@@ -121,7 +121,10 @@ class LoginFragment : Fragment(), LoginView, GoogleApiClient.ConnectionCallbacks
             if (data != null) {
                 when (requestCode) {
                     REQUEST_CODE_FOR_CAS -> data.apply {
-                        presenter.authenticateWithCas(getStringExtra(INTENT_CAS_TOKEN))
+                        presenter.authenticateWithCas(getStringExtra(INTENT_SSO_TOKEN))
+                    }
+                    REQUEST_CODE_FOR_SAML -> data.apply {
+                        presenter.authenticateWithSaml(getStringExtra(INTENT_SSO_TOKEN))
                     }
                     REQUEST_CODE_FOR_OAUTH -> {
                         isOauthSuccessful = true
@@ -371,7 +374,7 @@ class LoginFragment : Fragment(), LoginView, GoogleApiClient.ConnectionCallbacks
         ui { activity ->
             button_cas.setOnClickListener {
                 startActivityForResult(
-                    activity.casWebViewIntent(casUrl, casToken),
+                    activity.ssoWebViewIntent(casUrl, casToken),
                     REQUEST_CODE_FOR_CAS
                 )
                 activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
@@ -566,7 +569,7 @@ class LoginFragment : Fragment(), LoginView, GoogleApiClient.ConnectionCallbacks
         buttonColor: Int
     ) {
         ui { activity ->
-            val button = getCustomOauthButton(serviceName, serviceNameColor, buttonColor)
+            val button = getCustomServiceButton(serviceName, serviceNameColor, buttonColor)
             social_accounts_container.addView(button)
 
             button.setOnClickListener {
@@ -579,6 +582,27 @@ class LoginFragment : Fragment(), LoginView, GoogleApiClient.ConnectionCallbacks
         }
     }
 
+    override fun addSamlServiceButton(
+        samlUrl: String,
+        samlToken: String,
+        serviceName: String,
+        serviceNameColor: Int,
+        buttonColor: Int
+    ) {
+        ui { activity ->
+            val button = getCustomServiceButton(serviceName, serviceNameColor, buttonColor)
+            social_accounts_container.addView(button)
+
+            button.setOnClickListener {
+                startActivityForResult(
+                    activity.ssoWebViewIntent(samlUrl, samlToken),
+                    REQUEST_CODE_FOR_SAML
+                )
+                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
+            }
+        }
+    }
+
     override fun setupFabListener() {
         ui {
             button_fab.isVisible = true
@@ -696,9 +720,9 @@ class LoginFragment : Fragment(), LoginView, GoogleApiClient.ConnectionCallbacks
     }
 
     /**
-     * Gets a stylized custom OAuth button.
+     * Gets a stylized custom service button.
      */
-    private fun getCustomOauthButton(
+    private fun getCustomServiceButton(
         buttonText: String,
         buttonTextColor: Int,
         buttonBgColor: Int

app/src/main/java/chat/rocket/android/util/extensions/String.kt

@@ -40,8 +40,11 @@ fun String.safeUrl(): String {
 
 fun String.serverLogoUrl(favicon: String) = "${removeTrailingSlash()}/$favicon"
 
-fun String.casUrl(serverUrl: String, token: String) =
-    "${removeTrailingSlash()}?service=${serverUrl.removeTrailingSlash()}/_cas/$token"
+fun String.casUrl(serverUrl: String, casToken: String) =
+    "${removeTrailingSlash()}?service=${serverUrl.removeTrailingSlash()}/_cas/$casToken"
+
+fun String.samlUrl(provider: String, samlToken: String) =
+    "${removeTrailingSlash()}/_saml/authorize/$provider/$samlToken"
 
 fun String.termsOfServiceUrl() = "${removeTrailingSlash()}/terms-of-service"
 

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

@@ -36,7 +36,6 @@ class OauthWebViewActivity : AppCompatActivity() {
     private lateinit var state: String
     private var isWebViewSetUp: Boolean = false
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_web_view)

app/src/main/java/chat/rocket/android/webview/cas/ui/CasWebViewActivity.kt → app/src/main/java/chat/rocket/android/webview/sso/ui/SsoWebViewActivity.kt

-package chat.rocket.android.webview.cas.ui
+package chat.rocket.android.webview.sso.ui
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -13,19 +13,23 @@ import chat.rocket.android.R
 import kotlinx.android.synthetic.main.activity_web_view.*
 import kotlinx.android.synthetic.main.app_bar.*
 
-fun Context.casWebViewIntent(webPageUrl: String, casToken: String): Intent {
-    return Intent(this, CasWebViewActivity::class.java).apply {
+fun Context.ssoWebViewIntent(webPageUrl: String, casToken: String): Intent {
+    return Intent(this, SsoWebViewActivity::class.java).apply {
         putExtra(INTENT_WEB_PAGE_URL, webPageUrl)
-        putExtra(INTENT_CAS_TOKEN, casToken)
+        putExtra(INTENT_SSO_TOKEN, casToken)
     }
 }
 
 private const val INTENT_WEB_PAGE_URL = "web_page_url"
-const val INTENT_CAS_TOKEN = "cas_token"
+const val INTENT_SSO_TOKEN = "cas_token"
 
-class CasWebViewActivity : AppCompatActivity() {
+/**
+ * This class is responsible to handle the authentication thought single sign-on protocol (CAS and SAML).
+ */
+class SsoWebViewActivity : AppCompatActivity() {
     private lateinit var webPageUrl: String
     private lateinit var casToken: String
+    private var isWebViewSetUp: Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -34,7 +38,7 @@ class CasWebViewActivity : AppCompatActivity() {
         webPageUrl = intent.getStringExtra(INTENT_WEB_PAGE_URL)
         requireNotNull(webPageUrl) { "no web_page_url provided in Intent extras" }
 
-        casToken = intent.getStringExtra(INTENT_CAS_TOKEN)
+        casToken = intent.getStringExtra(INTENT_SSO_TOKEN)
         requireNotNull(casToken) { "no cas_token provided in Intent extras" }
 
         setupToolbar()
@@ -42,7 +46,10 @@ class CasWebViewActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        setupWebView()
+        if (!isWebViewSetUp) {
+            setupWebView()
+            isWebViewSetUp = true
+        }
     }
 
     override fun onBackPressed() {
@@ -64,15 +71,16 @@ class CasWebViewActivity : AppCompatActivity() {
         web_view.settings.javaScriptEnabled = true
         web_view.webViewClient = object : WebViewClient() {
             override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
-                // The user may have already been logged in the CAS, so check if the URL contains the "ticket" word
-                // (that means the user is successful authenticated and we don't need to wait until the page is fully loaded).
-                if (url.contains("ticket")) {
+                // The user may have already been logged in the SSO, so check if the URL contains
+                // the "ticket" or "validate" word (that means the user is successful authenticated
+                // and we don't need to wait until the page is fully loaded).
+                if (url.contains("ticket") || url.contains("validate")) {
                     closeView(Activity.RESULT_OK)
                 }
             }
 
             override fun onPageFinished(view: WebView, url: String) {
-                if (url.contains("ticket")) {
+                if (url.contains("ticket") || url.contains("validate")) {
                     closeView(Activity.RESULT_OK)
                 } else {
                     view_loading.hide()
@@ -83,7 +91,7 @@ class CasWebViewActivity : AppCompatActivity() {
     }
 
     private fun closeView(activityResult: Int = Activity.RESULT_CANCELED) {
-        setResult(activityResult, Intent().putExtra(INTENT_CAS_TOKEN, casToken))
+        setResult(activityResult, Intent().putExtra(INTENT_SSO_TOKEN, casToken))
         finish()
         overridePendingTransition(R.anim.hold, R.anim.slide_down)
     }

app/src/main/res/values-uk-rRU/strings.xml

+<resources>
+
+    <!-- Titles -->
+    <string name="title_sign_in_your_server">Войдите на ваш сервер</string>
+    <string name="title_log_in">Войти</string>
+    <string name="title_register_username">Зарегистрировать имя</string>
+    <string name="title_reset_password">Сброс пароля</string>
+    <string name="title_sign_up">Зарегистрироваться</string>
+    <string name="title_authentication">Аутентификация</string>
+    <string name="title_legal_terms">Юридические условия</string>
+    <string name="title_chats">Чаты</string>
+    <string name="title_profile">Профиль</string>
+    <string name="title_members">Пользователи (%d)</string>
+    <string name="title_settings">Настройки</string>
+    <string name="title_password">Изменить пароль</string>
+    <string name="title_update_profile">Обновить профиль</string>
+    <string name="title_about">О программе</string>
+
+    <!-- Actions -->
+    <string name="action_connect">Соединение</string>
+    <string name="action_use_this_username">Использовать это имя</string>
+    <string name="action_login_or_sign_up">Нажмите эту кнопку, чтобы войти в систему или создать учетную запись</string>
+    <string name="action_terms_of_service">Условия использования</string>
+    <string name="action_privacy_policy">Политика конфиденциальности</string>
+    <string name="action_search">Поиск</string>
+    <string name="action_update">Обновить</string>
+    <string name="action_settings">Настройки</string>
+    <string name="action_logout">Выйти</string>
+    <string name="action_files">Файлы</string>
+    <string name="action_confirm_password">Подтверждение изменения пароля</string>
+    <string name="action_join_chat">Присоединиться к чату</string>
+    <string name="action_add_account">Добавить аккаунт</string>
+    <string name="action_online">Онлайн</string>
+    <string name="action_away">Отошел</string>
+    <string name="action_busy">Занят</string>
+    <string name="action_invisible">Невидимый</string>
+    <string name="action_save_to_gallery">Сохранить в галерею</string>
+
+    <!-- Settings List -->
+    <string-array name="settings_actions">
+        <item name="item_password">Изменить пароль</item>
+        <item name="item_password">О программе</item>
+    </string-array>
+
+    <!-- Regular information messages -->
+    <string name="msg_generic_error">Произошла ошибка, повторите попытку.</string>
+    <string name="msg_no_data_to_display">Нет данных для отображения</string>
+    <string name="msg_profile_update_successfully">Профиль успешно обновлен</string>
+    <string name="msg_username">имя пользователя</string>
+    <string name="msg_username_or_email">имя пользователя или e-mail</string>
+    <string name="msg_password">пароль</string>
+    <string name="msg_name">Имя</string>
+    <string name="msg_email">e-mail</string>
+    <string name="msg_avatar_url">URL аватара</string>
+    <string name="msg_or_continue_using_social_accounts">Или продолжить, используя социальные учетные записи</string>
+    <string name="msg_new_user">Новый пользователь? %1$s</string>
+    <string name="msg_forgot_password">Забыли пароль? %1$s</string>
+    <string name="msg_reset">Сброс</string>
+    <string name="msg_check_your_email_to_reset_your_password">Письмо отправлено! Проверьте свой почтовый ящик, чтобы сбросить пароль.</string>
+    <string name="msg_invalid_email">Введите действующий e-mail</string>
+    <string name="msg_new_user_agreement">Продолжая, вы соглашаетесь с нашими\n%1$s и %2$s</string>
+    <string name="msg_2fa_code">Код 2FA</string>
+    <string name="msg_yesterday">Вчера</string>
+    <string name="msg_message">Сообщение</string>
+    <string name="msg_this_room_is_read_only">Этот канал только для чтения</string>
+    <string name="msg_invalid_2fa_code">Неверный код 2FA</string>
+    <string name="msg_invalid_file">Неверный файл</string>
+    <string name="msg_invalid_server_url">Неверный URL-адрес сервера.</string>
+    <string name="msg_content_description_log_in_using_facebook">Войти используя Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Войти используя Github</string>
+    <string name="msg_content_description_log_in_using_google">Войти используя Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Войти используя Linkedin</string>
+    <string name="msg_content_description_log_in_using_meteor">Войти используя Meteor</string>
+    <string name="msg_content_description_log_in_using_twitter">Войти используя Twitter</string>
+    <string name="msg_content_description_log_in_using_gitlab">Войти используя Gitlab</string>
+    <string name="msg_content_description_send_message">Отправить сообщение</string>
+    <string name="msg_content_description_show_attachment_options">Показать параметры вложения</string>
+    <string name="msg_you">Вы</string>
+    <string name="msg_unknown">Неизвестный</string>
+    <string name="msg_email_address">E-mail адрес</string>
+    <string name="msg_utc_offset">Смещение UTC</string>
+    <string name="msg_new_password">Введите новый пароль</string>
+    <string name="msg_confirm_password">Подтвердите новый пароль</string>
+    <string name="msg_unread_messages">Непрочитанные сообщения</string>
+    <string name="msg_preview_video">Видео</string>
+    <string name="msg_preview_audio">Аудио</string>
+    <string name="msg_preview_photo">Фото</string>
+    <string name="msg_preview_file">Файл</string>
+    <string name="msg_no_messages_yet">Нет сообщений</string>
+    <string name="msg_version">Версия %1$s</string>
+    <string name="msg_build">Сборка %1$d</string>
+    <string name="msg_ok">OK</string>
+    <string name="msg_update_app_version_in_order_to_continue">Версия сервера устарела. Пожалуйста, свяжитесь с администратором, чтобы обновить версию сервера.</string>
+    <string name="msg_ver_not_recommended">
+        Похоже ваша версия сервера ниже рекомендуемой %1$s.\nВы можете войти, но будьте готовы столкнуться с непредвиденными трудностями.</string>
+    <string name="msg_ver_not_minimum">
+        Похоже ваша версия сервера ниже минимально необходимой версии %1$s.\nОбновите свой сервер чтобы войти в систему!
+    </string>
+    <string name="msg_no_chat_title">Нет сообщений чата</string>
+    <string name="msg_no_chat_description">Начните разговор, чтобы увидеть ваши\nсообщения здесь.</string>
+    <string name="msg_proceed">ПРОДОЛЖИТЬ</string>
+    <string name="msg_cancel">ОТМЕНА</string>
+    <string name="msg_warning">ПРЕДУПРЕЖДЕНИЕ</string>
+    <string name="msg_http_insecure">При использовании HTTP вы подключаетесь к небезопасному серверу. Мы не рекомендуем вам это делать.</string>
+    <string name="msg_error_checking_server_version">При проверке версии вашего сервера произошла ошибка, повторите попытку.</string>
+    <string name="msg_invalid_server_protocol">Выбранный протокол не разрешен на этом сервере, попробуйте использовать HTTPS</string>
+    <string name="msg_image_saved_successfully">Изображение сохранено в галерее</string>
+    <string name="msg_image_saved_failed">Не удалось сохранить изображение</string>
+    <string name="msg_edited">(изменено)</string>
+    <string name="msg_and">\u0020и\u0020</string>
+    <string name="msg_is_typing">\u0020печатает…</string>
+    <string name="msg_are_typing">\u0020печатают…</string>
+    <string name="msg_several_users_are_typing">Несколько пользователей печатают…</string>
+    <string name="msg_no_search_found">Результатов не найдено</string>
+
+    <!-- System messages -->
+    <string name="message_room_name_changed">Название канала изменено на: %1$s by %2$s</string>
+    <string name="message_user_added_by">Пользователь %1$s добавлен пользователем %2$s</string>
+    <string name="message_user_removed_by">Пользователь %1$s удален пользователем %2$s</string>
+    <string name="message_user_left">Покинул канал.</string>
+    <string name="message_user_joined_channel">Присоединился к каналу.</string>
+    <string name="message_welcome">Добро пожаловать %s</string>
+    <string name="message_removed">Сообщение удалено</string>
+    <string name="message_pinned">Прикрепленное сообщение:</string>
+    <string name="message_muted">Пользователь %1$s заглушен пользователем %2$s</string>
+    <string name="message_unmuted">Пользователь %1$s перестал быть заглушенным по решению %2$s</string>
+    <string name="message_role_add">%1$s был назначен %2$s пользователем %3$s</string>
+    <string name="message_role_removed">%1$s больше не %2$s по решению %3$s</string>
+    <string name="message_credentials_saved_successfully">Учетные данные успешно сохранены</string>
+
+    <!-- Message actions -->
+    <string name="action_msg_reply">Ответить</string>
+    <string name="action_msg_edit">Редактировать</string>
+    <string name="action_msg_copy">Копировать</string>
+    <string name="action_msg_quote">Цитата</string>
+    <string name="action_msg_delete">Удалить</string>
+    <string name="action_msg_pin">Прикрепить сообщение</string>
+    <string name="action_msg_unpin">Открепить сообщение</string>
+    <string name="action_msg_star">Пометить сообщение</string>
+    <string name="action_msg_unstar">Снять отметку</string>
+    <string name="action_msg_share">Поделиться</string>
+    <string name="action_title_editing">Редактирование сообщения</string>
+    <string name="action_msg_add_reaction">Добавить реакцию</string>
+
+    <!-- Permission messages -->
+    <string name="permission_editing_not_allowed">Редактирование запрещено</string>
+    <string name="permission_deleting_not_allowed">Удаление запрещено</string>
+    <string name="permission_pinning_not_allowed">Прикрепление запрещено</string>
+    <string name="permission_starring_not_allowed">Отмечивание запрещено</string>
+
+    <!-- Members List -->
+    <string name="title_members_list">Пользователи</string>
+
+    <!-- Pinned Messages -->
+    <string name="title_pinned_messages">Прикрепленные сообщения</string>
+    <string name="no_pinned_messages">Нет прикрепленных сообщений</string>
+    <string name="no_pinned_description">Все прикрепленные сообщения\nотображаются здесь</string>
+
+    <!-- Favorite Messages -->
+    <string name="title_favorite_messages">Избранные сообщения</string>
+    <string name="no_favorite_messages">Нет избранных сообщений</string>
+    <string name="no_favorite_description">Все избранные сообщения\nотображаются здесь</string>
+
+    <!-- Files -->
+    <string name="msg_files">Файлы</string>
+    <string name="title_files_total">Файлы (%d)</string>
+    <string name="msg_no_files">Нет файлов</string>
+    <string name="msg_all_files_appear_here">Все файлы отображаются здесь</string>
+
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">Размер файла %1$d превысил максимально допустимый %2$d bytes</string>
+
+    <!-- Socket status -->
+    <string name="status_connected">Соединено</string>
+    <string name="status_disconnected">Отключено</string>
+    <string name="status_connecting">Соединение</string>
+    <string name="status_authenticating">Аутентификация</string>
+    <string name="status_disconnecting">Отключение</string>
+    <string name="status_waiting">Соединение через %d секунд</string>
+
+    <!--Suggestions-->
+    <string name="suggest_all_description">Уведомить всех в этом чате</string>
+    <string name="suggest_here_description">Уведомить всех активных пользователей в этом чате</string>
+
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Показывает ༼ つ ◕_◕ ༽つ перед вашим сообщением</string>
+    <string name="Slash_LennyFace_Description">Показывает ( ͡° ͜ʖ ͡°) после вашего сообщения</string>
+    <string name="Slash_Shrug_Description">Показывает ¯\_(ツ)_/¯ после вашего сообщения</string>
+    <string name="Slash_Tableflip_Description">Показывает (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Показывает ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Создать новый канал</string>
+    <string name="Show_the_keyboard_shortcut_list">Показать список горячих клавиш</string>
+    <string name="Invite_user_to_join_channel_all_from">Пригласить всех пользователей из [#channel] присоединиться к этому каналу</string>
+    <string name="Invite_user_to_join_channel_all_to">Пригласить всех пользователей присоединиться к [#channel]</string>
+    <string name="Archive">Архивировать</string>
+    <string name="Remove_someone_from_room">Удалить кого-либо с канала</string>
+    <string name="Leave_the_current_channel">Покинуть текущий канал</string>
+    <string name="Displays_action_text">Отображает текст действия</string>
+    <string name="Direct_message_someone">Личное сообщение</string>
+    <string name="Mute_someone_in_room">Заглушить кого-либо на канале</string>
+    <string name="Unmute_someone_in_room">Отменить заглушивание кого-либо на канале</string>
+    <string name="Invite_user_to_join_channel">Пригласить пользователя на канал</string>
+    <string name="Unarchive">Разархивировать</string>
+    <string name="Join_the_given_channel">Присоединиться к этому каналу</string>
+    <string name="Guggy_Command_Description">Создает gif на основе предоставленного текста</string>
+    <string name="Slash_Topic_Description">Установить тему</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">Нет недавно используемых emoji</string>
+
+    <!-- Sorting and grouping-->
+    <string name="menu_chatroom_sort">Сортировать</string>
+    <string name="dialog_sort_title">Сортировать по</string>
+    <string name="dialog_sort_by_alphabet">По алфавиту</string>
+    <string name="dialog_sort_by_activity">По активности</string>
+    <string name="dialog_group_by_type">Группировать по типу</string>
+    <string name="dialog_group_favourites">Группировать избранное</string>
+    <string name="chatroom_header">Заголовок</string>
+
+    <!--ChatRooms Headers-->
+    <string name="header_channel">Каналы</string>
+    <string name="header_private_groups">Приватные группы</string>
+    <string name="header_direct_messages">Личная переписка</string>
+    <string name="header_live_chats">Живые чаты</string>
+    <string name="header_unknown">Неизвестные</string>
+
+    <!--Notifications-->
+    <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
+    <string name="notif_error_sending">Ошибка ответа. Пожалуйста, попробуйте еще раз.</string>
+    <string name="notif_success_sending">Сообщение отправлено %1$s!</string>
+</resources>

dependencies.gradle

@@ -36,7 +36,12 @@ ext {
             junit                 : '4.12',
             truth                 : '0.36',
             espresso              : '3.0.2',
-            mockito               : '2.10.0'
+            mockito               : '2.10.0',
+
+            //For wearable
+            wear                  : '2.3.0',
+            playServicesWearable  : '15.0.1',
+            supportWearable       : '26.1.0'
     ]
     libraries = [
             kotlin                : "org.jetbrains.kotlin:kotlin-stdlib-jre8:${versions.kotlin}",
@@ -103,5 +108,13 @@ ext {
             espressoIntents       : "com.android.support.test.espresso:espresso-intents:${versions.espresso}",
             roomTest              : "android.arch.persistence.room:testing:${versions.room}",
             truth                 : "com.google.truth:truth:$versions.truth",
+
+            //For the wear app
+            wearable              : "com.google.android.support:wearable:${versions.wear}",
+            playServicesWearable  : "com.google.android.gms:play-services-wearable:${versions.playServicesWearable}",
+            percentLayout         : "com.android.support:percent:${versions.supportWearable}",
+            supportWearable       : "com.android.support:support-v4:${versions.supportWearable}",
+            wearableRecyclerView  : "com.android.support:recyclerview-v7:${versions.supportWearable}",
+            wearSupport           : "com.android.support:wear:${versions.supportWearable}"
     ]
 }

settings.gradle

-include ':app', ':player', ':draw'
\ No newline at end of file
+include ':app', ':player', ':draw', ':wear'
\ No newline at end of file

wear/.gitignore

+/build

wear/build.gradle

+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+android {
+    compileSdkVersion 26
+    buildToolsVersion versions.buildTools
+
+    defaultConfig {
+        applicationId "chat.rocket.android.wear"
+        minSdkVersion 23
+        targetSdkVersion versions.targetSdk
+        versionCode 1
+        versionName "1.0.0"
+    }
+    buildTypes {
+        release {
+            postprocessing {
+                removeUnusedCode false
+                removeUnusedResources false
+                obfuscate false
+                optimizeCode false
+                proguardFile 'proguard-rules.pro'
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation libraries.kotlin
+    implementation libraries.wearable
+    implementation libraries.playServicesWearable
+    implementation libraries.percentLayout
+    implementation libraries.supportWearable
+    implementation libraries.wearableRecyclerView
+    implementation libraries.wearSupport
+    compileOnly 'com.google.android.wearable:wearable:2.3.0'
+}

wear/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

wear/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="chat.rocket.android.wear">
+
+    <uses-feature android:name="android.hardware.type.watch" />
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@android:style/Theme.DeviceDefault">
+        <uses-library
+            android:name="com.google.android.wearable"
+            android:required="true" />
+        <!--
+               Set to true if your app is Standalone, that is, it does not require the handheld
+               app to run.
+        -->
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file

wear/src/main/java/chat/rocket/android/wear/MainActivity.kt

+package chat.rocket.android.wear
+
+import android.os.Bundle
+import android.support.wearable.activity.WearableActivity
+
+class MainActivity : WearableActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        // Enables Always-on
+        setAmbientEnabled()
+    }
+}

wear/src/main/res/layout/activity_main.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_grey"
+    android:padding="@dimen/box_inset_layout_padding"
+    tools:context="chat.rocket.android.wear.MainActivity"
+    tools:deviceIds="wear">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/inner_frame_layout_padding"
+        app:boxedEdges="all">
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/hello_world" />
+
+    </FrameLayout>
+</android.support.wear.widget.BoxInsetLayout>
+

wear/src/main/res/values-round/strings.xml

+<resources>
+    <string name="hello_world">Hello Round World!</string>
+</resources>

wear/src/main/res/values/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+    Because the window insets on round devices are larger than 15dp, this padding only applies
+    to square screens.
+    -->
+    <dimen name="box_inset_layout_padding">0dp</dimen>
+
+    <!--
+    This padding applies to both square and round screens. The total padding between the buttons
+    and the window insets is box_inset_layout_padding (above variable) on square screens and
+    inner_frame_layout_padding (below variable) on round screens.
+    -->
+    <dimen name="inner_frame_layout_padding">5dp</dimen>
+</resources>

wear/src/main/res/values/strings.xml

+<resources>
+    <string name="app_name">Rocket&#46;Chat</string>
+    <!--
+    This string is used for square devices and overridden by hello_world in
+    values-round/strings.xml for round devices.
+    -->
+    <string name="hello_world">Hello Square World!</string>
+</resources>