From 362d073cafded5278bc81b3e4ddb397d504b2219 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 02:57:31 +0000 Subject: [PATCH 1/3] Build(deps): Bump org.jlleitschuh.gradle:ktlint-gradle Bumps org.jlleitschuh.gradle:ktlint-gradle from 11.1.0 to 11.2.0. --- updated-dependencies: - dependency-name: org.jlleitschuh.gradle:ktlint-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c863baa87..afc8d3b9b 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}" classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13' classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0" - classpath "org.jlleitschuh.gradle:ktlint-gradle:11.1.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.2.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From e84963842a5545c7016eaec90a2503282081607f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 15 Feb 2023 09:57:52 +0100 Subject: [PATCH 2/3] Rename property 'disabled_rules' to 'ktlint_disabled_rules' in all '.editorconfig' files. Signed-off-by: Andy Scherzinger --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 300ea1e8b..75fa24ed2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -38,4 +38,4 @@ indent_size=2 [*.{kt,kts}] # IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it -disabled_rules=import-ordering +ktlint_disabled_rules=import-ordering From 41d671ff4748cc257afead96ce87589acfd49dd8 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 15 Feb 2023 10:50:59 +0100 Subject: [PATCH 3/3] Fix code formatting Signed-off-by: Andy Scherzinger --- .../talk/utils/ClosedInterfaceImpl.kt | 8 ++-- .../nextcloud/talk/data/user/model/User.kt | 2 +- .../talk/data/user/model/UserEntity.kt | 48 ++++++++++++++----- .../talk/extensions/ImageViewExtensions.kt | 4 -- .../nextcloud/talk/jobs/NotificationWorker.kt | 14 ++++-- .../talk/jobs/ShareOperationWorker.kt | 3 +- .../talk/models/json/chat/ChatMessage.kt | 11 +++-- .../models/json/conversations/Conversation.kt | 6 ++- .../json/converters/EnumActorTypeConverter.kt | 1 - .../EnumReactionActorTypeConverter.kt | 1 - .../models/json/opengraph/OpenGraphObject.kt | 3 +- .../talk/models/json/opengraph/Reference.kt | 3 +- .../talk/models/json/opengraph/RichObject.kt | 3 +- .../models/json/participants/Participant.kt | 8 +++- .../json/unifiedsearch/UnifiedSearchEntry.kt | 2 +- .../adapters/PollCreateOptionViewHolder.kt | 1 - .../talk/polls/adapters/PollResultsAdapter.kt | 9 ++-- .../polls/repositories/PollRepositoryImpl.kt | 10 ++-- .../repositories/model/PollDetailsResponse.kt | 2 +- .../polls/repositories/model/PollResponse.kt | 2 +- .../talk/polls/ui/PollLoadingFragment.kt | 3 +- .../talk/polls/ui/PollMainDialogFragment.kt | 1 - .../polls/viewmodels/PollCreateViewModel.kt | 5 +- .../talk/receivers/PackageReplacedReceiver.kt | 1 - .../RemoteFileBrowserItemsViewHolder.kt | 2 +- .../ConversationsRepositoryImpl.kt | 3 -- .../ui/bottom/sheet/ProfileBottomSheet.kt | 17 +++---- .../ChooseAccountShareToDialogFragment.kt | 1 + .../talk/ui/dialog/ShowReactionsDialog.kt | 8 +++- .../upload/chunked/ChunkedFileUploader.kt | 13 ++--- .../com/nextcloud/talk/utils/DateUtils.kt | 4 +- .../nextcloud/talk/utils/DoNotDisturbUtils.kt | 1 - .../com/nextcloud/talk/utils/FileSortOrder.kt | 2 +- .../talk/utils/ImageEmojiEditText.kt | 1 - .../nextcloud/talk/utils/NotificationUtils.kt | 8 ++-- .../nextcloud/talk/utils/RemoteFileUtils.kt | 2 +- .../talk/utils/ssl/SSLSocketFactoryCompat.kt | 15 ++++-- .../talk/utils/ParticipantPermissionsTest.kt | 1 - .../nextcloud/talk/utils/ShareUtilsTest.kt | 3 +- 39 files changed, 134 insertions(+), 98 deletions(-) diff --git a/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt b/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt index 94f4abf06..7c24a019e 100644 --- a/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt +++ b/app/src/gplay/java/com/nextcloud/talk/utils/ClosedInterfaceImpl.kt @@ -109,7 +109,8 @@ class ClosedInterfaceImpl : ClosedInterface, ProviderInstaller.ProviderInstallLi WorkManager.getInstance() .enqueueUniquePeriodicWork( - "periodicTokenRegistration", ExistingPeriodicWorkPolicy.REPLACE, + "periodicTokenRegistration", + ExistingPeriodicWorkPolicy.REPLACE, periodicTokenRegistration ) } @@ -120,13 +121,14 @@ class ClosedInterfaceImpl : ClosedInterface, ProviderInstaller.ProviderInstallLi MONTHLY, TimeUnit.DAYS, FLEX_INTERVAL, - TimeUnit.DAYS, + TimeUnit.DAYS ) .build() WorkManager.getInstance() .enqueueUniquePeriodicWork( - "periodicTokenRefreshFromFCM", ExistingPeriodicWorkPolicy.REPLACE, + "periodicTokenRefreshFromFCM", + ExistingPeriodicWorkPolicy.REPLACE, periodicTokenRefreshFromFCM ) } diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt index 888ed034a..1cbac33ea 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt @@ -40,7 +40,7 @@ data class User( var clientCertificate: String? = null, var externalSignalingServer: ExternalSignalingServer? = null, var current: Boolean = FALSE, - var scheduledForDeletion: Boolean = FALSE, + var scheduledForDeletion: Boolean = FALSE ) : Parcelable { fun getMaxMessageLength(): Int { diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt index d76f6f625..33144dbe4 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt @@ -35,16 +35,40 @@ import java.lang.Boolean.FALSE @Parcelize @Entity(tableName = "User") data class UserEntity( - @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long = 0, - @ColumnInfo(name = "userId") var userId: String? = null, - @ColumnInfo(name = "username") var username: String? = null, - @ColumnInfo(name = "baseUrl") var baseUrl: String? = null, - @ColumnInfo(name = "token") var token: String? = null, - @ColumnInfo(name = "displayName") var displayName: String? = null, - @ColumnInfo(name = "pushConfigurationState") var pushConfigurationState: PushConfigurationState? = null, - @ColumnInfo(name = "capabilities") var capabilities: Capabilities? = null, - @ColumnInfo(name = "clientCertificate") var clientCertificate: String? = null, - @ColumnInfo(name = "externalSignalingServer") var externalSignalingServer: ExternalSignalingServer? = null, - @ColumnInfo(name = "current") var current: Boolean = FALSE, - @ColumnInfo(name = "scheduledForDeletion") var scheduledForDeletion: Boolean = FALSE, + @PrimaryKey(autoGenerate = true) + @ColumnInfo(name = "id") + var id: Long = 0, + + @ColumnInfo(name = "userId") + var userId: String? = null, + + @ColumnInfo(name = "username") + var username: String? = null, + + @ColumnInfo(name = "baseUrl") + var baseUrl: String? = null, + + @ColumnInfo(name = "token") + var token: String? = null, + + @ColumnInfo(name = "displayName") + var displayName: String? = null, + + @ColumnInfo(name = "pushConfigurationState") + var pushConfigurationState: PushConfigurationState? = null, + + @ColumnInfo(name = "capabilities") + var capabilities: Capabilities? = null, + + @ColumnInfo(name = "clientCertificate") + var clientCertificate: String? = null, + + @ColumnInfo(name = "externalSignalingServer") + var externalSignalingServer: ExternalSignalingServer? = null, + + @ColumnInfo(name = "current") + var current: Boolean = FALSE, + + @ColumnInfo(name = "scheduledForDeletion") + var scheduledForDeletion: Boolean = FALSE ) : Parcelable diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index c50b35900..41fc5b024 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -53,7 +53,6 @@ fun ImageView.loadAvatar( requestBigSize: Boolean = true ): io.reactivex.disposables .Disposable { - val imageRequestUri = ApiUtils.getUrlForAvatar( user.baseUrl, avatar, @@ -69,7 +68,6 @@ fun ImageView.replaceAvatar( requestBigSize: Boolean = true ): io.reactivex.disposables .Disposable { - val imageRequestUri = ApiUtils.getUrlForAvatar( user.baseUrl, avatar, @@ -86,7 +84,6 @@ private fun ImageView.loadAvatarInternal( replace: Boolean ): io.reactivex.disposables .Disposable { - if (replace && this.result is SuccessResult) { val result = this.result as SuccessResult val memoryCacheKey = result.memoryCacheKey @@ -227,7 +224,6 @@ fun ImageView.loadBotsAvatar(): io.reactivex.disposables.Disposable { } fun ImageView.loadGroupCallAvatar(viewThemeUtils: ViewThemeUtils): io.reactivex.disposables.Disposable { - val data: Any = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { viewThemeUtils.talk.themePlaceholderAvatar(this, R.drawable.ic_avatar_group) as Any } else { diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt index 6fd2425ce..fee5970cc 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt @@ -520,11 +520,15 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor if ("user" == userType || "guest" == userType) { val baseUrl = signatureVerification.user!!.baseUrl - val avatarUrl = if ("user" == userType) ApiUtils.getUrlForAvatar( - baseUrl, - notificationUser.id, - false - ) else ApiUtils.getUrlForGuestAvatar(baseUrl, notificationUser.name, false) + val avatarUrl = if ("user" == userType) { + ApiUtils.getUrlForAvatar( + baseUrl, + notificationUser.id, + false + ) + } else { + ApiUtils.getUrlForGuestAvatar(baseUrl, notificationUser.name, false) + } person.setIcon(loadAvatarSync(avatarUrl, context!!)) } notificationBuilder.setStyle(getStyle(person.build(), style)) 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 a93ec072d..95f09fdcb 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/ShareOperationWorker.kt @@ -70,7 +70,8 @@ class ShareOperationWorker(context: Context, workerParams: WorkerParameters) : W ) .subscribeOn(Schedulers.io()) .blockingSubscribe( - {}, { e -> Log.w(TAG, "error while creating RemoteShare", e) } + {}, + { e -> Log.w(TAG, "error while creating RemoteShare", e) } ) } return Result.success() diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt index 4321e38fe..f8c7e2e3b 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt @@ -129,7 +129,7 @@ data class ChatMessage( var voiceMessagePlayedSeconds: Int = 0, - var voiceMessageDownloadProgress: Int = 0, + var voiceMessageDownloadProgress: Int = 0 ) : Parcelable, MessageContentType, MessageContentType.Image { @@ -235,7 +235,9 @@ data class ChatMessage( } return if (!messageTypesToIgnore.contains(getCalculateMessageType())) { message!!.trim { it <= ' ' } - } else null + } else { + null + } } fun getCalculateMessageType(): MessageType { @@ -418,7 +420,8 @@ data class ChatMessage( } actorType == "bridged" -> { ApiUtils.getUrlForAvatar( - activeUser!!.baseUrl, "bridge-bot", + activeUser!!.baseUrl, + "bridge-bot", true ) } @@ -524,7 +527,7 @@ data class ChatMessage( RECORDING_STARTED, RECORDING_STOPPED, AUDIO_RECORDING_STARTED, - AUDIO_RECORDING_STOPPED, + AUDIO_RECORDING_STOPPED } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index 0028ae427..290c9a22d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt @@ -194,8 +194,10 @@ data class Conversation( return if (canDeleteConversation != null) { // Available since APIv2 canDeleteConversation!! - } else canModerate(conversationUser) - // Fallback for APIv1 + } else { + canModerate(conversationUser) + // Fallback for APIv1 + } } enum class NotificationLevel { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumActorTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumActorTypeConverter.kt index 45547fae6..7e3b69c74 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumActorTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumActorTypeConverter.kt @@ -44,7 +44,6 @@ class EnumActorTypeConverter : StringBasedTypeConverter() } override fun convertToString(`object`: Participant.ActorType?): String { - if (`object` == null) { return "" } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReactionActorTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReactionActorTypeConverter.kt index 5747a3b30..b0fc49b16 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReactionActorTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumReactionActorTypeConverter.kt @@ -36,7 +36,6 @@ class EnumReactionActorTypeConverter : StringBasedTypeConverter?, + var attributes: Map? ) : Parcelable { constructor() : this(null, null, null, null, null, null, null) } diff --git a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollCreateOptionViewHolder.kt b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollCreateOptionViewHolder.kt index 5fcf66926..26a97801e 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollCreateOptionViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollCreateOptionViewHolder.kt @@ -44,7 +44,6 @@ class PollCreateOptionViewHolder( position: Int, focus: Boolean ) { - textListener?.let { binding.pollOptionTextEdit.removeTextChangedListener(it) } diff --git a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt index cbc71da83..e74b29aa4 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/adapters/PollResultsAdapter.kt @@ -42,21 +42,24 @@ class PollResultsAdapter( when (viewType) { PollResultHeaderItem.VIEW_TYPE -> { val itemBinding = PollResultHeaderItemBinding.inflate( - LayoutInflater.from(parent.context), parent, + LayoutInflater.from(parent.context), + parent, false ) viewHolder = PollResultHeaderViewHolder(itemBinding, viewThemeUtils) } PollResultVoterItem.VIEW_TYPE -> { val itemBinding = PollResultVoterItemBinding.inflate( - LayoutInflater.from(parent.context), parent, + LayoutInflater.from(parent.context), + parent, false ) viewHolder = PollResultVoterViewHolder(user, itemBinding, viewThemeUtils) } PollResultVotersOverviewItem.VIEW_TYPE -> { val itemBinding = PollResultVotersOverviewItemBinding.inflate( - LayoutInflater.from(parent.context), parent, + LayoutInflater.from(parent.context), + parent, false ) viewHolder = PollResultVotersOverviewViewHolder(user, itemBinding) diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt index 3021c33a5..8004f3ced 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/PollRepositoryImpl.kt @@ -44,8 +44,7 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid question: String, options: List, resultMode: Int, - maxVotes: - Int + maxVotes: Int ): Observable { return ncApi.createPoll( credentials, @@ -61,19 +60,17 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid } override fun getPoll(roomToken: String, pollId: String): Observable { - return ncApi.getPoll( credentials, ApiUtils.getUrlForPoll( currentUser.baseUrl, roomToken, pollId - ), + ) ).map { mapToPoll(it.ocs?.data!!) } } override fun vote(roomToken: String, pollId: String, options: List): Observable { - return ncApi.votePoll( credentials, ApiUtils.getUrlForPoll( @@ -86,14 +83,13 @@ class PollRepositoryImpl(private val ncApi: NcApi, private val currentUserProvid } override fun closePoll(roomToken: String, pollId: String): Observable { - return ncApi.closePoll( credentials, ApiUtils.getUrlForPoll( currentUser.baseUrl, roomToken, pollId - ), + ) ).map { mapToPoll(it.ocs?.data!!) } } diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt index 072e8304b..336a81226 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt @@ -37,7 +37,7 @@ data class PollDetailsResponse( var actorDisplayName: String, @JsonField(name = ["optionId"]) - var optionId: Int, + var optionId: Int ) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this(null, "", "", 0) diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt index a8c693899..948d8698c 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt @@ -64,7 +64,7 @@ data class PollResponse( var numVoters: Int = 0, @JsonField(name = ["details"]) - var details: ArrayList? = null, + var details: ArrayList? = null ) : Parcelable { // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' constructor() : this("id", null, null, null, null, null, null, 0, 0, 0, null, 0, null) 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 6eb95a1f0..9dd1e026b 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 @@ -67,9 +67,8 @@ class PollLoadingFragment : Fragment() { fun newInstance( fragmentHeight: Int ): PollLoadingFragment { - val args = bundleOf( - KEY_FRAGMENT_HEIGHT to fragmentHeight, + KEY_FRAGMENT_HEIGHT to fragmentHeight ) val fragment = PollLoadingFragment() diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt index 0b16d522c..826c3cade 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt @@ -182,7 +182,6 @@ class PollMainDialogFragment : DialogFragment() { pollId: String, name: String ): PollMainDialogFragment { - val args = bundleOf( KEY_USER_ENTITY to user, KEY_ROOM_TOKEN to roomTokenParam, diff --git a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollCreateViewModel.kt b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollCreateViewModel.kt index ebaae84be..f6022537b 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollCreateViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/viewmodels/PollCreateViewModel.kt @@ -117,7 +117,10 @@ class PollCreateViewModel @Inject constructor(private val repository: PollReposi _viewState.value = PollCreationState(enableAddOptionButton = false, enableCreatePollButton = false) repository.createPoll( - roomToken, _question, _options.value!!.map { it.pollOption }, resultMode, + roomToken, + _question, + _options.value!!.map { it.pollOption }, + resultMode, maxVotes ) .doOnSubscribe { disposable = it } diff --git a/app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt b/app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt index 1055504ec..cbca44f86 100644 --- a/app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt +++ b/app/src/main/java/com/nextcloud/talk/receivers/PackageReplacedReceiver.kt @@ -28,7 +28,6 @@ import com.nextcloud.talk.utils.NotificationUtils class PackageReplacedReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent?) { - if (intent != null && intent.action != null && intent.action == "android.intent.action.MY_PACKAGE_REPLACED" ) { diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt index 027b849aa..b4594221b 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt @@ -32,7 +32,7 @@ abstract class RemoteFileBrowserItemsViewHolder( open val binding: ViewBinding, val mimeTypeSelectionFilter: String? = null, val currentUser: User, - val selectionInterface: SelectionInterface, + val selectionInterface: SelectionInterface ) : RecyclerView.ViewHolder(binding.root) { abstract val fileIcon: ImageView diff --git a/app/src/main/java/com/nextcloud/talk/repositories/conversations/ConversationsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/repositories/conversations/ConversationsRepositoryImpl.kt index f4f37f4e2..c0706a7d4 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/conversations/ConversationsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/conversations/ConversationsRepositoryImpl.kt @@ -41,7 +41,6 @@ class ConversationsRepositoryImpl(private val api: NcApi, private val userProvid get() = ApiUtils.getCredentials(user.username, user.token) override fun allowGuests(token: String, allow: Boolean): Observable { - val url = ApiUtils.getUrlForRoomPublic( apiVersion(), user.baseUrl, @@ -74,7 +73,6 @@ class ConversationsRepositoryImpl(private val api: NcApi, private val userProvid password ) return apiObservable.map { - val passwordPolicyMessage = if (it.code() == STATUS_CODE_BAD_REQUEST) { LoganSquare.parse(it.errorBody()!!.string(), PasswordOverall::class.java).ocs!!.data!! .message!! @@ -87,7 +85,6 @@ class ConversationsRepositoryImpl(private val api: NcApi, private val userProvid } override fun resendInvitations(token: String): Observable { - val apiObservable = api.resendParticipantInvitations( credentials, ApiUtils.getUrlForParticipantsResendInvitations( diff --git a/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt b/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt index b4fecd5c6..c524ce959 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt @@ -56,7 +56,6 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout private val allowedAppIds = listOf(SPREED.stringValue, PROFILE.stringValue, EMAIL.stringValue) fun showFor(user: String, context: Context) { - ncApi.hoverCard( ApiUtils.getCredentials(userModel.username, userModel.token), ApiUtils.getUrlForHoverCard(userModel.baseUrl, user) @@ -87,7 +86,6 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout @SuppressLint("CheckResult") private fun bottomSheet(actions: List, displayName: String, userId: String, context: Context) { - val filteredActions = actions.filter { allowedAppIds.contains(it.appId) } val items = filteredActions.map { configureActionListItem(it) } @@ -109,7 +107,6 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout } private fun configureActionListItem(action: HoverCardAction): BasicListItemWithImage { - val drawable = when (AllowedAppIds.createFor(action)) { PROFILE -> R.drawable.ic_user EMAIL -> R.drawable.ic_email @@ -123,7 +120,6 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout } private fun talkTo(userId: String) { - val apiVersion = ApiUtils.getConversationApiVersion(userModel, intArrayOf(ApiUtils.APIv4, 1)) val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom( @@ -137,7 +133,8 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout val credentials = ApiUtils.getCredentials(userModel.username, userModel.token) ncApi.createRoom( credentials, - retrofitBucket.url, retrofitBucket.queryMap + retrofitBucket.url, + retrofitBucket.queryMap ) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -156,7 +153,8 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout ncApi.getRoom( credentials, ApiUtils.getUrlForRoom( - apiVersion, userModel.baseUrl, + apiVersion, + userModel.baseUrl, roomOverall.ocs!!.data!!.token ) ) @@ -173,8 +171,11 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val router: Rout Parcels.wrap(roomOverall.ocs!!.data) ) ConductorRemapping.remapChatController( - router, userModel.id!!, - roomOverall.ocs!!.data!!.token!!, bundle, true + router, + userModel.id!!, + roomOverall.ocs!!.data!!.token!!, + bundle, + true ) } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt index 38a90a99b..330eb2741 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt @@ -66,6 +66,7 @@ class ChooseAccountShareToDialogFragment : DialogFragment() { private var dialogView: View? = null private var adapter: FlexibleAdapter? = null private val userItems: MutableList = ArrayList() + @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { binding = DialogChooseAccountShareToBinding.inflate(LayoutInflater.from(requireContext())) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt index 01c0ea5e1..0bba68df4 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ShowReactionsDialog.kt @@ -343,7 +343,9 @@ class ShowReactionsDialog( } return if (obj2 == null) { 1 - } else obj1.lowercase().compareTo(obj2.lowercase()) + } else { + obj1.lowercase().compareTo(obj2.lowercase()) + } } } @@ -358,7 +360,9 @@ class ShowReactionsDialog( } return if (obj2 == null) { 1 - } else obj1.compareTo(obj2) + } else { + obj1.compareTo(obj2) + } } } } 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 f3872b847..ee48dc166 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 @@ -119,7 +119,7 @@ class ChunkedFileUploader( private fun createFolder(davResource: DavResource) { try { davResource.mkCol( - xmlBody = null, + xmlBody = null ) { response: Response -> if (!response.isSuccessful) { throw IOException("failed to create folder. response code: " + response.code) @@ -270,10 +270,12 @@ class ChunkedFileUploader( } } } finally { - if (channel != null) try { - channel.close() - } catch (e: IOException) { - Log.e(TAG, "Error closing file channel!", e) + if (channel != null) { + try { + channel.close() + } catch (e: IOException) { + Log.e(TAG, "Error closing file channel!", e) + } } if (raf != null) { try { @@ -305,7 +307,6 @@ class ChunkedFileUploader( } private fun assembleChunks(uploadFolderUri: String, targetPath: String) { - val destinationUri: String = ApiUtils.getUrlForFileUpload( currentUser.baseUrl, currentUser.userId, diff --git a/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt index 2f8b3836f..fcf40f16b 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DateUtils.kt @@ -45,7 +45,7 @@ class DateUtils(val context: Context) { } else { @Suppress("DEPRECATION") context.resources.configuration.locale - }, + } ) /* date formatter in local timezone and locale */ @@ -56,7 +56,7 @@ class DateUtils(val context: Context) { } else { @Suppress("DEPRECATION") context.resources.configuration.locale - }, + } ) init { diff --git a/app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt index ad0d5949a..40da35d4f 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DoNotDisturbUtils.kt @@ -40,7 +40,6 @@ object DoNotDisturbUtils { @SuppressLint("NewApi") @JvmOverloads fun shouldPlaySound(context: Context? = NextcloudTalkApplication.sharedApplication?.applicationContext): Boolean { - val notificationManager = context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileSortOrder.kt b/app/src/main/java/com/nextcloud/talk/utils/FileSortOrder.kt index 53511b7a6..f3bfffb15 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/FileSortOrder.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/FileSortOrder.kt @@ -47,7 +47,7 @@ open class FileSortOrder(var name: String, var isAscending: Boolean) { sort_old_to_new.name to sort_old_to_new, sort_new_to_old.name to sort_new_to_old, sort_small_to_big.name to sort_small_to_big, - sort_big_to_small.name to sort_big_to_small, + sort_big_to_small.name to sort_big_to_small ) fun getFileSortOrder(key: String?): FileSortOrder { diff --git a/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt b/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt index 602b57a2f..2fa12d87b 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt @@ -48,7 +48,6 @@ class ImageEmojiEditText : EmojiEditText { @Suppress("Detekt.TooGenericExceptionCaught") override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? { - val ic: InputConnection? = super.onCreateInputConnection(editorInfo) EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf(IMAGE_GIF, IMAGE_JPEG, IMAGE_PNG)) 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 9e34ad058..c2745cd51 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt @@ -74,7 +74,6 @@ object NotificationUtils { sound: Uri?, audioAttributes: AudioAttributes? ) { - val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager if ( @@ -278,7 +277,6 @@ object NotificationUtils { context: Context?, notificationId: Int ): Boolean { - var isVisible = false val notificationManager = context!!.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager @@ -326,7 +324,8 @@ object NotificationUtils { return getRingtoneUri( context, appPreferences.callRingtoneUri, - DEFAULT_CALL_RINGTONE_URI, NotificationChannels.NOTIFICATION_CHANNEL_CALLS_V4.name + DEFAULT_CALL_RINGTONE_URI, + NotificationChannels.NOTIFICATION_CHANNEL_CALLS_V4.name ) } @@ -337,7 +336,8 @@ object NotificationUtils { return getRingtoneUri( context, appPreferences.messageRingtoneUri, - DEFAULT_MESSAGE_RINGTONE_URI, NotificationChannels.NOTIFICATION_CHANNEL_MESSAGES_V4.name + DEFAULT_MESSAGE_RINGTONE_URI, + NotificationChannels.NOTIFICATION_CHANNEL_MESSAGES_V4.name ) } 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 dfe4400a7..4786997e4 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/RemoteFileUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/RemoteFileUtils.kt @@ -40,7 +40,7 @@ object RemoteFileUtils { val fileExists = doesFileExist( ncApi, currentUser, - remotePath, + remotePath ).blockingFirst() if (fileExists) { diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt b/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt index 071226037..56e6ec811 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/SSLSocketFactoryCompat.kt @@ -63,36 +63,41 @@ class SSLSocketFactoryCompat( override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket { val ssl = delegate.createSocket(s, host, port, autoClose) - if (ssl is SSLSocket) + if (ssl is SSLSocket) { upgradeTLS(ssl) + } return ssl } override fun createSocket(host: String, port: Int): Socket { val ssl = delegate.createSocket(host, port) - if (ssl is SSLSocket) + if (ssl is SSLSocket) { upgradeTLS(ssl) + } return ssl } override fun createSocket(host: String, port: Int, localHost: InetAddress, localPort: Int): Socket { val ssl = delegate.createSocket(host, port, localHost, localPort) - if (ssl is SSLSocket) + if (ssl is SSLSocket) { upgradeTLS(ssl) + } return ssl } override fun createSocket(host: InetAddress, port: Int): Socket { val ssl = delegate.createSocket(host, port) - if (ssl is SSLSocket) + if (ssl is SSLSocket) { upgradeTLS(ssl) + } return ssl } override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket { val ssl = delegate.createSocket(address, port, localAddress, localPort) - if (ssl is SSLSocket) + if (ssl is SSLSocket) { upgradeTLS(ssl) + } return ssl } diff --git a/app/src/test/java/com/nextcloud/talk/utils/ParticipantPermissionsTest.kt b/app/src/test/java/com/nextcloud/talk/utils/ParticipantPermissionsTest.kt index 752e93fa5..be1ed2cae 100644 --- a/app/src/test/java/com/nextcloud/talk/utils/ParticipantPermissionsTest.kt +++ b/app/src/test/java/com/nextcloud/talk/utils/ParticipantPermissionsTest.kt @@ -31,7 +31,6 @@ class ParticipantPermissionsTest : TestCase() { @Test fun test_areFlagsSet() { - val user = User() val conversation = Conversation() conversation.permissions = ParticipantPermissions.PUBLISH_SCREEN or diff --git a/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.kt b/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.kt index 789a111fb..427890305 100644 --- a/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.kt +++ b/app/src/test/java/com/nextcloud/talk/utils/ShareUtilsTest.kt @@ -68,7 +68,8 @@ class ShareUtilsTest { fun stringForIntent_noPasswordGiven_correctStringWithoutPasswordReturned() { val expectedResult = String.format( "Join the conversation at %s/index.php/call/%s", - baseUrl, token + baseUrl, + token ) Assert.assertEquals( "Intent string was not as expected",