This repository has been archived by the owner on Jun 7, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 553
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1621 from RocketChat/beta
[RELEASE] 2.6.0 release
- Loading branch information
Showing
216 changed files
with
5,052 additions
and
1,341 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #Thu Feb 15 15:50:42 BRST 2018 | ||
| #Wed Aug 01 21:56:00 EDT 2018 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
app/src/foss/java/chat/rocket/android/analytics/AnswersAnalytics.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package chat.rocket.android.analytics | ||
|
|
||
| import chat.rocket.android.analytics.event.AuthenticationEvent | ||
| import chat.rocket.android.analytics.event.ScreenViewEvent | ||
| 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 | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
app/src/foss/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| 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 { | ||
|
|
||
| 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 | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
app/src/foss/java/chat/rocket/android/dagger/module/ServiceBuilder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| 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 | ||
| } |
14 changes: 14 additions & 0 deletions
14
app/src/foss/java/chat/rocket/android/helper/ActivityKt.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| 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 |
Oops, something went wrong.