gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring and logging

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-10-17 11:54:02 +02:00
parent c81b1fa62f
commit 7e3a4e4a83
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 91 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1250,9 +1250,7 @@ class ChatActivity :
@Suppress("MagicNumber", "LongMethod")
private fun updateTypingIndicator() {
fun ellipsize(text: String): String {
return DisplayUtils.ellipsize(text, TYPING_INDICATOR_MAX_NAME_LENGTH)
}
fun ellipsize(text: String): String = DisplayUtils.ellipsize(text, TYPING_INDICATOR_MAX_NAME_LENGTH)
val participantNames = ArrayList<String>()
@ -1326,10 +1324,9 @@ class ChatActivity :
}
}
private fun isTypingStatusEnabled(): Boolean {
return webSocketInstance != null &&
private fun isTypingStatusEnabled(): Boolean =
webSocketInstance != null &&
!CapabilitiesUtil.isTypingStatusPrivate(conversationUser!!)
}
private fun setupSwipeToReply() {
if (this::participantPermissions.isInitialized &&
@ -1428,15 +1425,18 @@ class ChatActivity :
}
fun isOneToOneConversation() =
currentConversation != null && currentConversation?.type != null &&
currentConversation != null &&
currentConversation?.type != null &&
currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
private fun isGroupConversation() =
currentConversation != null && currentConversation?.type != null &&
currentConversation != null &&
currentConversation?.type != null &&
currentConversation?.type == ConversationEnums.ConversationType.ROOM_GROUP_CALL
private fun isPublicConversation() =
currentConversation != null && currentConversation?.type != null &&
currentConversation != null &&
currentConversation?.type != null &&
currentConversation?.type == ConversationEnums.ConversationType.ROOM_PUBLIC_CALL
private fun updateRoomTimerHandler() {
@ -1674,11 +1674,10 @@ class ChatActivity :
adapter?.notifyDataSetChanged()
}
private fun isChildOfExpandableSystemMessage(chatMessage: ChatMessage): Boolean {
return isSystemMessage(chatMessage) &&
private fun isChildOfExpandableSystemMessage(chatMessage: ChatMessage): Boolean =
isSystemMessage(chatMessage) &&
!chatMessage.expandableParent &&
chatMessage.lastItemOfExpandableGroup != 0
}
@SuppressLint("NotifyDataSetChanged")
override fun expandSystemMessage(chatMessageToExpand: ChatMessage) {
@ -1764,12 +1763,11 @@ class ChatActivity :
}
}
fun isRecordAudioPermissionGranted(): Boolean {
return PermissionChecker.checkSelfPermission(
fun isRecordAudioPermissionGranted(): Boolean =
PermissionChecker.checkSelfPermission(
context,
Manifest.permission.RECORD_AUDIO
) == PERMISSION_GRANTED
}
fun requestRecordAudioPermissions() {
requestPermissions(
@ -1876,11 +1874,10 @@ class ChatActivity :
}
}
private fun isReadOnlyConversation(): Boolean {
return currentConversation?.conversationReadOnlyState != null &&
private fun isReadOnlyConversation(): Boolean =
currentConversation?.conversationReadOnlyState != null &&
currentConversation?.conversationReadOnlyState ==
ConversationEnums.ConversationReadOnlyState.CONVERSATION_READ_ONLY
}
private fun checkLobbyState() {
if (currentConversation != null &&
@ -1896,7 +1893,8 @@ class ChatActivity :
sb.append(resources!!.getText(R.string.nc_lobby_waiting))
.append("\n\n")
if (currentConversation?.lobbyTimer != null && currentConversation?.lobbyTimer !=
if (currentConversation?.lobbyTimer != null &&
currentConversation?.lobbyTimer !=
0L
) {
val timestampMS = (currentConversation?.lobbyTimer ?: 0) * DateConstants.SECOND_DIVIDER
@ -2095,7 +2093,7 @@ class ChatActivity :
if (position != null && position >= 0) {
binding.messagesListView.scrollToPosition(position)
} else {
// TODO show error that we don't have that message?
Log.d(TAG, "message $messageId that should be scrolled to was not found (scrollToMessageWithId)")
}
}
@ -2107,6 +2105,12 @@ class ChatActivity :
position,
binding.messagesListView.height / 2
)
} else {
Log.d(
TAG,
"message $messageId that should be scrolled to was not found " +
"(scrollToAndCenterMessageWithId)"
)
}
}
}
@ -2270,11 +2274,10 @@ class ChatActivity :
startActivity(intent)
}
private fun validSessionId(): Boolean {
return currentConversation != null &&
private fun validSessionId(): Boolean =
currentConversation != null &&
sessionIdAfterRoomJoined?.isNotEmpty() == true &&
sessionIdAfterRoomJoined != "0"
}
@Suppress("Detekt.TooGenericExceptionCaught")
private fun cancelNotificationsForCurrentConversation() {
@ -2327,14 +2330,11 @@ class ChatActivity :
}
}
private fun isActivityNotChangingConfigurations(): Boolean {
return !isChangingConfigurations
}
private fun isActivityNotChangingConfigurations(): Boolean = !isChangingConfigurations
private fun isNotInCall(): Boolean {
return !ApplicationWideCurrentRoomHolder.getInstance().isInCall &&
private fun isNotInCall(): Boolean =
!ApplicationWideCurrentRoomHolder.getInstance().isInCall &&
!ApplicationWideCurrentRoomHolder.getInstance().isDialing
}
private fun setActionBarTitle() {
val title = binding.chatToolbar.findViewById<TextView>(R.id.chat_toolbar_title)
@ -2775,11 +2775,10 @@ class ChatActivity :
}
}
private fun isSameDayNonSystemMessages(messageLeft: ChatMessage, messageRight: ChatMessage): Boolean {
return TextUtils.isEmpty(messageLeft.systemMessage) &&
private fun isSameDayNonSystemMessages(messageLeft: ChatMessage, messageRight: ChatMessage): Boolean =
TextUtils.isEmpty(messageLeft.systemMessage) &&
TextUtils.isEmpty(messageRight.systemMessage) &&
DateFormatter.isSameDay(messageLeft.createdAt, messageRight.createdAt)
}
override fun onLoadMore(page: Int, totalItemsCount: Int) {
val id = (
@ -2799,15 +2798,14 @@ class ChatActivity :
)
}
override fun format(date: Date): String {
return if (DateFormatter.isToday(date)) {
override fun format(date: Date): String =
if (DateFormatter.isToday(date)) {
resources!!.getString(R.string.nc_date_header_today)
} else if (DateFormatter.isYesterday(date)) {
resources!!.getString(R.string.nc_date_header_yesterday)
} else {
DateFormatter.format(date, DateFormatter.Template.STRING_DAY_MONTH_YEAR)
}
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
super.onCreateOptionsMenu(menu)
@ -2869,8 +2867,8 @@ class ChatActivity :
return true
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
override fun onOptionsItemSelected(item: MenuItem): Boolean =
when (item.itemId) {
R.id.conversation_video_call -> {
startACall(false, false)
true
@ -2898,7 +2896,6 @@ class ChatActivity :
else -> super.onOptionsItemSelected(item)
}
}
private fun showSharedItems() {
val intent = Intent(this, SharedItemsActivity::class.java)
@ -2960,25 +2957,23 @@ class ChatActivity :
return chatMessageMap.values.toList()
}
private fun isInfoMessageAboutDeletion(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean {
return currentMessage.value.parentMessageId != null && currentMessage.value.systemMessageType == ChatMessage
.SystemMessageType.MESSAGE_DELETED
}
private fun isInfoMessageAboutDeletion(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.parentMessageId != null &&
currentMessage.value.systemMessageType == ChatMessage
.SystemMessageType.MESSAGE_DELETED
private fun isReactionsMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean {
return currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION ||
private fun isReactionsMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION ||
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION_DELETED ||
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION_REVOKED
}
private fun isEditMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean {
return currentMessage.value.parentMessageId != null && currentMessage.value.systemMessageType == ChatMessage
.SystemMessageType.MESSAGE_EDITED
}
private fun isEditMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.parentMessageId != null &&
currentMessage.value.systemMessageType == ChatMessage
.SystemMessageType.MESSAGE_EDITED
private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean {
return currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED
}
private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED
private fun startACall(isVoiceOnlyCall: Boolean, callWithoutNotification: Boolean) {
currentConversation?.let {
@ -3082,9 +3077,8 @@ class ChatActivity :
}
}
private fun isSystemMessage(message: ChatMessage): Boolean {
return ChatMessage.MessageType.SYSTEM_MESSAGE == message.getCalculateMessageType()
}
private fun isSystemMessage(message: ChatMessage): Boolean =
ChatMessage.MessageType.SYSTEM_MESSAGE == message.getCalculateMessageType()
fun deleteMessage(message: IMessage) {
if (!participantPermissions.hasChatPermission()) {
@ -3327,20 +3321,26 @@ class ChatActivity :
fileViewerUtils.openFileInFilesApp(link!!, keyID!!)
}
private fun hasVisibleItems(message: ChatMessage): Boolean {
return !message.isDeleted || // copy message
message.replyable || // reply to
message.replyable && // reply privately
conversationUser?.userId?.isNotEmpty() == true && conversationUser!!.userId != "?" &&
private fun hasVisibleItems(message: ChatMessage): Boolean =
!message.isDeleted ||
// copy message
message.replyable ||
// reply to
message.replyable &&
// reply privately
conversationUser?.userId?.isNotEmpty() == true &&
conversationUser!!.userId != "?" &&
message.user.id.startsWith("users/") &&
message.user.id.substring(ACTOR_LENGTH) != currentConversation?.actorId &&
currentConversation?.type != ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL ||
isShowMessageDeletionButton(message) || // delete
ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getCalculateMessageType() || // forward
message.previousMessageId > NO_PREVIOUS_MESSAGE_ID && // mark as unread
isShowMessageDeletionButton(message) ||
// delete
ChatMessage.MessageType.REGULAR_TEXT_MESSAGE == message.getCalculateMessageType() ||
// forward
message.previousMessageId > NO_PREVIOUS_MESSAGE_ID &&
// mark as unread
ChatMessage.MessageType.SYSTEM_MESSAGE != message.getCalculateMessageType() &&
BuildConfig.DEBUG
}
private fun setMessageAsDeleted(message: IMessage?) {
val messageTemp = message as ChatMessage
@ -3458,8 +3458,8 @@ class ChatActivity :
return isUserAllowedByPrivileges
}
override fun hasContentFor(message: ChatMessage, type: Byte): Boolean {
return when (type) {
override fun hasContentFor(message: ChatMessage, type: Byte): Boolean =
when (type) {
CONTENT_TYPE_LOCATION -> message.hasGeoLocation()
CONTENT_TYPE_VOICE_MESSAGE -> message.isVoiceMessage
CONTENT_TYPE_POLL -> message.isPoll()
@ -3470,7 +3470,6 @@ class ChatActivity :
else -> false
}
}
private fun processMostRecentMessage(recent: ChatMessage, chatMessageList: List<ChatMessage>) {
when (recent.systemMessageType) {

53
app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
View File

@ -108,35 +108,36 @@ class OfflineFirstChatRepository @Inject constructor(
override fun loadInitialMessages(withNetworkParams: Bundle): Job =
scope.launch {
Log.d(TAG, "---- loadInitialMessages ------------")
Log.d(TAG, "conversationModel.internalId: " + conversationModel.internalId)
newXChatLastCommonRead = conversationModel.lastCommonReadMessage
Log.d(TAG, "conversationModel.internalId: " + conversationModel.internalId)
Log.d(TAG, "conversationModel.lastReadMessage:" + conversationModel.lastReadMessage)
var newestMessageIdFromDb = chatDao.getNewestMessageId(internalConversationId)
Log.d(TAG, "newestMessageId: $newestMessageIdFromDb")
if (newestMessageIdFromDb.toInt() == 0) {
Log.d(TAG, "newestMessageId from db was 0. Must only happen when chat is loaded for the first time")
}
Log.d(TAG, "newestMessageIdFromDb: $newestMessageIdFromDb")
// infos from Ivan to
// "Why is it lastReadMessageId that is checked? Shouldn't it be lastMessage instead?
// https://github.com/nextcloud/talk-ios/blob/master/NextcloudTalk/NCChatController.m#L473 "
//
// answer:
// "I guess we do it with the lastReadMessageId in order to place the separator of "Unread messages" when you enter the chat"
//
// if it turns out lastMessage can be used instead lastReadMessage, use this:
// val doInitialLoadFromServer = conversationModel.lastMessage?.let {
// newestMessageIdFromDb < it.id
// } ?: true
// Log.d(TAG, "doInitialLoadFromServer:$doInitialLoadFromServer")
//
// if (doInitialLoadFromServer) {
val weAlreadyHaveSomeOfflineMessages = newestMessageIdFromDb > 0
val weHaveAtLeastTheLastReadMessage = newestMessageIdFromDb >= conversationModel.lastReadMessage.toLong()
Log.d(TAG, "weAlreadyHaveSomeOfflineMessages:$weAlreadyHaveSomeOfflineMessages")
Log.d(TAG, "weHaveAtLeastTheLastReadMessage:$weHaveAtLeastTheLastReadMessage")
if (newestMessageIdFromDb < conversationModel.lastReadMessage.toLong()) {
Log.d(TAG, "An online request is made because chat is not up to date")
if (weAlreadyHaveSomeOfflineMessages && weHaveAtLeastTheLastReadMessage) {
Log.d(
TAG,
"Initial online request is skipped because offline messages are up to date" +
" until lastReadMessage"
)
Log.d(TAG, "For messages newer than lastRead, lookIntoFuture will load them.")
} else {
if (!weAlreadyHaveSomeOfflineMessages) {
Log.d(TAG, "An online request for newest 100 messages is made because offline chat is empty")
} else {
Log.d(
TAG,
"An online request for newest 100 messages is made because we don't have the lastReadMessage " +
"(gaps could be closed by scrolling up to merge the chatblocks)"
)
}
// set up field map to load the newest messages
val fieldMap = getFieldMap(
@ -155,11 +156,7 @@ class OfflineFirstChatRepository @Inject constructor(
}
newestMessageIdFromDb = chatDao.getNewestMessageId(internalConversationId)
Log.d(TAG, "newestMessageId after sync: $newestMessageIdFromDb")
} else {
Log.d(TAG, "Initial online request is skipped because offline messages are up to date")
// if conversationModel was not up to date and there are new messages, they will just get pulled with
// look into future.. Old messages will be displayed immediately beforehand.
Log.d(TAG, "newestMessageIdFromDb after sync: $newestMessageIdFromDb")
}
val limit = getCappedMessagesAmountOfChatBlock(newestMessageIdFromDb)
@ -367,7 +364,7 @@ class OfflineFirstChatRepository @Inject constructor(
.map(ChatMessageEntity::asModel)
}
@Suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST", "MagicNumber")
private fun getMessagesFromServer(bundle: Bundle): Pair<Int, List<ChatMessageJson>>? {
val fieldMap = bundle.getSerializable(BundleKeys.KEY_FIELD_MAP) as HashMap<String, Int>