Merge pull request #1585 from RocketChat/foss_flavour

[FEATURE] Implement FOSS build flavour

.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
       - store_artifacts:
           path: app/build/reports/
           destination: reports
-  build-apk:
+  build-play-apk:
     docker:
       - image: circleci/android:api-27-alpha
     environment:
@@ -93,7 +93,40 @@ jobs:
       - run:
           name: Build APK
           command: |
-            ./gradlew assembleRelease --info --console=plain --stacktrace
+            ./gradlew assemblePlayRelease --info --console=plain --stacktrace
+      - store_artifacts:
+          path: app/build/outputs/apk
+          destination: apks
+  build-foss-apk:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: restore files from ENV
+          command: |
+            echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
+            echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - restore_cache:
+          key: kotlin-sdk-{{ .Revision }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies --quiet --console=plain
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Build APK
+          command: |
+            ./gradlew assembleFossRelease --info --console=plain --stacktrace
       - store_artifacts:
           path: app/build/outputs/apk
           destination: apks
@@ -112,6 +145,9 @@ workflows:
                 - develop
                 - develop-2.x
                 - master
-      - build-apk:
+      - build-play-apk:
+          requires:
+            - build-kotlin-sdk
+      - build-foss-apk:
           requires:
             - build-kotlin-sdk

app/build-sdk.sh

 #!/bin/bash
 
 CURRENT_DIR=$(pwd)
-# The SDK dir should be 2 directories up in the tree, so we use dirname 2 times
-# to get the common parent dir of the SDK and the app
 GIT=$(which git)
-cd ../..
-tmp=$(pwd)
-SDK_DIR="$tmp/Rocket.Chat.Kotlin.SDK"
-cd "${CURRENT_DIR}"
+
+if [ "$#" -eq 1 ] && [ ! -z "$1" ]; then
+    # if in an argument is given this is the (relative) path to SDK_DIR
+    SDK_DIR=$(readlink -f $1)
+else
+    # The SDK dir should be 2 directories up in the tree, so we use dirname 2 times
+    # to get the common parent dir of the SDK and the app
+    cd ../..
+    tmp=$(pwd)
+    SDK_DIR="$tmp/Rocket.Chat.Kotlin.SDK"
+    cd "${CURRENT_DIR}"
+fi
 
 echo "CURRENT DIR: $CURRENT_DIR"
 echo "SDK DIR: $SDK_DIR"
@@ -99,4 +105,4 @@ cp -v "${SDK_DIR}"/core/build/libs/core-0.1-SNAPSHOT.jar "${CURRENT_DIR}"/libs/c
 
 echo "$SHA" > "${SDK_DIR}"/.last_commit_hash
 
-exit 0
\ No newline at end of file
+exit 0

app/build.gradle

+def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
+def isPlay = !(taskRequests.contains("Foss") || taskRequests.contains("foss"))
+
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+if (isPlay) { apply plugin: 'io.fabric' }
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
@@ -17,6 +20,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
+        def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
+        def buildTime = new GregorianCalendar().format("MM-dd-yyyy' 'h:mm:ss a z")
+        buildConfigField "String", "GIT_SHA", "\"${gitSha}\""
+
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -57,6 +64,20 @@ android {
         }
     }
 
