From a9168b3f9dfe1e5839ba2d5564d9a61456e84e33 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Thu, 5 Dec 2024 15:51:27 +0100 Subject: [PATCH] format code Signed-off-by: sowjanyakch --- .../com/nextcloud/talk/api/NcApiCoroutines.kt | 6 +- .../com/nextcloud/talk/chat/ChatActivity.kt | 96 ++++++++++--------- .../data/network/ChatNetworkDataSource.kt | 3 +- .../chat/data/network/RetrofitChatNetwork.kt | 15 ++- .../talk/chat/viewmodels/ChatViewModel.kt | 3 +- .../talk/dagger/modules/RepositoryModule.kt | 2 +- .../json/userAbsence/UserAbsenceData.kt | 2 +- .../models/json/userAbsence/UserAbsenceOCS.kt | 1 - .../json/userAbsence/UserAbsenceOverall.kt | 1 - .../java/com/nextcloud/talk/utils/ApiUtils.kt | 2 +- 10 files changed, 66 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt index 5505998cf..26e67f261 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt +++ b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt @@ -201,9 +201,7 @@ interface NcApiCoroutines { @GET suspend fun getOutOfOfficeStatusForUser( - @Header("Authorization") authorization:String, - @Url url:String + @Header("Authorization") authorization: String, + @Url url: String ): UserAbsenceOverall - - } diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 91f5feff1..d5de6a60d 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -617,10 +617,15 @@ class ChatActivity : urlForChatting ) - if(currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && - currentConversation?.status == "dnd"){ - conversationUser?.let{ user -> - chatViewModel.outOfOfficeStatusOfUser(credentials, user.baseUrl!!, currentConversation!!.name) + if (currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && + currentConversation?.status == "dnd" + ) { + conversationUser?.let { user -> + chatViewModel.outOfOfficeStatusOfUser( + credentials, + user.baseUrl!!, + currentConversation!!.name + ) } } @@ -695,11 +700,14 @@ class ChatActivity : checkShowCallButtons() checkLobbyState() - if(currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL){ - conversationUser?.let{ user -> + if (currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) { + conversationUser?.let { user -> val credentials = ApiUtils.getCredentials(user.username, user.token) - chatViewModel.outOfOfficeStatusOfUser(credentials!!, user.baseUrl!!, - currentConversation!!.displayName) + chatViewModel.outOfOfficeStatusOfUser( + credentials!!, + user.baseUrl!!, + currentConversation!!.displayName + ) } } @@ -1070,63 +1078,58 @@ class ChatActivity : binding.voiceRecordingLock.y -= y } - chatViewModel.outOfOfficeViewState.observe(this){uiState -> - when(uiState){ + chatViewModel.outOfOfficeViewState.observe(this) { uiState -> + when (uiState) { is ChatViewModel.OutOfOfficeUIState.Error -> { - Log.e(TAG, "Error in outOfOfficeState",uiState.exception) - + Log.e(TAG, "Error in outOfOfficeState", uiState.exception) } ChatViewModel.OutOfOfficeUIState.None -> { - } is ChatViewModel.OutOfOfficeUIState.Success -> { binding.outOfOfficeContainer.visibility = View.VISIBLE + val startDateTimestamp: Long = uiState.userAbsence.startDate.toLong() + val endDateTimestamp: Long = uiState.userAbsence.endDate.toLong() - val startDateTimestamp:Long = uiState.userAbsence.startDate.toLong() - val endDateTimestamp:Long = uiState.userAbsence.endDate.toLong() + val startDate = Date(startDateTimestamp * 1000) + val endDate = Date(endDateTimestamp * 1000) - val startDate = Date(startDateTimestamp * 1000) - val endDate = Date(endDateTimestamp * 1000) + val date1 = Calendar.getInstance().apply { time = startDate } + val date2 = Calendar.getInstance().apply { time = endDate } - val date1 = Calendar.getInstance().apply{time = startDate} - val date2 = Calendar.getInstance().apply{time = endDate} + val isSameDay = date1.get(Calendar.YEAR) == date2.get(Calendar.YEAR) && + date1.get(Calendar.DAY_OF_YEAR) == date2.get(Calendar.DAY_OF_YEAR) - val isSameDay = date1.get(Calendar.YEAR) == date2.get(Calendar.YEAR) && - date1.get(Calendar.DAY_OF_YEAR) == date2.get(Calendar.DAY_OF_YEAR) + if (isSameDay) { + binding.outOfOfficeContainer.findViewById(R.id.userAbsenceShortMessage).text = String.format( + context.resources.getString(R.string.user_absence_for_one_day), + uiState.userAbsence.userId + ) + binding.outOfOfficeContainer.findViewById(R.id.userAbsencePeriod).visibility = + View.GONE + } else { + val dateFormatter = SimpleDateFormat("MMM d, yyyy", Locale.getDefault()) + val startDateString = dateFormatter.format(startDate) + val endDateString = dateFormatter.format(endDate) + binding.outOfOfficeContainer.findViewById(R.id.userAbsenceShortMessage).text = String.format( + context.resources.getString(R.string.user_absence), + uiState.userAbsence.userId + ) - if (isSameDay) { - binding.outOfOfficeContainer.findViewById(R.id.userAbsenceShortMessage).text = String.format( - context.resources.getString(R.string.user_absence_for_one_day), - uiState.userAbsence.userId - ) - binding.outOfOfficeContainer.findViewById(R.id.userAbsencePeriod).visibility = - View.GONE - } else { - val dateFormatter = SimpleDateFormat("MMM d, yyyy", Locale.getDefault()) - val startDateString = dateFormatter.format(startDate) - val endDateString = dateFormatter.format(endDate) - binding.outOfOfficeContainer.findViewById(R.id.userAbsenceShortMessage).text = String.format( - context.resources.getString(R.string.user_absence), - uiState.userAbsence.userId - ) + binding.outOfOfficeContainer.findViewById(R.id.userAbsencePeriod).text = "$startDateString - $endDateString" + } - binding.outOfOfficeContainer.findViewById(R.id.userAbsencePeriod).text = "$startDateString - $endDateString" - } - - - if(uiState.userAbsence.replacementUserDisplayName != null){ + if (uiState.userAbsence.replacementUserDisplayName != null) { binding.outOfOfficeContainer.findViewById(R.id.absenceReplacement).text = String.format( context.resources.getString(R.string.user_absence_replacement), uiState.userAbsence.replacementUserDisplayName ) - }else{ + } else { binding.outOfOfficeContainer.findViewById(R.id.absenceReplacement).visibility = View.GONE } binding.outOfOfficeContainer.findViewById(R.id.userAbsenceLongMessage).text = uiState.userAbsence.message } } - } } @@ -3183,7 +3186,7 @@ class ChatActivity : private fun isInfoMessageAboutDeletion(currentMessage: MutableMap.MutableEntry): Boolean = currentMessage.value.parentMessageId != null && currentMessage.value.systemMessageType == ChatMessage - .SystemMessageType.MESSAGE_DELETED + .SystemMessageType.MESSAGE_DELETED private fun isReactionsMessage(currentMessage: MutableMap.MutableEntry): Boolean = currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION || @@ -3193,7 +3196,7 @@ class ChatActivity : private fun isEditMessage(currentMessage: MutableMap.MutableEntry): Boolean = currentMessage.value.parentMessageId != null && currentMessage.value.systemMessageType == ChatMessage - .SystemMessageType.MESSAGE_EDITED + .SystemMessageType.MESSAGE_EDITED private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry): Boolean = currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED @@ -3488,7 +3491,7 @@ class ChatActivity : val lon = data["longitude"]!! metaData = "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," + - "\"longitude\":\"$lon\",\"name\":\"$name\"}" + "\"longitude\":\"$lon\",\"name\":\"$name\"}" } shareToNotes(shareUri, roomToken, message, objectId, metaData) @@ -3950,4 +3953,3 @@ class ChatActivity : const val NO_OFFLINE_MESSAGES_FOUND = "NO_OFFLINE_MESSAGES_FOUND" } } - diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt index 8769753d6..81a6ec6c8 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt @@ -64,6 +64,5 @@ interface ChatNetworkDataSource { fun createRoom(credentials: String, url: String, map: Map): Observable fun setChatReadMarker(credentials: String, url: String, previousMessageId: Int): Observable fun editChatMessage(credentials: String, url: String, text: String): Observable - suspend fun getOutOfOfficeStatusForUser (credentials:String,baseUrl:String, userId:String): UserAbsenceOverall - + suspend fun getOutOfOfficeStatusForUser(credentials: String, baseUrl: String, userId: String): UserAbsenceOverall } diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt index 590c3ba50..19b067608 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt @@ -21,7 +21,7 @@ import com.nextcloud.talk.utils.ApiUtils import io.reactivex.Observable import retrofit2.Response -class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines:NcApiCoroutines) : ChatNetworkDataSource { +class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines: NcApiCoroutines) : ChatNetworkDataSource { override fun getRoom(user: User, roomToken: String): Observable { val credentials: String = ApiUtils.getCredentials(user.username, user.token)!! val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V3, 1)) @@ -181,9 +181,14 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines: return ncApi.editChatMessage(credentials, url, text).map { it } } - override suspend fun getOutOfOfficeStatusForUser(credentials: String, baseUrl: String, userId:String): - UserAbsenceOverall { - return ncApiCoroutines.getOutOfOfficeStatusForUser(credentials, - ApiUtils.getUrlForOutOfOffice(baseUrl,userId)) + override suspend fun getOutOfOfficeStatusForUser( + credentials: String, + baseUrl: String, + userId: String + ): UserAbsenceOverall { + return ncApiCoroutines.getOutOfOfficeStatusForUser( + credentials, + ApiUtils.getUrlForOutOfOffice(baseUrl, userId) + ) } } diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt index 71821d1d5..328170b34 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt @@ -771,7 +771,7 @@ class ChatViewModel @Inject constructor( } } - fun outOfOfficeStatusOfUser(credentials:String, baseUrl: String, userId: String) { + fun outOfOfficeStatusOfUser(credentials: String, baseUrl: String, userId: String) { viewModelScope.launch { try { val response = chatNetworkDataSource.getOutOfOfficeStatusForUser(credentials, baseUrl, userId) @@ -787,7 +787,6 @@ class ChatViewModel @Inject constructor( const val JOIN_ROOM_RETRY_COUNT: Long = 3 } - sealed class OutOfOfficeUIState { data object None : OutOfOfficeUIState() data class Success(val userAbsence: UserAbsenceData) : OutOfOfficeUIState() diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt index 6d2bdda9d..0efa202ce 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt @@ -148,7 +148,7 @@ class RepositoryModule { @Provides fun provideChatNetworkDataSource(ncApi: NcApi, ncApiCoroutines: NcApiCoroutines): ChatNetworkDataSource { - return RetrofitChatNetwork(ncApi,ncApiCoroutines) + return RetrofitChatNetwork(ncApi, ncApiCoroutines) } @Provides diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceData.kt b/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceData.kt index 044082703..77e71e8c7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceData.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceData.kt @@ -30,7 +30,7 @@ data class UserAbsenceData( @JsonField(name = ["replacementUserId"]) var replacementUserId: String?, @JsonField(name = ["replacementUserDisplayName"]) - var replacementUserDisplayName: String?, + var replacementUserDisplayName: String? ) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOCS.kt index 30d41eba3..06a80c4ca 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOCS.kt @@ -24,4 +24,3 @@ data class UserAbsenceOCS( // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this(null, null) } - diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOverall.kt index c6c79626a..7f6fada53 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userAbsence/UserAbsenceOverall.kt @@ -21,4 +21,3 @@ data class UserAbsenceOverall( // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this(null) } - diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt index f6b4b60d5..f46c6ea0e 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt @@ -602,7 +602,7 @@ object ApiUtils { return "${getUrlForRoom(version, baseUrl, token)}/archive" } - fun getUrlForOutOfOffice(baseUrl:String, userId:String):String{ + fun getUrlForOutOfOffice(baseUrl: String, userId: String): String { return "$baseUrl$OCS_API_VERSION/apps/dav/api/v1/outOfOffice/$userId/now" } }