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 552
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 #2431 from RocketChat/beta
[RELEASE] Merge BETA into MASTER
- Loading branch information
Showing
127 changed files
with
2,848 additions
and
1,247 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
17 changes: 17 additions & 0 deletions
17
app/src/foss/java/chat/rocket/android/dynamiclinks/DynamicLinksForFirebase.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,17 @@ | ||
package chat.rocket.android.dynamiclinks | ||
|
||
import android.content.Context | ||
import android.content.Intent | ||
import android.net.Uri | ||
import javax.inject.Inject | ||
|
||
class DynamicLinksForFirebase @Inject constructor(private val context: Context) : DynamicLinks { | ||
|
||
override fun getDynamicLink(intent: Intent, deepLinkCallback: (Uri?) -> Unit? ) { | ||
deepLinkCallback(null) | ||
} | ||
|
||
override fun createDynamicLink(username: String?, server: String, deepLinkCallback: (String?) -> Unit?) { | ||
deepLinkCallback(null) | ||
} | ||
} |
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
5 changes: 5 additions & 0 deletions
5
app/src/main/java/chat/rocket/android/analytics/event/InviteType.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,5 @@ | ||
package chat.rocket.android.analytics.event | ||
|
||
enum class InviteType(val inviteTypeName: String) { | ||
ViaApp("viaApp") | ||
} |
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
20 changes: 20 additions & 0 deletions
20
app/src/main/java/chat/rocket/android/authentication/domain/model/DeepLinkInfo.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,20 @@ | ||
package chat.rocket.android.authentication.domain.model | ||
|
||
import android.annotation.SuppressLint | ||
import android.os.Parcelable | ||
import kotlinx.android.parcel.Parcelize | ||
|
||
// see https://rocket.chat/docs/developer-guides/deeplink/ for documentation | ||
|
||
const val DEEP_LINK_INFO_KEY = "deep_link_info" | ||
|
||
@SuppressLint("ParcelCreator") | ||
@Parcelize | ||
data class DeepLinkInfo( | ||
val url: String, | ||
val userId: String?, | ||
val token: String?, | ||
val rid: String?, | ||
val roomType: String?, | ||
val roomName: String? | ||
) : Parcelable |
40 changes: 0 additions & 40 deletions
40
app/src/main/java/chat/rocket/android/authentication/domain/model/LoginDeepLinkInfo.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.