From ae762aa9283e31b31ee51278d80dde42461fb60e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 29 May 2020 11:07:03 +0200 Subject: [PATCH] Cleanup --- .../java/im/vector/matrix/android/api/session/call/VoipApi.kt | 1 + .../riotx/features/home/room/detail/RoomDetailViewModel.kt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/VoipApi.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/VoipApi.kt index dc92af8023..4a2b9cabef 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/VoipApi.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/VoipApi.kt @@ -20,6 +20,7 @@ import im.vector.matrix.android.internal.network.NetworkConstants import retrofit2.Call import retrofit2.http.GET +// TODO Move to internal internal interface VoipApi { @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "voip/turnServer") diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt index cfdb396a95..0894fbf004 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt @@ -369,8 +369,8 @@ class RoomDetailViewModel @AssistedInject constructor( } fun isMenuItemVisible(@IdRes itemId: Int) = when (itemId) { - R.id.clear_message_queue -> - /* For now always disable on production, worker cancellation is not working properly */ + R.id.clear_message_queue -> + // For now always disable when not in developer mode, worker cancellation is not working properly timeline.pendingEventCount() > 0 && vectorPreferences.developerMode() R.id.resend_all -> timeline.failedToDeliverEventCount() > 0 R.id.clear_all -> timeline.failedToDeliverEventCount() > 0