mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-29 06:28:45 +03:00
Fix / remove DebugActivity + clean
This commit is contained in:
parent
45ea5c356e
commit
c6e428c047
2 changed files with 5 additions and 15 deletions
|
@ -1,12 +0,0 @@
|
||||||
package im.vector.riotredesign.features
|
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
|
||||||
import android.os.Bundle
|
|
||||||
|
|
||||||
class DebugActivity : AppCompatActivity() {
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
setContentView(R.layout.activity_debug)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -138,13 +138,12 @@ class RoomDetailFragment :
|
||||||
* @return the sanitized display name
|
* @return the sanitized display name
|
||||||
*/
|
*/
|
||||||
fun sanitizeDisplayname(displayName: String): String? {
|
fun sanitizeDisplayname(displayName: String): String? {
|
||||||
var displayName = displayName
|
|
||||||
// sanity checks
|
// sanity checks
|
||||||
if (!TextUtils.isEmpty(displayName)) {
|
if (!TextUtils.isEmpty(displayName)) {
|
||||||
val ircPattern = " (IRC)"
|
val ircPattern = " (IRC)"
|
||||||
|
|
||||||
if (displayName.endsWith(ircPattern)) {
|
if (displayName.endsWith(ircPattern)) {
|
||||||
displayName = displayName.substring(0, displayName.length - ircPattern.length)
|
return displayName.substring(0, displayName.length - ircPattern.length)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -202,7 +201,10 @@ class RoomDetailFragment :
|
||||||
handleActions(it)
|
handleActions(it)
|
||||||
})
|
})
|
||||||
|
|
||||||
roomDetailViewModel.selectSubscribe(RoomDetailViewState::sendMode, RoomDetailViewState::selectedEvent, RoomDetailViewState::roomId) { mode, event, roomId ->
|
roomDetailViewModel.selectSubscribe(
|
||||||
|
RoomDetailViewState::sendMode,
|
||||||
|
RoomDetailViewState::selectedEvent,
|
||||||
|
RoomDetailViewState::roomId) { mode, event, roomId ->
|
||||||
when (mode) {
|
when (mode) {
|
||||||
SendMode.REGULAR -> {
|
SendMode.REGULAR -> {
|
||||||
val uid = session.sessionParams.credentials.userId
|
val uid = session.sessionParams.credentials.userId
|
||||||
|
|
Loading…
Reference in a new issue