+    flavorDimensions "type"
+
+    productFlavors {
+        // includes proprietary libs
+        play {
+            dimension "type"
+        }
+
+        // only foss
+        foss {
+            dimension "type"
+        }
+    }
+
     packagingOptions {
         exclude 'META-INF/core.kotlin_module'
         exclude 'META-INF/main.kotlin_module'
@@ -91,9 +112,6 @@ dependencies {
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
 
-    implementation libraries.fcm
-    implementation libraries.playServicesAuth
-
     implementation libraries.room
     kapt libraries.roomProcessor
     implementation libraries.lifecycleExtensions
@@ -126,7 +144,10 @@ dependencies {
 
     implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
+    playImplementation libraries.fcm
+    playImplementation libraries.playServicesAuth
+
+    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
         transitive = true
     }
 
@@ -148,13 +169,16 @@ androidExtensions {
 
 // FIXME - build and install the sdk into the app/libs directory
 // We were having some issues with the kapt generated files from the sdk when importing as a module
+
+def sdk_location=project.properties['sdk_location'] ?: ""
 task compileSdk(type:Exec) {
     if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
-        commandLine 'cmd', '/c', 'build-sdk.sh'
+        commandLine 'cmd', '/c', 'build-sdk.sh', sdk_location
     } else {
-        commandLine './build-sdk.sh'
+        commandLine './build-sdk.sh', sdk_location
     }
 }
 preBuild.dependsOn compileSdk
-
-apply plugin: 'com.google.gms.google-services'
+if (isPlay) {
+    apply plugin: 'com.google.gms.google-services'
+}

app/src/foss/java/chat/rocket/android/dagger/module/ServiceBuilder.kt

+package chat.rocket.android.dagger.module
+
+import chat.rocket.android.chatroom.di.MessageServiceProvider
+import chat.rocket.android.chatroom.service.MessageService
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module abstract class ServiceBuilder {
+    @ContributesAndroidInjector(modules = [MessageServiceProvider::class])
+    abstract fun bindMessageService(): MessageService
+}

app/src/foss/java/chat/rocket/android/helper/ActivityKt.kt

+package chat.rocket.android.helper
+
+import android.app.Activity
+import android.content.Intent
+import androidx.fragment.app.FragmentActivity
+
+fun FragmentActivity.saveCredentials(id: String, password: String) {
+}
+
+fun Activity.requestStoredCredentials(): Pair<String, String>? = null
+
+fun getCredentials(data: Intent): Pair<String, String>? = null
+
+fun hasCredentialsSupport() = false
\ No newline at end of file

app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt

+package chat.rocket.android.helper
+
+import timber.log.Timber
+import android.util.Log
+
+class CrashlyticsTree : Timber.Tree() {
+
+    override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
+        Log.println(priority, tag, message)
+
+        if (throwable != null) {
+            Log.e(tag,throwable.toString())
+        }
+    }
+}

app/src/foss/java/chat/rocket/android/push/FirebaseTokenService.kt

+package chat.rocket.android.push
+
+class FirebaseTokenService {
+
+}
\ No newline at end of file

app/src/foss/java/chat/rocket/android/util/CrashlyticsManager.kt

+package chat.rocket.android.util
+
+import android.content.Context
+
+fun setupCrashlytics(context: Context) {
+        //Do absolutely nothing
+}

app/src/foss/java/chat/rocket/android/util/GMSManager.kt

+package chat.rocket.android.util
+
+
+import chat.rocket.android.main.ui.MainActivity
+import chat.rocket.android.main.presentation.MainPresenter
+
+fun refreshFCMToken(presenter: MainPresenter) {
+    //Do absolutely nothing
+}
+
+fun invalidateFirebaseToken(token: String) {
+    //Do absolutely nothing
+}
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -95,23 +95,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".push.FirebaseTokenService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name=".push.FirebaseMessagingService"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-
         <service
             android:name=".chatroom.service.MessageService"
             android:exported="true"
@@ -122,4 +105,4 @@
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
@@ -29,8 +30,9 @@ class AboutFragment : Fragment() {
     }
 
     private fun setupViews() {
-        text_version_name.text = getString(R.string.msg_version, BuildConfig.VERSION_NAME)
-        text_build_number.text = getString(R.string.msg_build, BuildConfig.VERSION_CODE)
+        text_version_name.text = BuildConfig.VERSION_NAME
+        text_build_number.text = getString(R.string.msg_build, BuildConfig.VERSION_CODE,
+                BuildConfig.GIT_SHA, BuildConfig.FLAVOR)
     }
 
     private fun setupToolbar() {

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -13,15 +13,13 @@ import chat.rocket.android.dagger.DaggerAppComponent
 import chat.rocket.android.dagger.qualifier.ForMessages
 import chat.rocket.android.helper.CrashlyticsTree
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.infrastructure.installCrashlyticsWrapper
 import chat.rocket.android.server.domain.AccountsRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.SITE_URL
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.emoji.EmojiRepository
-import com.crashlytics.android.Crashlytics
-import com.crashlytics.android.core.CrashlyticsCore
+import chat.rocket.android.util.setupCrashlytics
 import com.facebook.drawee.backends.pipeline.DraweeConfig
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipelineConfig
@@ -31,7 +29,6 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.HasBroadcastReceiverInjector
 import dagger.android.HasServiceInjector
-import io.fabric.sdk.android.Fabric
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -89,7 +86,7 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         AndroidThreeTen.init(this)
         EmojiRepository.load(this)
 
-        setupCrashlytics()
+        setupCrashlytics(this)
         setupFresco()
         setupTimber()
 
@@ -125,15 +122,6 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         }
     }
 
