Skip to content

Commit c48211c

Browse files
fix build
Signed-off-by: tobiasKaminsky <[email protected]>
1 parent 395b571 commit c48211c

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ import androidx.compose.runtime.mutableStateOf
6565
import androidx.compose.runtime.setValue
6666
import androidx.compose.ui.platform.ComposeView
6767
import androidx.coordinatorlayout.widget.CoordinatorLayout
68+
import androidx.core.content.ContextCompat
6869
import androidx.core.content.FileProvider
6970
import androidx.core.content.PermissionChecker
7071
import androidx.core.content.PermissionChecker.PERMISSION_GRANTED
@@ -246,7 +247,6 @@ import java.util.Locale
246247
import java.util.concurrent.ExecutionException
247248
import javax.inject.Inject
248249
import kotlin.math.roundToInt
249-
import androidx.core.content.ContextCompat
250250

251251
@Suppress("TooManyFunctions")
252252
@AutoInjector(NextcloudTalkApplication::class)
@@ -262,11 +262,6 @@ class ChatActivity :
262262
SystemMessageInterface,
263263
CallStartedMessageInterface {
264264

265-
companion object {
266-
private const val NOTIFICATION_LEVEL_ALWAYS = 1
267-
private const val NOTIFICATION_LEVEL_NEVER = 3
268-
}
269-
270265
var active = false
271266

272267
private lateinit var binding: ActivityChatBinding
@@ -4604,6 +4599,8 @@ class ChatActivity :
46044599
private const val FIVE_MINUTES_IN_SECONDS: Long = 300
46054600
private const val ROOM_TYPE_ONE_TO_ONE = "1"
46064601
private const val ACTOR_TYPE = "users"
4602+
private const val NOTIFICATION_LEVEL_ALWAYS = 1
4603+
private const val NOTIFICATION_LEVEL_NEVER = 3
46074604
const val CONVERSATION_INTERNAL_ID = "CONVERSATION_INTERNAL_ID"
46084605
const val NO_OFFLINE_MESSAGES_FOUND = "NO_OFFLINE_MESSAGES_FOUND"
46094606
const val VOICE_MESSAGE_CONTINUOUS_BEFORE = -5

app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class ConversationsListViewModel @Inject constructor(
150150
followedThreadsExistNew.toString(),
151151
""
152152
)
153-
} catch (exception: Throwable) {
153+
} catch (exception: Exception) {
154154
_threadsExistState.value = ThreadsExistUiState.Error(exception)
155155
}
156156
}

0 commit comments

Comments
 (0)