Merge pull request #2168 from RocketChat/beta

[RELEASE] Merge BETA into MASTER

Author: philipbrito

README.md

@@ -43,8 +43,8 @@ cd Rocket.Chat.Android/app
 
 ## Bug report & Feature request
 
-Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only suppose to be used for bugs, improvements and features in the native Android application.
+Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only supposed to be used for bugs, improvements, and features in the native Android application.
 
 ## Coding Style
 
-Please follow the official [Kotlin coding convections](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.
+Please follow the official [Kotlin coding conventions](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.

app/build.gradle

@@ -2,7 +2,9 @@ def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
 def isPlay = !(taskRequests.contains("Foss") || taskRequests.contains("foss"))
 
 apply plugin: 'com.android.application'
-if (isPlay) { apply plugin: 'io.fabric' }
+if (isPlay) {
+    apply plugin: 'io.fabric'
+}
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
@@ -16,20 +18,30 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2057
-        versionName "3.2.0"
+        versionCode 2059
+        versionName "3.3.0"
         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()]
             }
         }
+
+        // For Jitsi
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
+
+        // For Jitsi
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
     }
 
     signingConfigs {
@@ -73,7 +85,7 @@ android {
             dimension "type"
         }
 
-        // only foss
+        // only FOSS
         foss {
             dimension "type"
         }
@@ -83,6 +95,10 @@ android {
         exclude 'META-INF/core.kotlin_module'
         exclude 'META-INF/main.kotlin_module'
     }
+
+    lintOptions {
+        lintConfig file("src/main/res/xml/lint.xml")
+    }
 }
 
 dependencies {
@@ -96,7 +112,7 @@ dependencies {
     implementation project(':suggestions')
 
     implementation libraries.kotlin
-    implementation libraries.coroutines
+    implementation libraries.coroutinesCore
     implementation libraries.coroutinesAndroid
 
     implementation libraries.appCompat
@@ -123,6 +139,8 @@ dependencies {
     implementation libraries.viewmodelKtx
     implementation libraries.workmanager
 
+    implementation libraries.livedataKtx
+
     implementation libraries.rxKotlin
     implementation libraries.rxAndroid
 
@@ -133,56 +151,50 @@ dependencies {
     implementation libraries.timber
     implementation libraries.threeTenABP
 
+    kapt libraries.kotshiCompiler
+    implementation libraries.kotshiApi
+
     implementation libraries.fresco
     api libraries.frescoOkHttp
     implementation libraries.frescoAnimatedGif
     implementation libraries.frescoWebP
     implementation libraries.frescoAnimatedWebP
 
-    implementation libraries.glide
-    implementation libraries.glideTransformations
-
-    kapt libraries.kotshiCompiler
-    implementation libraries.kotshiApi
-
     implementation libraries.frescoImageViewer
 
     implementation libraries.markwon
 
     implementation libraries.aVLoadingIndicatorView
 
-    implementation libraries.livedataKtx
+    implementation libraries.glide
+    implementation libraries.glideTransformations
+
+    implementation(libraries.jitsi) { transitive = true }
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     // Proprietary libraries
     playImplementation libraries.fcm
     playImplementation libraries.firebaseAnalytics
     playImplementation libraries.playServicesAuth
-    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { transitive = true }
-    playImplementation('com.crashlytics.sdk.android:answers:1.4.3@aar') { transitive = true }
+    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.8@aar') { transitive = true }
+    playImplementation('com.crashlytics.sdk.android:answers:1.4.6@aar') { transitive = true }
 
     testImplementation libraries.junit
     testImplementation libraries.truth
     androidTestImplementation libraries.espressoCore
     androidTestImplementation libraries.espressoIntents
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 androidExtensions {
     experimental = true
 }
 
 // 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) {
+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', sdk_location
     } else {

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:name=".app.RocketChatApplication"
@@ -73,6 +75,11 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
+        <activity
+            android:name=".videoconference.ui.VideoConferenceActivity"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
             android:theme="@style/AppTheme"

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

@@ -34,12 +34,16 @@ class AboutFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupToolbar()
         setupViews()
 
         analyticsManager.logScreenView(ScreenViewEvent.About)
     }
 
+    override fun onResume() {
+        super.onResume()
+        setupToolbar()
+    }
+
     private fun setupViews() {
         text_version_name.text = BuildConfig.VERSION_NAME
         text_build_number.text = getString(

app/src/main/java/chat/rocket/android/analytics/Analytics.kt

@@ -71,4 +71,67 @@ interface Analytics {
      * @param resetPasswordSucceeded True if successful reset password, false otherwise.
      */
     fun logResetPassword(resetPasswordSucceeded: Boolean) {}
+
+    /**
+     * Logs the video conference event.
+     *
+     * @param event The [SubscriptionTypeEvent] to log.
+     * @param serverUrl The server URL to log.
+     */
+    fun logVideoConference(event: SubscriptionTypeEvent, serverUrl: String) {}
+
+    /**
+     * Logs the add reaction message action.
+     */
+    fun logMessageActionAddReaction() {}
+
+    /**
+     * Logs the replay message action.
+     */
+    fun logMessageActionReply() {}
+
+    /**
+     * Logs the quote message action.
+     */
+    fun logMessageActionQuote() {}
+
+    /**
+     * Logs the permalink message action.
+     */
+    fun logMessageActionPermalink() {}
+
+    /**
+     * Logs the copy message action.
+     */
+    fun logMessageActionCopy() {}
+
+    /**
+     * Logs the edit message action.
+     */
+    fun logMessageActionEdit() {}
+
+    /**
+     * Logs the info message action.
+     */
+    fun logMessageActionInfo() {}
+
+    /**
+     * Logs the star message action.
+     */
+    fun logMessageActionStar() {}
+
+    /**
+     * Logs the pin message action.
+     */
+    fun logMessageActionPin() {}
+
+    /**
+     * Logs the report message action.
+     */
+    fun logMessageActionReport() {}
+
+    /**
+     * Logs the delete message action.
+     */
+    fun logMessageActionDelete() {}
 }

app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt

@@ -76,4 +76,76 @@ class AnalyticsManager @Inject constructor(
             analytics.forEach { it.logResetPassword(resetPasswordSucceeded) }
         }
     }
+
+    fun logVideoConference(event: SubscriptionTypeEvent) {
+        if (analyticsTrackingInteractor.get() && serverUrl != null) {
+            analytics.forEach { it.logVideoConference(event, serverUrl) }
+        }
+    }
+
+    fun logMessageActionAddReaction() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionAddReaction() }
+        }
+    }
+
+    fun logMessageActionReply() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionReply() }
+        }
+    }
+
+    fun logMessageActionQuote() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionQuote() }
+        }
+    }
+
+    fun logMessageActionPermalink() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionPermalink() }
+        }
+    }
+
+    fun logMessageActionCopy() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionCopy() }
+        }
+    }
+
+    fun logMessageActionEdit() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionEdit() }
+        }
+    }
+
+    fun logMessageActionInfo() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionInfo() }
+        }
+    }
+
+    fun logMessageActionStar() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionStar() }
+        }
+    }
+
+    fun logMessageActionPin() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionPin() }
+        }
+    }
+
+    fun logMessageActionReport() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionReport() }
+        }
+    }
+
+    fun logMessageActionDelete() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionDelete() }
+        }
+    }
 }

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

@@ -3,15 +3,11 @@ package chat.rocket.android.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import chat.rocket.android.server.domain.GetAccountInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.UserStatus
-import chat.rocket.core.internal.realtime.setTemporaryStatus
-import kotlinx.coroutines.experimental.launch
-import timber.log.Timber
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class AppLifecycleObserver @Inject constructor(
@@ -33,7 +29,7 @@ class AppLifecycleObserver @Inject constructor(
     }
 
     private fun changeTemporaryStatus(userStatus: UserStatus) {
-        launch {
+        GlobalScope.launch {
             serverInteractor.get()?.let { currentServer ->
                 factory.create(currentServer).setTemporaryStatus(userStatus)
             }