-    private fun setupCrashlytics() {
-        val core = CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()
-        Fabric.with(this, Crashlytics.Builder().core(core).build())
-
-        installCrashlyticsWrapper(this@RocketChatApplication,
-                getCurrentServerInteractor, settingsInteractor,
-                accountRepository, localRepository)
-    }
-
     private fun setupFresco() {
         Fresco.initialize(this, imagePipelineConfig, draweeConfig)
     }
@@ -169,4 +157,4 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
 private fun LocalRepository.needOldMessagesCleanUp() = getBoolean(CLEANUP_OLD_MESSAGES_NEEDED, true)
 private fun LocalRepository.setOldMessagesCleanedUp() = save(CLEANUP_OLD_MESSAGES_NEEDED, false)
 
-private const val CLEANUP_OLD_MESSAGES_NEEDED = "CLEANUP_OLD_MESSAGES_NEEDED"
\ No newline at end of file
+private const val CLEANUP_OLD_MESSAGES_NEEDED = "CLEANUP_OLD_MESSAGES_NEEDED"

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

@@ -2,7 +2,6 @@ package chat.rocket.android.authentication.login.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
-import com.google.android.gms.auth.api.credentials.Credential
 
 interface LoginView : LoadingView, MessageView {
 

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

@@ -30,11 +30,13 @@ 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
 import chat.rocket.common.util.ifNull
-import com.google.android.gms.auth.api.credentials.*
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_log_in.*
 import javax.inject.Inject
 
+internal const val REQUEST_CODE_FOR_SIGN_IN_REQUIRED = 1
+internal const val REQUEST_CODE_FOR_MULTIPLE_ACCOUNTS_RESOLUTION = 2
+internal const val REQUEST_CODE_FOR_SAVE_RESOLUTION = 3
 internal const val REQUEST_CODE_FOR_CAS = 4
 internal const val REQUEST_CODE_FOR_SAML = 5
 internal const val REQUEST_CODE_FOR_OAUTH = 6
@@ -48,7 +50,6 @@ class LoginFragment : Fragment(), LoginView {
     }
     private var isGlobalLayoutListenerSetUp = false
     private var deepLinkInfo: LoginDeepLinkInfo? = null
-    private val credentialsClient by lazy { Credentials.getClient(requireActivity()) }
 
     companion object {
         private const val DEEP_LINK_INFO = "DeepLinkInfo"
@@ -85,6 +86,10 @@ class LoginFragment : Fragment(), LoginView {
         }.ifNull {
             presenter.setupView()
         }
+
+        if (!hasCredentialsSupport()) {
+            image_key.isVisible = false
+        }
     }
 
     override fun onDestroyView() {
@@ -100,13 +105,15 @@ class LoginFragment : Fragment(), LoginView {
             if (data != null) {
                 when (requestCode) {
                     REQUEST_CODE_FOR_MULTIPLE_ACCOUNTS_RESOLUTION -> {
-                        onCredentialRetrieved(data.getParcelableExtra(Credential.EXTRA_KEY))
+                        getCredentials(data)?.let {
+                            onCredentialRetrieved(it.first, it.second)
+                        }
                     }
                     REQUEST_CODE_FOR_SIGN_IN_REQUIRED -> {
-                        //use the hints to autofill sign in forms to reduce the info to be filled.
-                        val credential: Credential = data.getParcelableExtra(Credential.EXTRA_KEY)
-                        text_username_or_email.setText(credential.id)
-                        text_password.setText(credential.password)
+                        getCredentials(data)?.let { credential ->
+                            text_username_or_email.setText(credential.first)
+                            text_password.setText(credential.second)
+                        }
                     }
                     REQUEST_CODE_FOR_SAVE_RESOLUTION -> {
                         showMessage(getString(R.string.message_credentials_saved_successfully))
@@ -154,19 +161,19 @@ class LoginFragment : Fragment(), LoginView {
 
     private fun requestStoredCredentials() {
         activity?.let {
-            SmartLockHelper.requestStoredCredentials(credentialsClient, it)?.let {
-                onCredentialRetrieved(it)
+            it.requestStoredCredentials()?.let { credentials ->
+                onCredentialRetrieved(credentials.first, credentials.second)
             }
         }
     }
 
-    private fun onCredentialRetrieved(credential: Credential) {
-        presenter.authenticateWithUserAndPassword(credential.id, credential.password.toString())
+    private fun onCredentialRetrieved(id: String, password: String) {
+        presenter.authenticateWithUserAndPassword(id, password)
     }
 
     override fun saveSmartLockCredentials(id: String, password: String) {
         activity?.let {
-            SmartLockHelper.save(credentialsClient, it, id, password)
+            it.saveCredentials(id, password)
         }
     }
 

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupView.kt

@@ -2,7 +2,6 @@ package chat.rocket.android.authentication.signup.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
-import com.google.android.gms.auth.api.credentials.Credential
 
 interface SignupView : LoadingView, MessageView {
 

app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt

@@ -16,10 +16,9 @@ import chat.rocket.android.R.string.message_credentials_saved_successfully
 import chat.rocket.android.authentication.signup.presentation.SignupPresenter
 import chat.rocket.android.authentication.signup.presentation.SignupView
 import chat.rocket.android.helper.KeyboardHelper
-import chat.rocket.android.helper.SmartLockHelper
 import chat.rocket.android.helper.TextHelper
+import chat.rocket.android.helper.saveCredentials
 import chat.rocket.android.util.extensions.*
-import com.google.android.gms.auth.api.credentials.Credentials
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_sign_up.*
 import javax.inject.Inject
@@ -156,7 +155,7 @@ class SignupFragment : Fragment(), SignupView {
 
     override fun saveSmartLockCredentials(id: String, password: String) {
         activity?.let {
-            SmartLockHelper.save(Credentials.getClient(it), it, id, password)
+            it.saveCredentials(id, password)
         }
     }
 

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -25,9 +25,9 @@ import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.invalidateFirebaseToken
+import chat.rocket.android.util.refreshFCMToken
 import chat.rocket.common.model.UserStatus
-import com.google.firebase.iid.FirebaseInstanceId
-import com.google.firebase.messaging.FirebaseMessaging
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -63,13 +63,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         setContentView(R.layout.activity_main)
 
         launch(CommonPool) {
-            try {
-                val token = FirebaseInstanceId.getInstance().token
-                Timber.d("FCM token: $token")
-                presenter.refreshToken(token)
-            } catch (ex: Exception) {
-                Timber.d(ex, "Missing play services...")
-            }
+            refreshFCMToken(presenter)
         }
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
@@ -211,7 +205,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     }
 
     override fun invalidateToken(token: String) =
-        FirebaseInstanceId.getInstance().deleteToken(token, FirebaseMessaging.INSTANCE_ID_SCOPE)
+        invalidateFirebaseToken(token)
 
     override fun showMessage(resId: Int) = showToast(resId)
 

app/src/main/res/layout/fragment_about.xml

@@ -35,7 +35,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/image_app_name"
         android:layout_marginTop="16dp"
-        android:textColor="@color/colorSecondaryText" />
+        android:textColor="@color/colorSecondaryText"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
     <TextView
         android:id="@+id/text_build_number"

app/src/main/res/layout/fragment_authentication_log_in.xml

@@ -40,6 +40,7 @@
             android:src="@drawable/ic_vpn_key_black_24dp"
             android:tint="@color/colorDrawableTintGrey"
             android:visibility="gone"
+            tools:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/text_username_or_email"
             app:layout_constraintEnd_toEndOf="@+id/text_username_or_email"
             app:layout_constraintTop_toTopOf="@+id/text_username_or_email" />

app/src/main/res/values-de/strings.xml

@@ -81,7 +81,7 @@
     <string name="msg_content_description_log_in_using_meteor">Login mit Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Login mit Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
     <string name="msg_content_description_send_message">Sende Nachricht</string>
     <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
     <string name="msg_you">Du</string>
@@ -98,8 +98,6 @@
     <string name="msg_preview_photo">Bild</string>
     <string name="msg_preview_file">Datei</string>
     <string name="msg_no_messages_yet">Noch keine Nachrichten</string>
-    <string name="msg_version">Version %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Server Version veraltet. Bitte kontaktieren Sie ihren Server Administrator.</string>
     <string name="msg_ver_not_recommended">
@@ -173,7 +171,6 @@
     <string name="action_msg_share">Teilen</string>
     <string name="action_title_editing">Nachricht bearbeiten</string>
     <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
-    <string name="action_share">Teilen</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Bearbeiten nicht erlaubt</string>

app/src/main/res/values-es/strings.xml

@@ -80,7 +80,7 @@
     <string name="msg_content_description_log_in_using_meteor">Inicia sesión usando Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Inicia sesión usando Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Inicia sesión usando Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Enviar mensaje</string>
     <string name="msg_content_description_show_attachment_options">Mostrar opciones de archivo adjunto</string>
     <string name="msg_you">Tú</string>
@@ -95,8 +95,6 @@
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_preview_file">Fichero</string>
     <string name="msg_no_messages_yet">Aún no hay mensajes</string>
-    <string name="msg_version">Versión %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Versión del servidor actualizada. Póngase en contacto con el administrador del servidor para actualizar la versión del servidor y continuar.</string>
     <string name="msg_ver_not_recommended">

app/src/main/res/values-fr/strings.xml

@@ -86,7 +86,7 @@
     <string name="msg_content_description_log_in_using_meteor">Connectez-vous en utilisant Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Connectez-vous en utilisant Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Connectez-vous en utilisant Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Envoyer message</string>
     <string name="msg_content_description_show_attachment_options">Afficher les options de fichiers</string>
     <string name="msg_you">Toi</string>
@@ -101,8 +101,6 @@
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_preview_file">File</string>
     <string name="msg_no_messages_yet">Aucun message pour le moment</string>
-    <string name="msg_version">Version %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
     // TODO: Add proper translation.
     <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
@@ -187,7 +185,6 @@
     <string name="action_msg_share">Partager</string>
     <string name="action_title_editing">Modification du message</string>
     <string name="action_msg_add_reaction">Ajouter une réaction</string>
-    <string name="action_share">Partager</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">L\'édition n\'est pas autorisée</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -42,7 +42,6 @@
     <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
-    <string name="action_share">शेयर</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -82,7 +81,7 @@
     <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_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">मेसेज भेजें</string>
     <string name="msg_content_description_show_attachment_options">अटैचमेंट विकल्प दिखाएं</string>
     <string name="msg_you">आप</string>
@@ -97,8 +96,6 @@
     <string name="msg_preview_file">फ़ाइल</string>
     <string name="msg_unread_messages">अपठित संदेश</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_update_app_version_in_order_to_continue">पुराना सर्वर वर्शन। जारी रखने के लिए सर्वर वर्शन को अद्यतन करने के लिए कृपया सर्वर व्यवस्थापक से संपर्क करें।</string>
     <string name="msg_ok">ठीक है</string>
     <string name="msg_ver_not_recommended">

app/src/main/res/values-pt-rBR/strings.xml

@@ -81,7 +81,7 @@
     <string name="msg_content_description_log_in_using_meteor">Fazer login através do Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Fazer login através do Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Fazer login através do Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Fazer login através do WordPress</string>
+    <string name="msg_content_description_log_in_using_wordpress">Fazer login através do WordPress</string>
     <string name="msg_content_description_send_message">Enviar mensagem</string>
     <string name="msg_content_description_show_attachment_options">Mostrar opções de anexo</string>
     <string name="msg_you">Você</string>
@@ -96,8 +96,6 @@
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_preview_file">Arquivo</string>
     <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
-    <string name="msg_version">Versão %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Versão do servidor desatualizada. Por favor, entre em contato com o administrador do sistema para continuar.</string>
     <string name="msg_ver_not_recommended">
@@ -275,7 +273,6 @@
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
     <string name="notif_success_sending">Mensagem enviada para %1$s!</string>
-    <string name="action_share">Compartilhar</string>
     <string name="read_by">Lida por</string>
     <string name="message_information_title">Informações da mensagem</string>
     <string name="msg_log_out">Deslogando…</string>

app/src/main/res/values-ru/strings.xml

@@ -81,7 +81,7 @@
     <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_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Отправить сообщение</string>
     <string name="msg_content_description_show_attachment_options">Показать параметры вложения</string>
     <string name="msg_you">Вы</string>
@@ -96,8 +96,6 @@
     <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">
@@ -172,7 +170,6 @@
     <string name="action_msg_share">Поделиться</string>
     <string name="action_title_editing">Редактирование сообщения</string>
     <string name="action_msg_add_reaction">Добавить реакцию</string>
-    <string name="action_share">Поделиться</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Редактирование запрещено</string>

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

-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">Rocket.Chat</string>
 
     <!-- Titles -->
@@ -83,7 +83,7 @@
     <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string>
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string>
     <string name="msg_content_description_send_message">Send message</string>
     <string name="msg_content_description_show_attachment_options">Show attachment options</string>
     <string name="msg_you">You</string>
@@ -100,8 +100,7 @@
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_preview_file">File</string>
     <string name="msg_no_messages_yet">No messages yet</string>
-    <string name="msg_version">Version %1$s</string>
-    <string name="msg_build">Build %1$d</string>
+    <string name="msg_build" tools:ignore="MissingTranslation">Build %1$d - %2$s - %3$s</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
     <string name="msg_ver_not_recommended">
@@ -175,7 +174,6 @@
     <string name="action_msg_share">Share</string>
     <string name="action_title_editing">Editing Message</string>
     <string name="action_msg_add_reaction">Add reaction</string>
-    <string name="action_share">Share</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Editing is not allowed</string>
@@ -279,4 +277,6 @@
     <string name="notif_success_sending">Message sent to %1$s!</string>
     <string name="read_by">Read by</string>
     <string name="message_information_title">Message information</string>
+
+    <string name="foss" tools:ignore="MissingTranslation">(FOSS)</string>
 </resources>
\ No newline at end of file

app/src/play/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="chat.rocket.android">
+
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+
+    <permission
+        android:name="${applicationId}.permission.C2D_MESSAGE"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+
+    <application
+        android:name=".app.RocketChatApplication"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_config"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true">
+
+        <receiver
+            android:name="com.google.android.gms.gcm.GcmReceiver"
+            android:exported="true"
+            android:permission="com.google.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".push.FirebaseTokenService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".push.FirebaseMessagingService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>

app/src/play/java/chat/rocket/android/helper/ActivityKt.kt

+package chat.rocket.android.helper
+
+import android.app.Activity
+import android.content.Intent
+import androidx.fragment.app.FragmentActivity
+import com.google.android.gms.auth.api.credentials.Credential
+import com.google.android.gms.auth.api.credentials.Credentials
+
+fun FragmentActivity.saveCredentials(id: String, password: String) {
+    val credentialsClient = Credentials.getClient(this)
+    SmartLockHelper.save(credentialsClient, this, id, password)
+}
+
+fun Activity.requestStoredCredentials(): Pair<String, String>? {
+    val credentialsClient = Credentials.getClient(this)
+    return SmartLockHelper.requestStoredCredentials(credentialsClient, this)?.let {
+        null
+    }
+}
+
+fun getCredentials(data: Intent): Pair<String, String>? {
+    val credentials: Credential = data.getParcelableExtra(Credential.EXTRA_KEY)
+    return credentials?.let { cred ->
+        cred.password?.let {
+            Pair(cred.id, it)
+        }
+    }
+}
+
+fun hasCredentialsSupport() = true
\ No newline at end of file

app/src/play/java/chat/rocket/android/util/CrashlyticsManager.kt

+package chat.rocket.android.util
+
+import chat.rocket.android.BuildConfig
+import io.fabric.sdk.android.Fabric
+import com.crashlytics.android.Crashlytics
+import com.crashlytics.android.core.CrashlyticsCore
+import android.content.Context
+import chat.rocket.android.app.RocketChatApplication
+import chat.rocket.android.infrastructure.installCrashlyticsWrapper
+
+fun setupCrashlytics(context: Context) {
+    val core = CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()
+    Fabric.with(context, Crashlytics.Builder().core(core).build())
+
+    installCrashlyticsWrapper(context as RocketChatApplication,
+            context.getCurrentServerInteractor, context.settingsInteractor,
+            context.accountRepository, context.localRepository)
+}
\ No newline at end of file

app/src/play/java/chat/rocket/android/util/GMSManager.kt

+package chat.rocket.android.util
+
+import chat.rocket.android.R
+import chat.rocket.android.main.ui.MainActivity
+import chat.rocket.android.main.presentation.MainPresenter
+import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
+import timber.log.Timber
+
+suspend fun refreshFCMToken(presenter: MainPresenter) {
+    try {
+        val token = FirebaseInstanceId.getInstance().token
+        Timber.d("FCM token: $token")
+        presenter.refreshToken(token)
+    } catch (ex: Exception) {
+        Timber.d(ex, "Missing play services...")
+    }
+}
+
+fun invalidateFirebaseToken(token: String) {
+    FirebaseInstanceId.getInstance().deleteToken(token, FirebaseMessaging.INSTANCE_ID_SCOPE)
+}