From 627e9d5c20e704219fd1b0875b1b5ad6ed721703 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 5 Dec 2023 16:05:39 +0100 Subject: [PATCH] ktlint: No whitespace expected between opening parenthesis and first parameter name Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/activities/CallActivity.kt | 16 ++------ .../talk/adapters/items/ConversationItem.kt | 9 +---- .../talk/adapters/messages/LinkPreview.kt | 7 +--- .../items/ListIconDialogAdapter.kt | 15 ++----- .../nextcloud/talk/call/ReactionAnimator.kt | 9 +---- .../com/nextcloud/talk/chat/ChatActivity.kt | 15 ++----- .../talk/chat/data/ChatRepositoryImpl.kt | 11 +----- .../repository/ConversationRepository.kt | 10 +---- .../repository/ConversationRepositoryImpl.kt | 5 +-- .../viewmodel/ConversationViewModel.kt | 5 +-- .../ConversationsListActivity.kt | 4 +- .../talk/jobs/ShareOperationWorker.kt | 7 +--- .../talk/jobs/UploadAndShareFilesWorker.kt | 11 +----- .../talk/location/LocationPickerActivity.kt | 6 +-- .../talk/models/domain/ConversationModel.kt | 4 +- .../talk/models/json/chat/ChatUtils.kt | 5 +-- .../data/OpenConversationsRepositoryImpl.kt | 4 +- .../talk/polls/ui/PollLoadingFragment.kt | 10 +---- .../talk/polls/ui/PollResultsFragment.kt | 6 +-- .../talk/polls/ui/PollVoteFragment.kt | 6 +-- .../nextcloud/talk/profile/ProfileActivity.kt | 10 +---- .../raisehand/RequestAssistanceRepository.kt | 8 +--- .../RequestAssistanceRepositoryImpl.kt | 8 +--- .../activities/RemoteFileBrowserActivity.kt | 5 +-- .../callrecording/CallRecordingRepository.kt | 8 +--- .../CallRecordingRepositoryImpl.kt | 16 ++------ .../reactions/ReactionsRepository.kt | 12 +----- .../reactions/ReactionsRepositoryImpl.kt | 6 +-- .../repositories/SharedItemsRepository.kt | 11 +----- .../repositories/SharedItemsRepositoryImpl.kt | 5 +-- .../repositories/TranslateRepository.kt | 5 +-- .../talk/ui/dialog/DateTimePickerFragment.kt | 15 +++---- .../ui/dialog/FilterConversationFragment.kt | 6 +-- .../ui/dialog/SaveToStorageDialogFragment.kt | 4 +- .../talk/ui/dialog/SetStatusDialogFragment.kt | 4 +- .../ui/theme/TalkSpecificViewThemeUtils.kt | 12 +----- .../upload/chunked/ChunkedFileUploader.kt | 11 +----- .../chunked/OnDataTransferProgressListener.kt | 4 +- .../talk/upload/normal/FileUploader.kt | 7 +--- .../nextcloud/talk/utils/BitmapShrinker.kt | 18 ++------- .../nextcloud/talk/utils/FileViewerUtils.kt | 5 +-- .../nextcloud/talk/utils/NotificationUtils.kt | 39 ++++--------------- .../nextcloud/talk/utils/RemoteFileUtils.kt | 18 ++------- .../com/nextcloud/talk/utils/ShareUtils.kt | 6 +-- .../third/parties/fresco/BetterImageSpan.kt | 8 +--- 45 files changed, 84 insertions(+), 332 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 8a6c92466..b850d9fc7 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -1050,10 +1050,7 @@ class CallActivity : CallBaseActivity() { private val isConnectionEstablished: Boolean get() = currentCallStatus === CallStatus.JOINED || currentCallStatus === CallStatus.IN_CONVERSATION - private fun onAudioManagerDevicesChanged( - currentDevice: AudioDevice, - availableDevices: Set - ) { + private fun onAudioManagerDevicesChanged(currentDevice: AudioDevice, availableDevices: Set) { Log.d(TAG, "onAudioManagerDevicesChanged: $availableDevices, currentDevice: $currentDevice") val shouldDisableProximityLock = currentDevice == AudioDevice.WIRED_HEADSET || @@ -1529,10 +1526,7 @@ class CallActivity : CallBaseActivity() { }) } - private fun addIceServers( - signalingSettingsOverall: SignalingSettingsOverall, - apiVersion: Int - ) { + private fun addIceServers(signalingSettingsOverall: SignalingSettingsOverall, apiVersion: Int) { if (signalingSettingsOverall.ocs!!.settings!!.stunServers != null) { val stunServers = signalingSettingsOverall.ocs!!.settings!!.stunServers if (apiVersion == ApiUtils.APIv3) { @@ -3035,11 +3029,7 @@ class CallActivity : CallBaseActivity() { } } - private fun updatePictureInPictureActions( - @DrawableRes iconId: Int, - title: String?, - requestCode: Int - ) { + private fun updatePictureInPictureActions(@DrawableRes iconId: Int, title: String?, requestCode: Int) { if (isGreaterEqualOreo && isPipModePossible) { val actions = ArrayList() val icon = Icon.createWithResource(this, iconId) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt index 4906bb7bc..3dbf39f16 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -203,9 +203,7 @@ class ConversationItem( } } - private fun shouldLoadAvatar( - holder: ConversationItemViewHolder - ): Boolean { + private fun shouldLoadAvatar(holder: ConversationItemViewHolder): Boolean { return when (model.objectType) { Conversation.ObjectType.SHARE_PASSWORD -> { holder.binding.dialogAvatar.setImageDrawable( @@ -237,10 +235,7 @@ class ConversationItem( } } - private fun setLastMessage( - holder: ConversationItemViewHolder, - appContext: Context - ) { + private fun setLastMessage(holder: ConversationItemViewHolder, appContext: Context) { if (model.lastMessage != null) { holder.binding.dialogDate.visibility = View.VISIBLE holder.binding.dialogDate.text = DateUtils.getRelativeTimeSpanString( diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt index cfba665d5..8ddd8a52e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt @@ -38,12 +38,7 @@ import io.reactivex.schedulers.Schedulers class LinkPreview { - fun showLink( - message: ChatMessage, - ncApi: NcApi, - binding: ReferenceInsideMessageBinding, - context: Context - ) { + fun showLink(message: ChatMessage, ncApi: NcApi, binding: ReferenceInsideMessageBinding, context: Context) { binding.referenceName.text = "" binding.referenceDescription.text = "" binding.referenceLink.text = "" diff --git a/app/src/main/java/com/nextcloud/talk/bottomsheet/items/ListIconDialogAdapter.kt b/app/src/main/java/com/nextcloud/talk/bottomsheet/items/ListIconDialogAdapter.kt index ccae4ac4f..434df1b23 100644 --- a/app/src/main/java/com/nextcloud/talk/bottomsheet/items/ListIconDialogAdapter.kt +++ b/app/src/main/java/com/nextcloud/talk/bottomsheet/items/ListIconDialogAdapter.kt @@ -79,10 +79,7 @@ internal class ListIconDialogAdapter( } } - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): ListItemViewHolder { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ListItemViewHolder { val listItemView: View = parent.inflate(dialog.windowContext, R.layout.menu_item_sheet) val viewHolder = ListItemViewHolder( itemView = listItemView, @@ -94,10 +91,7 @@ internal class ListIconDialogAdapter( override fun getItemCount() = items.size - override fun onBindViewHolder( - holder: ListItemViewHolder, - position: Int - ) { + override fun onBindViewHolder(holder: ListItemViewHolder, position: Int) { holder.itemView.isEnabled = !disabledIndices.contains(position) val currentItem = items[position] @@ -120,10 +114,7 @@ internal class ListIconDialogAdapter( } } - override fun replaceItems( - items: List, - listener: ListItemListener - ) { + override fun replaceItems(items: List, listener: ListItemListener) { this.items = items if (listener != null) { this.selection = listener diff --git a/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt b/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt index 746644b8c..3354c3ab9 100644 --- a/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt +++ b/app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt @@ -46,10 +46,7 @@ class ReactionAnimator( ) { private val reactionsList: MutableList = ArrayList() - fun addReaction( - emoji: String, - displayName: String - ) { + fun addReaction(emoji: String, displayName: String) { val callReaction = CallReaction(emoji, displayName) reactionsList.add(callReaction) @@ -58,9 +55,7 @@ class ReactionAnimator( } } - private fun animateReaction( - callReaction: CallReaction - ) { + private fun animateReaction(callReaction: CallReaction) { val reactionWrapper = getReactionWrapperView(callReaction) val params = RelativeLayout.LayoutParams( 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 45f446bfd..1f31472ed 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -2979,9 +2979,7 @@ class ChatActivity : } } - fun leaveRoom( - funToCallWhenLeaveSuccessful: (() -> Unit)? - ) { + fun leaveRoom(funToCallWhenLeaveSuccessful: (() -> Unit)?) { logConversationInfos("leaveRoom") var apiVersion = 1 @@ -3147,11 +3145,7 @@ class ChatActivity : signalingMessageSender = webSocketInstance?.signalingMessageSender } - fun pullChatMessages( - lookIntoFuture: Boolean, - setReadMarker: Boolean = true, - xChatLastCommonRead: Int? = null - ) { + fun pullChatMessages(lookIntoFuture: Boolean, setReadMarker: Boolean = true, xChatLastCommonRead: Int? = null) { if (!validSessionId()) { return } @@ -3471,10 +3465,7 @@ class ChatActivity : } } - private fun addMessagesToAdapter( - shouldAddNewMessagesNotice: Boolean, - chatMessageList: List - ) { + private fun addMessagesToAdapter(shouldAddNewMessagesNotice: Boolean, chatMessageList: List) { val isThereANewNotice = shouldAddNewMessagesNotice || adapter?.getMessagePositionByIdInReverse("-1") != -1 for (chatMessage in chatMessageList) { diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/ChatRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/chat/data/ChatRepositoryImpl.kt index 81327cf74..488aaece3 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/ChatRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/ChatRepositoryImpl.kt @@ -29,10 +29,7 @@ import com.nextcloud.talk.utils.ApiUtils import io.reactivex.Observable class ChatRepositoryImpl(private val ncApi: NcApi) : ChatRepository { - override fun getRoom( - user: User, - roomToken: String - ): Observable { + override fun getRoom(user: User, roomToken: String): Observable { val credentials: String = ApiUtils.getCredentials(user.username, user.token) val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.APIv4, ApiUtils.APIv3, 1)) @@ -42,11 +39,7 @@ class ChatRepositoryImpl(private val ncApi: NcApi) : ChatRepository { ).map { ConversationModel.mapToConversationModel(it.ocs?.data!!) } } - override fun joinRoom( - user: User, - roomToken: String, - roomPassword: String - ): Observable { + override fun joinRoom(user: User, roomToken: String, roomPassword: String): Observable { val credentials: String = ApiUtils.getCredentials(user.username, user.token) val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.APIv4, 1)) diff --git a/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepository.kt b/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepository.kt index 4e085b556..fd8760d49 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepository.kt @@ -27,13 +27,7 @@ import io.reactivex.Observable interface ConversationRepository { - fun renameConversation( - roomToken: String, - roomNameNew: String - ): Observable + fun renameConversation(roomToken: String, roomNameNew: String): Observable - fun createConversation( - roomName: String, - conversationType: Conversation.ConversationType? - ): Observable + fun createConversation(roomName: String, conversationType: Conversation.ConversationType?): Observable } diff --git a/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepositoryImpl.kt index 6db12b27f..adc6f88eb 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/repository/ConversationRepositoryImpl.kt @@ -38,10 +38,7 @@ class ConversationRepositoryImpl(private val ncApi: NcApi, currentUserProvider: val currentUser: User = currentUserProvider.currentUser.blockingGet() val credentials: String = ApiUtils.getCredentials(currentUser.username, currentUser.token) - override fun renameConversation( - roomToken: String, - roomNameNew: String - ): Observable { + override fun renameConversation(roomToken: String, roomNameNew: String): Observable { val apiVersion = ApiUtils.getConversationApiVersion(currentUser, intArrayOf(ApiUtils.APIv4, ApiUtils.APIv1)) return ncApi.renameRoom( diff --git a/app/src/main/java/com/nextcloud/talk/conversation/viewmodel/ConversationViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversation/viewmodel/ConversationViewModel.kt index c35f31ced..69e230310 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/viewmodel/ConversationViewModel.kt @@ -54,10 +54,7 @@ class ConversationViewModel @Inject constructor(private val repository: Conversa disposable?.dispose() } - fun createConversation( - roomName: String, - conversationType: Conversation.ConversationType? - ) { + fun createConversation(roomName: String, conversationType: Conversation.ConversationType?) { _viewState.value = CreatingState repository.createConversation( diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 9ee0e5c41..c473ecc6d 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -352,9 +352,7 @@ class ConversationsListActivity : viewThemeUtils.material.themeToolbar(binding.conversationListToolbar) } - private fun loadUserAvatar( - target: Target - ) { + private fun loadUserAvatar(target: Target) { if (currentUser != null) { val url = ApiUtils.getUrlForAvatar( currentUser!!.baseUrl, diff --git a/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.kt index 95f09fdcb..36069a160 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.kt @@ -93,12 +93,7 @@ class ShareOperationWorker(context: Context, workerParams: WorkerParameters) : W companion object { private val TAG = ShareOperationWorker::class.simpleName - fun shareFile( - roomToken: String?, - currentUser: User, - remotePath: String, - metaData: String? - ) { + fun shareFile(roomToken: String?, currentUser: User, remotePath: String, metaData: String?) { val paths: MutableList = ArrayList() paths.add(remotePath) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt index e6bc5370d..6ace53128 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/UploadAndShareFilesWorker.kt @@ -186,9 +186,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa return remotePath } - override fun onTransferProgress( - percentage: Int - ) { + override fun onTransferProgress(percentage: Int) { notification = mBuilder!! .setProgress(HUNDRED_PERCENT, percentage, false) .setContentText(getNotificationContentText(percentage)) @@ -322,12 +320,7 @@ class UploadAndShareFilesWorker(val context: Context, workerParameters: WorkerPa } } - fun upload( - fileUri: String, - roomToken: String, - conversationName: String, - metaData: String? - ) { + fun upload(fileUri: String, roomToken: String, conversationName: String, metaData: String?) { val data: Data = Data.Builder() .putString(DEVICE_SOURCE_FILE, fileUri) .putString(ROOM_TOKEN, roomToken) diff --git a/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt b/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt index be2bba066..f34f8659d 100644 --- a/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt @@ -524,11 +524,7 @@ class LocationPickerActivity : ) } - override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray - ) { + override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) fun areAllGranted(grantResults: IntArray): Boolean { diff --git a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt index df194cb30..e9e2a164a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt +++ b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt @@ -46,9 +46,7 @@ class ConversationModel( ) { companion object { - fun mapToConversationModel( - conversation: Conversation - ): ConversationModel { + fun mapToConversationModel(conversation: Conversation): ConversationModel { return ConversationModel( roomId = conversation.roomId, token = conversation.token, diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt index d6d1d6869..a7661faa2 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt @@ -35,10 +35,7 @@ class ChatUtils { } @Suppress("Detekt.ComplexMethod") - private fun parse( - messageParameters: HashMap>, - message: String? - ): String? { + private fun parse(messageParameters: HashMap>, message: String?): String? { var resultMessage = message for (key in messageParameters.keys) { val individualHashMap = messageParameters[key] diff --git a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt index 1924b85c1..cde534757 100644 --- a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt @@ -42,9 +42,7 @@ class OpenConversationsRepositoryImpl(private val ncApi: NcApi, currentUserProvi ).map { mapToOpenConversationsModel(it.ocs?.data!!) } } - private fun mapToOpenConversationsModel( - conversations: List - ): OpenConversationsModel { + private fun mapToOpenConversationsModel(conversations: List): OpenConversationsModel { return OpenConversationsModel( conversations.map { conversation -> OpenConversation( diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollLoadingFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollLoadingFragment.kt index 80b8a62c6..803e1136c 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollLoadingFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollLoadingFragment.kt @@ -49,11 +49,7 @@ class PollLoadingFragment : Fragment() { fragmentHeight = arguments?.getInt(KEY_FRAGMENT_HEIGHT)!! } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { binding = DialogPollLoadingBinding.inflate(inflater, container, false) binding.root.layoutParams.height = fragmentHeight viewThemeUtils.platform.colorCircularProgressBar(binding.pollLoadingProgressbar, ColorRole.PRIMARY) @@ -65,9 +61,7 @@ class PollLoadingFragment : Fragment() { private const val KEY_FRAGMENT_HEIGHT = "keyFragmentHeight" @JvmStatic - fun newInstance( - fragmentHeight: Int - ): PollLoadingFragment { + fun newInstance(fragmentHeight: Int): PollLoadingFragment { val args = bundleOf( KEY_FRAGMENT_HEIGHT to fragmentHeight ) diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt index 17c040886..2d6b338bd 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollResultsFragment.kt @@ -65,11 +65,7 @@ class PollResultsFragment : Fragment(), PollResultItemClickListener { parentViewModel = ViewModelProvider(requireParentFragment(), viewModelFactory)[PollMainViewModel::class.java] } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { binding = DialogPollResultsBinding.inflate(inflater, container, false) return binding.root } diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt index 2443abaca..9ce154019 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollVoteFragment.kt @@ -69,11 +69,7 @@ class PollVoteFragment : Fragment() { parentViewModel = ViewModelProvider(requireParentFragment(), viewModelFactory)[PollMainViewModel::class.java] } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { binding = DialogPollVoteBinding.inflate(inflater, container, false) return binding.root } diff --git a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt index 8b7f16478..48020e8c9 100644 --- a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt @@ -688,10 +688,7 @@ class ProfileActivity : BaseActivity() { } } - private fun initUserInfoEditText( - holder: ViewHolder, - item: UserInfoDetailsItem - ) { + private fun initUserInfoEditText(holder: ViewHolder, item: UserInfoDetailsItem) { holder.binding.userInfoEditTextEdit.setText(item.text) holder.binding.userInfoInputLayout.hint = item.hint holder.binding.userInfoEditTextEdit.addTextChangedListener(object : TextWatcher { @@ -714,10 +711,7 @@ class ProfileActivity : BaseActivity() { }) } - private fun initScopeElements( - item: UserInfoDetailsItem, - holder: ViewHolder - ) { + private fun initScopeElements(item: UserInfoDetailsItem, holder: ViewHolder) { if (item.scope == null) { holder.binding.scope.visibility = View.GONE } else { diff --git a/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepository.kt b/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepository.kt index 826dc72e1..2c5d2b958 100644 --- a/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepository.kt @@ -24,11 +24,7 @@ import io.reactivex.Observable interface RequestAssistanceRepository { - fun requestAssistance( - roomToken: String - ): Observable + fun requestAssistance(roomToken: String): Observable - fun withdrawRequestAssistance( - roomToken: String - ): Observable + fun withdrawRequestAssistance(roomToken: String): Observable } diff --git a/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepositoryImpl.kt index aa42daa7d..757602762 100644 --- a/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/raisehand/RequestAssistanceRepositoryImpl.kt @@ -57,18 +57,14 @@ class RequestAssistanceRepositoryImpl(private val ncApi: NcApi, currentUserProvi ).map { mapToWithdrawRequestAssistanceModel(it.ocs?.meta!!) } } - private fun mapToRequestAssistanceModel( - response: GenericMeta - ): RequestAssistanceModel { + private fun mapToRequestAssistanceModel(response: GenericMeta): RequestAssistanceModel { val success = response.statusCode == HTTP_OK return RequestAssistanceModel( success ) } - private fun mapToWithdrawRequestAssistanceModel( - response: GenericMeta - ): WithdrawRequestAssistanceModel { + private fun mapToWithdrawRequestAssistanceModel(response: GenericMeta): WithdrawRequestAssistanceModel { val success = response.statusCode == HTTP_OK return WithdrawRequestAssistanceModel( success diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt index dde05d648..12c21bb61 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt @@ -160,10 +160,7 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe } } - private fun loadList( - state: RemoteFileBrowserItemsViewModel.LoadedState, - mimeTypeSelectionFilter: String? - ) { + private fun loadList(state: RemoteFileBrowserItemsViewModel.LoadedState, mimeTypeSelectionFilter: String?) { val remoteFileBrowserItems = state.items Log.d(TAG, "Items received: $remoteFileBrowserItems") diff --git a/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepository.kt b/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepository.kt index a206442eb..8422a8315 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepository.kt @@ -26,11 +26,7 @@ import io.reactivex.Observable interface CallRecordingRepository { - fun startRecording( - roomToken: String - ): Observable + fun startRecording(roomToken: String): Observable - fun stopRecording( - roomToken: String - ): Observable + fun stopRecording(roomToken: String): Observable } diff --git a/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepositoryImpl.kt index 601b431b8..71c6d64d2 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/callrecording/CallRecordingRepositoryImpl.kt @@ -37,9 +37,7 @@ class CallRecordingRepositoryImpl(private val ncApi: NcApi, currentUserProvider: var apiVersion = 1 - override fun startRecording( - roomToken: String - ): Observable { + override fun startRecording(roomToken: String): Observable { return ncApi.startRecording( credentials, ApiUtils.getUrlForRecording( @@ -51,9 +49,7 @@ class CallRecordingRepositoryImpl(private val ncApi: NcApi, currentUserProvider: ).map { mapToStartCallRecordingModel(it.ocs?.meta!!) } } - override fun stopRecording( - roomToken: String - ): Observable { + override fun stopRecording(roomToken: String): Observable { return ncApi.stopRecording( credentials, ApiUtils.getUrlForRecording( @@ -64,18 +60,14 @@ class CallRecordingRepositoryImpl(private val ncApi: NcApi, currentUserProvider: ).map { mapToStopCallRecordingModel(it.ocs?.meta!!) } } - private fun mapToStartCallRecordingModel( - response: GenericMeta - ): StartCallRecordingModel { + private fun mapToStartCallRecordingModel(response: GenericMeta): StartCallRecordingModel { val success = response.statusCode == HTTP_OK return StartCallRecordingModel( success ) } - private fun mapToStopCallRecordingModel( - response: GenericMeta - ): StopCallRecordingModel { + private fun mapToStopCallRecordingModel(response: GenericMeta): StopCallRecordingModel { val success = response.statusCode == HTTP_OK return StopCallRecordingModel( success diff --git a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepository.kt b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepository.kt index 71a999bd5..e99340c39 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepository.kt @@ -27,15 +27,7 @@ import io.reactivex.Observable interface ReactionsRepository { - fun addReaction( - roomToken: String, - message: ChatMessage, - emoji: String - ): Observable + fun addReaction(roomToken: String, message: ChatMessage, emoji: String): Observable - fun deleteReaction( - roomToken: String, - message: ChatMessage, - emoji: String - ): Observable + fun deleteReaction(roomToken: String, message: ChatMessage, emoji: String): Observable } diff --git a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt index 2a99c3c42..55de85b81 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt @@ -36,11 +36,7 @@ class ReactionsRepositoryImpl(private val ncApi: NcApi, currentUserProvider: Cur val currentUser: User = currentUserProvider.currentUser.blockingGet() val credentials: String = ApiUtils.getCredentials(currentUser.username, currentUser.token) - override fun addReaction( - roomToken: String, - message: ChatMessage, - emoji: String - ): Observable { + override fun addReaction(roomToken: String, message: ChatMessage, emoji: String): Observable { return ncApi.sendReaction( credentials, ApiUtils.getUrlForMessageReaction( diff --git a/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt b/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt index 89353f611..0860d159b 100644 --- a/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepository.kt @@ -28,16 +28,9 @@ import io.reactivex.Observable interface SharedItemsRepository { - fun media( - parameters: Parameters, - type: SharedItemType - ): Observable? + fun media(parameters: Parameters, type: SharedItemType): Observable? - fun media( - parameters: Parameters, - type: SharedItemType, - lastKnownMessageId: Int? - ): Observable? + fun media(parameters: Parameters, type: SharedItemType, lastKnownMessageId: Int?): Observable? fun availableTypes(parameters: Parameters): Observable> diff --git a/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepositoryImpl.kt index ba422c1ab..21d7419ca 100644 --- a/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/shareditems/repositories/SharedItemsRepositoryImpl.kt @@ -48,10 +48,7 @@ import javax.inject.Inject class SharedItemsRepositoryImpl @Inject constructor(private val ncApi: NcApi, private val dateUtils: DateUtils) : SharedItemsRepository { - override fun media( - parameters: SharedItemsRepository.Parameters, - type: SharedItemType - ): Observable? { + override fun media(parameters: SharedItemsRepository.Parameters, type: SharedItemType): Observable? { return media(parameters, type, null) } diff --git a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt index 7692cae58..d464e8984 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/repositories/TranslateRepository.kt @@ -13,8 +13,5 @@ interface TranslateRepository { fromLanguage: String? ): Observable - fun getLanguages( - authorization: String, - url: String - ): Observable> + fun getLanguages(authorization: String, url: String): Observable> } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt index 886ef57f9..93a8d42db 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt @@ -299,14 +299,11 @@ class DateTimePickerFragment( private const val HOUR_SIX_PM = 18 @JvmStatic - fun newInstance( - token: String, - id: String, - chatViewModel: ChatViewModel - ) = DateTimePickerFragment( - token, - id, - chatViewModel - ) + fun newInstance(token: String, id: String, chatViewModel: ChatViewModel) = + DateTimePickerFragment( + token, + id, + chatViewModel + ) } } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt index aa8061e42..a990a0c81 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt @@ -62,11 +62,7 @@ class FilterConversationFragment( return MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create() } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) setUpColors() setUpListeners() diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SaveToStorageDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SaveToStorageDialogFragment.kt index 70c270ae6..e5d8def95 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SaveToStorageDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SaveToStorageDialogFragment.kt @@ -83,9 +83,7 @@ class SaveToStorageDialogFragment : DialogFragment() { } @SuppressLint("LongLogTag") - private fun saveImageToStorage( - fileName: String - ) { + private fun saveImageToStorage(fileName: String) { val sourceFilePath = requireContext().cacheDir.path val workerTag = SAVE_TO_STORAGE_WORKER_PREFIX + fileName diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index e92ae94b1..eab617bc5 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -350,9 +350,7 @@ class SetStatusDialogFragment : return returnValue } - private fun clearAtToUnixTimeTypeEndOf( - clearAt: ClearAt - ): Long { + private fun clearAtToUnixTimeTypeEndOf(clearAt: ClearAt): Long { var returnValue = -1L if (clearAt.time == "day") { val date = Calendar.getInstance().apply { diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt index 5a06acef8..98794590b 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt @@ -295,11 +295,7 @@ class TalkSpecificViewThemeUtils @Inject constructor( } } - fun themeAndHighlightText( - textView: TextView, - originalText: String?, - c: String? - ) { + fun themeAndHighlightText(textView: TextView, originalText: String?, c: String?) { withScheme(textView) { scheme -> var constraint = c constraint = FlexibleUtils.toLowerCase(constraint) @@ -374,11 +370,7 @@ class TalkSpecificViewThemeUtils @Inject constructor( } } - fun getTextColor( - isOutgoingMessage: Boolean, - isSelfReaction: Boolean, - binding: ReactionsInsideMessageBinding - ): Int { + fun getTextColor(isOutgoingMessage: Boolean, isSelfReaction: Boolean, binding: ReactionsInsideMessageBinding): Int { return withScheme(binding.root) { scheme -> return@withScheme if (!isOutgoingMessage || isSelfReaction) { ContextCompat.getColor(binding.root.context, R.color.high_emphasis_text) diff --git a/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt b/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt index 018305951..6c7021371 100644 --- a/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt +++ b/app/src/main/java/com/nextcloud/talk/upload/chunked/ChunkedFileUploader.kt @@ -83,11 +83,7 @@ class ChunkedFileUploader( } @Suppress("Detekt.TooGenericExceptionCaught") - fun upload( - localFile: File, - mimeType: MediaType?, - targetPath: String - ): Boolean { + fun upload(localFile: File, mimeType: MediaType?, targetPath: String): Boolean { try { val uploadFolderUri: String = remoteChunkUrl + "/" + FileUtils.md5Sum(localFile) val davResource = DavResource( @@ -137,10 +133,7 @@ class ChunkedFileUploader( } @Suppress("Detekt.ComplexMethod") - private fun getUploadedChunks( - davResource: DavResource, - uploadFolderUri: String - ): MutableList { + private fun getUploadedChunks(davResource: DavResource, uploadFolderUri: String): MutableList { val davResponse = DavResponse() val memberElements: MutableList = ArrayList() val rootElement = arrayOfNulls(1) diff --git a/app/src/main/java/com/nextcloud/talk/upload/chunked/OnDataTransferProgressListener.kt b/app/src/main/java/com/nextcloud/talk/upload/chunked/OnDataTransferProgressListener.kt index 049fee4fb..6ba463342 100644 --- a/app/src/main/java/com/nextcloud/talk/upload/chunked/OnDataTransferProgressListener.kt +++ b/app/src/main/java/com/nextcloud/talk/upload/chunked/OnDataTransferProgressListener.kt @@ -25,7 +25,5 @@ package com.nextcloud.talk.upload.chunked interface OnDataTransferProgressListener { - fun onTransferProgress( - percentage: Int - ) + fun onTransferProgress(percentage: Int) } diff --git a/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt b/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt index 514aae0da..d21f90605 100644 --- a/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt +++ b/app/src/main/java/com/nextcloud/talk/upload/normal/FileUploader.kt @@ -21,12 +21,7 @@ class FileUploader( val roomToken: String, val ncApi: NcApi ) { - fun upload( - sourceFileUri: Uri, - fileName: String, - remotePath: String, - metaData: String? - ): Observable { + fun upload(sourceFileUri: Uri, fileName: String, remotePath: String, metaData: String?): Observable { return ncApi.uploadFile( ApiUtils.getCredentials(currentUser.username, currentUser.token), ApiUtils.getUrlForFileUpload(currentUser.baseUrl, currentUser.userId, remotePath), diff --git a/app/src/main/java/com/nextcloud/talk/utils/BitmapShrinker.kt b/app/src/main/java/com/nextcloud/talk/utils/BitmapShrinker.kt index 9f9635f8d..008b2355d 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/BitmapShrinker.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/BitmapShrinker.kt @@ -35,21 +35,13 @@ object BitmapShrinker { private const val DEGREES_270 = 270f @JvmStatic - fun shrinkBitmap( - path: String, - reqWidth: Int, - reqHeight: Int - ): Bitmap { + fun shrinkBitmap(path: String, reqWidth: Int, reqHeight: Int): Bitmap { val bitmap = decodeBitmap(path, reqWidth, reqHeight) return rotateBitmap(path, bitmap) } // solution inspired by https://developer.android.com/topic/performance/graphics/load-bitmap - private fun decodeBitmap( - path: String, - requestedWidth: Int, - requestedHeight: Int - ): Bitmap { + private fun decodeBitmap(path: String, requestedWidth: Int, requestedHeight: Int): Bitmap { return BitmapFactory.Options().run { inJustDecodeBounds = true BitmapFactory.decodeFile(path, this) @@ -60,11 +52,7 @@ object BitmapShrinker { } // solution inspired by https://developer.android.com/topic/performance/graphics/load-bitmap - private fun getInSampleSize( - options: BitmapFactory.Options, - requestedWidth: Int, - requestedHeight: Int - ): Int { + private fun getInSampleSize(options: BitmapFactory.Options, requestedWidth: Int, requestedHeight: Int): Int { val (height: Int, width: Int) = options.run { outHeight to outWidth } var inSampleSize = 1 if (height > requestedHeight || width > requestedWidth) { diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt index caa66d997..92cc4183f 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt @@ -73,10 +73,7 @@ import java.util.concurrent.ExecutionException */ class FileViewerUtils(private val context: Context, private val user: User) { - fun openFile( - message: ChatMessage, - progressUi: ProgressUi - ) { + fun openFile(message: ChatMessage, progressUi: ProgressUi) { val fileName = message.selectedIndividualHashMap!![PreviewMessageViewHolder.KEY_NAME]!! val mimetype = message.selectedIndividualHashMap!![PreviewMessageViewHolder.KEY_MIMETYPE]!! val link = message.selectedIndividualHashMap!!["link"]!! diff --git a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt index a5682d959..68ff86ca4 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt @@ -102,10 +102,7 @@ object NotificationUtils { } } - private fun createCallsNotificationChannel( - context: Context, - appPreferences: AppPreferences - ) { + private fun createCallsNotificationChannel(context: Context, appPreferences: AppPreferences) { val audioAttributes = AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) @@ -126,10 +123,7 @@ object NotificationUtils { ) } - private fun createMessagesNotificationChannel( - context: Context, - appPreferences: AppPreferences - ) { + private fun createMessagesNotificationChannel(context: Context, appPreferences: AppPreferences) { val audioAttributes = AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) @@ -150,9 +144,7 @@ object NotificationUtils { ) } - private fun createUploadsNotificationChannel( - context: Context - ) { + private fun createUploadsNotificationChannel(context: Context) { createNotificationChannel( context, Channel( @@ -166,10 +158,7 @@ object NotificationUtils { ) } - fun registerNotificationChannels( - context: Context, - appPreferences: AppPreferences - ) { + fun registerNotificationChannels(context: Context, appPreferences: AppPreferences) { createCallsNotificationChannel(context, appPreferences) createMessagesNotificationChannel(context, appPreferences) createUploadsNotificationChannel(context) @@ -197,10 +186,7 @@ object NotificationUtils { } @TargetApi(Build.VERSION_CODES.O) - private fun getNotificationChannel( - context: Context, - channelId: String - ): NotificationChannel? { + private fun getNotificationChannel(context: Context, channelId: String): NotificationChannel? { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager return notificationManager.getNotificationChannel(channelId) @@ -275,10 +261,7 @@ object NotificationUtils { } } - fun isNotificationVisible( - context: Context?, - notificationId: Int - ): Boolean { + fun isNotificationVisible(context: Context?, notificationId: Int): Boolean { var isVisible = false val notificationManager = context!!.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager @@ -319,10 +302,7 @@ object NotificationUtils { } } - fun getCallRingtoneUri( - context: Context, - appPreferences: AppPreferences - ): Uri? { + fun getCallRingtoneUri(context: Context, appPreferences: AppPreferences): Uri? { return getRingtoneUri( context, appPreferences.callRingtoneUri, @@ -331,10 +311,7 @@ object NotificationUtils { ) } - fun getMessageRingtoneUri( - context: Context, - appPreferences: AppPreferences - ): Uri? { + fun getMessageRingtoneUri(context: Context, appPreferences: AppPreferences): Uri? { return getRingtoneUri( context, appPreferences.messageRingtoneUri, diff --git a/app/src/main/java/com/nextcloud/talk/utils/RemoteFileUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/RemoteFileUtils.kt index 4786997e4..2e3681f88 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/RemoteFileUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/RemoteFileUtils.kt @@ -31,11 +31,7 @@ import io.reactivex.schedulers.Schedulers object RemoteFileUtils { private val TAG = RemoteFileUtils::class.java.simpleName - fun getNewPathIfFileExists( - ncApi: NcApi, - currentUser: User, - remotePath: String - ): String { + fun getNewPathIfFileExists(ncApi: NcApi, currentUser: User, remotePath: String): String { var finalPath = remotePath val fileExists = doesFileExist( ncApi, @@ -53,11 +49,7 @@ object RemoteFileUtils { return finalPath } - private fun doesFileExist( - ncApi: NcApi, - currentUser: User, - remotePath: String - ): Observable { + private fun doesFileExist(ncApi: NcApi, currentUser: User, remotePath: String): Observable { return ncApi.checkIfFileExists( ApiUtils.getCredentials(currentUser.username, currentUser.token), ApiUtils.getUrlForFileUpload( @@ -72,11 +64,7 @@ object RemoteFileUtils { } } - private fun getFileNameWithoutCollision( - ncApi: NcApi, - currentUser: User, - remotePath: String - ): String { + private fun getFileNameWithoutCollision(ncApi: NcApi, currentUser: User, remotePath: String): String { val extPos = remotePath.lastIndexOf('.') var suffix: String var extension = "" diff --git a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.kt index 3aea93772..41c644878 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.kt @@ -25,11 +25,7 @@ import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.models.json.conversations.Conversation object ShareUtils { - fun getStringForIntent( - context: Context, - user: User, - conversation: Conversation? - ): String { + fun getStringForIntent(context: Context, user: User, conversation: Conversation?): String { return String.format( context.resources.getString(R.string.nc_share_text), user.baseUrl, diff --git a/app/src/main/java/third/parties/fresco/BetterImageSpan.kt b/app/src/main/java/third/parties/fresco/BetterImageSpan.kt index fbd003ed0..c4b7241d6 100644 --- a/app/src/main/java/third/parties/fresco/BetterImageSpan.kt +++ b/app/src/main/java/third/parties/fresco/BetterImageSpan.kt @@ -65,13 +65,7 @@ open class BetterImageSpan @JvmOverloads constructor( /** * Returns the width of the image span and increases the height if font metrics are available. */ - override fun getSize( - paint: Paint, - text: CharSequence, - start: Int, - end: Int, - fontMetrics: FontMetricsInt? - ): Int { + override fun getSize(paint: Paint, text: CharSequence, start: Int, end: Int, fontMetrics: FontMetricsInt?): Int { updateBounds() if (fontMetrics == null) { return mWidth