Merge branch 'beta' into fix-fetch-mentions-from-db

app/src/foss/java/chat/rocket/android/analytics/AnswersAnalytics.kt

 package chat.rocket.android.analytics
 
-import chat.rocket.android.analytics.event.AuthenticationEvent
-import chat.rocket.android.analytics.event.ScreenViewEvent
+class AnswersAnalytics : Analytics
\ No newline at end of file
-import chat.rocket.android.analytics.event.SubscriptionTypeEvent
-
-class AnswersAnalytics : Analytics {
-
-    override fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {
-        // Do absolutely nothing
-    }
-
-    override fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {
-        // Do absolutely nothing
-    }
-
-    override fun logScreenView(event: ScreenViewEvent) {
-        // Do absolutely nothing
-    }
-
-    override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {
-        // Do absolutely nothing
-    }
-
-    override fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {
-        // Do absolutely nothing
-    }
-
-    override fun logReaction(event: SubscriptionTypeEvent) {
-        // Do absolutely nothing
-    }
-
-    override fun logServerSwitch(serverUrl: String, serverCount: Int) {
-        // Do absolutely nothing
-    }
-}

app/src/foss/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt

 package chat.rocket.android.analytics
 
 import android.content.Context
-import chat.rocket.android.analytics.event.AuthenticationEvent
-import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.analytics.event.SubscriptionTypeEvent
 import javax.inject.Inject
 
-class GoogleAnalyticsForFirebase @Inject constructor(val  context: Context) :
-    Analytics {
+class GoogleAnalyticsForFirebase @Inject constructor(val context: Context) : Analytics
\ No newline at end of file
-
-    override fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {
-        // Do absolutely nothing
-    }
-
-    override fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {
-        // Do absolutely nothing
-    }
-
-    override fun logScreenView(event: ScreenViewEvent) {
-        // Do absolutely nothing
-    }
-
-    override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {
-        // Do absolutely nothing
-    }
-
-    override fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {
-        // Do absolutely nothing
-    }
-
-    override fun logReaction(event: SubscriptionTypeEvent) {
-        // Do absolutely nothing
-    }
-
-    override fun logServerSwitch(serverUrl: String, serverCount: Int) {
-        // Do absolutely nothing
-    }
-}

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

@@ -12,7 +12,7 @@ interface Analytics {
      * @param event The [AuthenticationEvent] used to log in.
      * @param loginSucceeded True if successful logged in, false otherwise.
      */
-    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean)
+    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {}
 
     /**
      * Logs the sign up event.
@@ -20,14 +20,14 @@ interface Analytics {
      * @param event The [AuthenticationEvent] used to sign up.
      * @param signUpSucceeded True if successful signed up, false otherwise.
      */
-    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean)
+    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {}
 
     /**
      * Logs the screen view event.
      *
      * @param event The [ScreenViewEvent] to log.
      */
-    fun logScreenView(event: ScreenViewEvent)
+    fun logScreenView(event: ScreenViewEvent) {}
 
     /**
      * Logs the message sent event.
@@ -35,7 +35,7 @@ interface Analytics {
      * @param event The [SubscriptionTypeEvent] to log.
      * @param serverUrl The server URL to log.
      */
-    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String)
+    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {}
 
     /**
      * Logs the media upload event.
@@ -43,14 +43,14 @@ interface Analytics {
      * @param event The [SubscriptionTypeEvent] to log.
      * @param mimeType The mime type of the media uploaded to log.
      */
-    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String)
+    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {}
 
     /**
      * Logs the reaction event.
      *
      * @param event The [SubscriptionTypeEvent] to log.
      */
-    fun logReaction(event: SubscriptionTypeEvent)
+    fun logReaction(event: SubscriptionTypeEvent) {}
 
     /**
      * Logs the server switch event.
@@ -58,10 +58,10 @@ interface Analytics {
      * @param serverUrl The server URL to log.
      * @param serverCount The number of server(s) the use own.
      */
-    fun logServerSwitch(serverUrl: String, serverCount: Int)
+    fun logServerSwitch(serverUrl: String, serverCount: Int) {}
 
     /**
      * Logs the admin opening.
      */
-    fun logOpenAdmin()
+    fun logOpenAdmin() {}
 }

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha13'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
         classpath 'com.google.gms:google-services:4.0.2'

dependencies.gradle

@@ -5,20 +5,20 @@ ext {
             compileSdk            : 28,
             targetSdk             : 28,
             minSdk                : 21,
-            buildTools            : '28.0.2',
+            buildTools            : '28.0.3',
             dokka                 : '0.9.16',
 
             // For app
             kotlin                : '1.2.61',
             coroutine             : '0.25.0',
 
-            appCompat             : '1.0.0-rc02',
-            recyclerview          : '1.0.0-rc02',
+            appCompat             : '1.0.0',
+            recyclerview          : '1.0.0',
             constraintLayout      : '2.0.0-alpha2',
-            cardview              : '1.0.0-rc02',
-            browser               : '1.0.0-rc02',
-            androidKtx            : '1.0.0-rc02',
-            workmanager           : '1.0.0-alpha08',
+            cardview              : '1.0.0',
+            browser               : '1.0.0',
+            androidKtx            : '1.0.0',
+            workmanager           : '1.0.0-alpha09',
 
             dagger                : '2.16',
             firebaseCloudMessage  : '17.3.0',
@@ -26,10 +26,10 @@ ext {
             playServices          : '16.0.0',
             exoPlayer             : '2.8.2',
             flexbox               : '1.0.0',
-            material              : '1.0.0-beta01',
+            material              : '1.0.0',
 
-            room                  : '2.0.0-rc01',
-            lifecycle             : '2.0.0-rc01',
+            room                  : '2.0.0',
+            lifecycle             : '2.0.0',
 
             livedataKtx           : '2.0.1',
 

emoji/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion versions.compileSdk
-    buildToolsVersion versions.buildTools
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion versions.minSdk