From 08d005a611dc8677ad72a130f2cf03e73ea2c111 Mon Sep 17 00:00:00 2001 From: Valere Date: Mon, 16 Dec 2019 15:31:11 +0100 Subject: [PATCH] fix merge --- .../riotx/features/home/room/list/RoomSummaryItemFactory.kt | 1 - .../im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt | 2 -- 2 files changed, 3 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt index 885a5a3a81..f2ff79162f 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt @@ -20,7 +20,6 @@ import android.view.View import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent import im.vector.riotx.R import im.vector.riotx.core.date.VectorDateFormatter import im.vector.riotx.core.epoxy.VectorEpoxyModel diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt index 5a721b45f7..d3288c5b2e 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt @@ -27,8 +27,6 @@ import im.vector.riotx.core.dialogs.withColoredButton import im.vector.riotx.core.extensions.cleanup import im.vector.riotx.core.extensions.configureWith import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs import im.vector.riotx.features.login.AbstractLoginFragment import im.vector.riotx.features.login.LoginAction import im.vector.riotx.features.login.LoginMode