mirror of
https://github.com/element-hq/element-android
synced 2024-11-24 18:35:40 +03:00
Small cleanup
This commit is contained in:
parent
eb4475b4d9
commit
4f1de34d4c
1 changed files with 4 additions and 6 deletions
|
@ -35,11 +35,9 @@ class CommandParser @Inject constructor() {
|
|||
*/
|
||||
fun parseSlashCommand(textMessage: CharSequence): ParsedCommand {
|
||||
// check if it has the Slash marker
|
||||
if (!textMessage.startsWith("/")) {
|
||||
return ParsedCommand.ErrorNotACommand
|
||||
return if (!textMessage.startsWith("/")) {
|
||||
ParsedCommand.ErrorNotACommand
|
||||
} else {
|
||||
Timber.v("parseSlashCommand")
|
||||
|
||||
// "/" only
|
||||
if (textMessage.length == 1) {
|
||||
return ParsedCommand.ErrorEmptySlashCommand
|
||||
|
@ -53,7 +51,7 @@ class CommandParser @Inject constructor() {
|
|||
val messageParts = try {
|
||||
textMessage.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() }
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, "## manageSlashCommand() : split failed")
|
||||
Timber.e(e, "## parseSlashCommand() : split failed")
|
||||
null
|
||||
}
|
||||
|
||||
|
@ -65,7 +63,7 @@ class CommandParser @Inject constructor() {
|
|||
val slashCommand = messageParts.first()
|
||||
val message = textMessage.substring(slashCommand.length).trim()
|
||||
|
||||
return when {
|
||||
when {
|
||||
Command.PLAIN.matches(slashCommand) -> {
|
||||
if (message.isNotEmpty()) {
|
||||
ParsedCommand.SendPlainText(message = message)
|
||||
|
|
Loading…
Reference in a new issue