gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-25 14:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3048 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-formatting-1.23.0

Browse Source 
Build(deps): Bump io.gitlab.arturbosch.detekt:detekt-formatting from 1.22.0 to 1.23.0
This commit is contained in:
Andy Scherzinger 2023-05-24 10:38:43 +02:00 committed by GitHub
commit 6e2c01234b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 117 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -160,7 +160,7 @@ configurations.all {
}
dependencies {
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.0")
implementation fileTree(include: ['*'], dir: 'libs')

3
app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt
View File

@ -258,7 +258,7 @@ class CallNotificationActivity : CallBaseActivity() {
notificationHandler.post(object : Runnable {
override fun run() {
if (NotificationUtils.isNotificationVisible(context, notificationTimestamp!!.toInt())) {
notificationHandler.postDelayed(this, 1000)
notificationHandler.postDelayed(this, ONE_SECOND)
} else {
finish()
}
@ -320,5 +320,6 @@ class CallNotificationActivity : CallBaseActivity() {
companion object {
const val TAG = "CallNotificationActivity"
const val GET_ROOM_RETRY_COUNT: Long = 3
const val ONE_SECOND: Long = 1000
}
}

15
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
View File

@ -244,13 +244,14 @@ class ConversationItem(
} else {
model.lastMessage!!.activeUser = user
val text = if (model.lastMessage!!.getCalculateMessageType() === ChatMessage.MessageType
.REGULAR_TEXT_MESSAGE
) {
calculateRegularLastMessageText(appContext)
} else {
model.lastMessage!!.lastMessageDisplayText
}
val text =
if (
model.lastMessage!!.getCalculateMessageType() === ChatMessage.MessageType.REGULAR_TEXT_MESSAGE
) {
calculateRegularLastMessageText(appContext)
} else {
model.lastMessage!!.lastMessageDisplayText
}
holder.binding.dialogLastMessage.text = text
}
} else {

4
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt
View File

@ -45,8 +45,8 @@ import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) :
MessageHolders.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
private val binding: ItemCustomIncomingLinkPreviewMessageBinding =
ItemCustomIncomingLinkPreviewMessageBinding.bind(itemView)

4
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt
View File

@ -57,8 +57,8 @@ import java.net.URLEncoder
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) :
MessageHolders.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
private val binding: ItemCustomIncomingLocationMessageBinding =
ItemCustomIncomingLocationMessageBinding.bind(itemView)

7
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt
View File

@ -45,11 +45,10 @@ import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
class IncomingPollMessageViewHolder(incomingView: View, payload: Any) :
MessageHolders.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
private val binding: ItemCustomIncomingPollMessageBinding =
ItemCustomIncomingPollMessageBinding.bind(itemView)
private val binding: ItemCustomIncomingPollMessageBinding = ItemCustomIncomingPollMessageBinding.bind(itemView)
@Inject
lateinit var context: Context

4
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
View File

@ -55,8 +55,8 @@ import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class IncomingTextMessageViewHolder(itemView: View, payload: Any) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(itemView, payload) {
class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
MessageHolders.IncomingTextMessageViewHolder<ChatMessage>(itemView, payload) {
private val binding: ItemCustomIncomingTextMessageBinding = ItemCustomIncomingTextMessageBinding.bind(itemView)

7
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
View File

@ -55,11 +55,10 @@ import java.util.concurrent.ExecutionException
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
MessageHolders.IncomingTextMessageViewHolder<ChatMessage>(incomingView, payload) {
private val binding: ItemCustomIncomingVoiceMessageBinding =
ItemCustomIncomingVoiceMessageBinding.bind(itemView)
private val binding: ItemCustomIncomingVoiceMessageBinding = ItemCustomIncomingVoiceMessageBinding.bind(itemView)
@JvmField
@Inject

4
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt
View File

@ -44,8 +44,8 @@ import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) : MessageHolders
.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView, payload) {
class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) :
MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView, payload) {
private val binding: ItemCustomOutcomingLinkPreviewMessageBinding =
ItemCustomOutcomingLinkPreviewMessageBinding.bind(itemView)

4
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt
View File

@ -54,8 +54,8 @@ import javax.inject.Inject
import kotlin.math.roundToInt
@AutoInjector(NextcloudTalkApplication::class)
class OutcomingLocationMessageViewHolder(incomingView: View) : MessageHolders
.OutcomingTextMessageViewHolder<ChatMessage>(incomingView) {
class OutcomingLocationMessageViewHolder(incomingView: View) :
MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(incomingView) {
private val binding: ItemCustomOutcomingLocationMessageBinding =
ItemCustomOutcomingLocationMessageBinding.bind(itemView)
private val realView: View = itemView

7
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt
View File

@ -45,11 +45,10 @@ import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : MessageHolders
.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView, payload) {
class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) :
MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView, payload) {
private val binding: ItemCustomOutcomingPollMessageBinding =
ItemCustomOutcomingPollMessageBinding.bind(itemView)
private val binding: ItemCustomOutcomingPollMessageBinding = ItemCustomOutcomingPollMessageBinding.bind(itemView)
@Inject
lateinit var context: Context

7
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
View File

@ -51,11 +51,10 @@ import java.util.concurrent.ExecutionException
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class OutcomingVoiceMessageViewHolder(outcomingView: View) : MessageHolders
.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView) {
class OutcomingVoiceMessageViewHolder(outcomingView: View) :
MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView) {
private val binding: ItemCustomOutcomingVoiceMessageBinding =
ItemCustomOutcomingVoiceMessageBinding.bind(itemView)
private val binding: ItemCustomOutcomingVoiceMessageBinding = ItemCustomOutcomingVoiceMessageBinding.bind(itemView)
@JvmField
@Inject

8
app/src/main/java/com/nextcloud/talk/call/ReactionAnimator.kt
View File

@ -124,7 +124,7 @@ class ReactionAnimator(
val emojiView = EmojiTextView(context)
emojiView.text = callReaction.emoji
emojiView.textSize = 20f
emojiView.textSize = TEXT_SIZE
val nameView = getNameView(callReaction)
reactionWrapper.addView(emojiView)
@ -141,7 +141,7 @@ class ReactionAnimator(
ViewGroup.LayoutParams.WRAP_CONTENT
)
nameViewParams.setMargins(20, 0, 20, 5)
nameViewParams.setMargins(HORIZONTAL_MARGIN, 0, HORIZONTAL_MARGIN, BOTTOM_MARGIN)
nameView.layoutParams = nameViewParams
nameView.text = " " + callReaction.userName + " "
@ -176,6 +176,10 @@ class ReactionAnimator(
private const val ZERO_ALPHA = 0f
private const val ALPHA_PROPERTY = "alpha"
private const val TEXT_SIZE = 20f
private const val HORIZONTAL_MARGIN: Int = 20
private const val BOTTOM_MARGIN: Int = 5
}
}
data class CallReaction(

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

@ -3136,6 +3136,7 @@ class ChatActivity :
inner class ReactionAddedObserver : Observer<ReactionAddedModel> {
override fun onSubscribe(d: Disposable) {
// unused atm
}
override fun onNext(reactionAddedModel: ReactionAddedModel) {
@ -3159,6 +3160,7 @@ class ChatActivity :
inner class ReactionDeletedObserver : Observer<ReactionDeletedModel> {
override fun onSubscribe(d: Disposable) {
// unused atm
}
override fun onNext(reactionDeletedModel: ReactionDeletedModel) {

20
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt
View File

@ -78,13 +78,13 @@ import java.net.CookieManager
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class AccountVerificationController(args: Bundle? = null) :
BaseController(
R.layout.controller_account_verification,
args
) {
private val binding: ControllerAccountVerificationBinding? by
viewBinding(ControllerAccountVerificationBinding::bind)
class AccountVerificationController(args: Bundle? = null) : BaseController(
R.layout.controller_account_verification,
args
) {
private val binding: ControllerAccountVerificationBinding? by viewBinding(
ControllerAccountVerificationBinding::bind
)
@Inject
lateinit var ncApi: NcApi
@ -291,10 +291,8 @@ class AccountVerificationController(args: Bundle? = null) :
@SuppressLint("SetTextI18n")
override fun onError(e: Throwable) {
binding?.progressText?.text =
""" ${binding?.progressText?.text}
"""
.trimIndent() + resources!!.getString(R.string.nc_display_name_not_stored)
binding?.progressText?.text = """ ${binding?.progressText?.text}""".trimIndent() +
resources!!.getString(R.string.nc_display_name_not_stored)
abortVerification()
}

3
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
View File

@ -309,8 +309,7 @@ class ConversationInfoActivity :
requireFutureDateTime = true,
currentDateTime = currentTimeCalendar,
show24HoursView = true,
dateTimeCallback = { _,
dateTime ->
dateTimeCallback = { _, dateTime ->
reconfigureLobbyTimerView(dateTime)
submitLobbyChanges()
}

16
app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt
View File

@ -57,8 +57,7 @@ fun ImageView.loadConversationAvatar(
conversation: Conversation,
ignoreCache: Boolean,
viewThemeUtils: ViewThemeUtils?
): io.reactivex.disposables
.Disposable {
): io.reactivex.disposables.Disposable {
val imageRequestUri = ApiUtils.getUrlForConversationAvatarWithVersion(
1,
user.baseUrl,
@ -100,8 +99,7 @@ fun ImageView.loadUserAvatar(
avatarId: String,
requestBigSize: Boolean = true,
ignoreCache: Boolean
): io.reactivex.disposables
.Disposable {
): io.reactivex.disposables.Disposable {
val imageRequestUri = ApiUtils.getUrlForAvatar(
user.baseUrl,
avatarId,
@ -117,8 +115,7 @@ private fun ImageView.loadAvatarInternal(
url: String,
ignoreCache: Boolean,
errorPlaceholder: Drawable?
): io.reactivex.disposables
.Disposable {
): io.reactivex.disposables.Disposable {
val cachePolicy = if (ignoreCache) {
CachePolicy.WRITE_ONLY
} else {
@ -215,8 +212,11 @@ fun ImageView.loadImage(url: String, user: User, placeholder: Drawable? = null):
return DisposableWrapper(context.imageLoader.enqueue(requestBuilder.build()))
}
fun ImageView.loadAvatarOrImagePreview(url: String, user: User, placeholder: Drawable? = null): io.reactivex
.disposables.Disposable {
fun ImageView.loadAvatarOrImagePreview(
url: String,
user: User,
placeholder: Drawable? = null
): io.reactivex.disposables.Disposable {
return if (url.contains("/avatar/")) {
loadAvatarInternal(user, url, false, null)
} else {

40
app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt
View File

@ -451,40 +451,26 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
const val DELETE_ALL = "DELETE_ALL"
fun run(context: Context) {
if (ContextCompat.checkSelfPermission(
context,
Manifest.permission.WRITE_CONTACTS
) == PackageManager.PERMISSION_GRANTED &&
ContextCompat.checkSelfPermission(
context,
Manifest.permission.READ_CONTACTS
) == PackageManager.PERMISSION_GRANTED
if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_CONTACTS) ==
PackageManager.PERMISSION_GRANTED &&
ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) ==
PackageManager.PERMISSION_GRANTED
) {
WorkManager
.getInstance()
.enqueue(
OneTimeWorkRequest.Builder(ContactAddressBookWorker::class.java)
.setInputData(Data.Builder().putBoolean(KEY_FORCE, false).build())
.build()
)
WorkManager.getInstance().enqueue(
OneTimeWorkRequest.Builder(ContactAddressBookWorker::class.java)
.setInputData(Data.Builder().putBoolean(KEY_FORCE, false).build()).build()
)
}
}
fun checkPermission(activity: Activity, context: Context): Boolean {
if (ContextCompat.checkSelfPermission(
context,
Manifest.permission.WRITE_CONTACTS
) != PackageManager.PERMISSION_GRANTED ||
ContextCompat.checkSelfPermission(
context,
Manifest.permission.READ_CONTACTS
) != PackageManager.PERMISSION_GRANTED
if (ContextCompat.checkSelfPermission(context, Manifest.permission.WRITE_CONTACTS) !=
PackageManager.PERMISSION_GRANTED ||
ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) !=
PackageManager.PERMISSION_GRANTED
) {
activity.requestPermissions(
arrayOf(
Manifest.permission.WRITE_CONTACTS,
Manifest.permission.READ_CONTACTS
),
arrayOf(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS),
REQUEST_PERMISSION
)
return false

11
app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt
View File

@ -37,8 +37,15 @@ data class SpreedCapability(
@JsonField(name = ["features"])
var features: List<String>?,
@JsonField(name = ["config"])
var config: HashMap<String, HashMap<String, @RawValue @Contextual
Any>>?
var config: HashMap<
String,
HashMap<
String,
@RawValue
@Contextual
Any
>
>?
) : Parcelable {
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(null, null)

21
app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt
View File

@ -1,3 +1,22 @@
/*
* Nextcloud Talk application
*
* @author Tim Krüger
* Copyright (C) 2023 Tim Krüger <t@timkrueger.me>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.models.json.status
enum class StatusType(val string: String) {
@ -5,5 +24,5 @@ enum class StatusType(val string: String) {
OFFLINE("offline"),
DND("dnd"),
AWAY("away"),
INVISIBLE("invisible");
INVISIBLE("invisible")
}

19
app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt
View File

@ -298,15 +298,16 @@ class ProfileActivity : BaseActivity() {
}
binding.loadingContent.visibility = View.VISIBLE
adapter!!.setData(createUserInfoDetails(userInfo))
if (isAllEmpty(
if (
isAllEmpty(
arrayOf(
userInfo?.displayName,
userInfo?.phone,
userInfo?.email,
userInfo?.address,
userInfo?.twitter,
userInfo?.website
)
userInfo?.displayName,
userInfo?.phone,
userInfo?.email,
userInfo?.address,
userInfo?.twitter,
userInfo?.website
)
)
) {
binding.userinfoList.visibility = View.GONE
@ -755,7 +756,7 @@ class ProfileActivity : BaseActivity() {
PHONE("phone", "phoneScope"),
ADDRESS("address", "addressScope"),
WEBSITE("website", "websiteScope"),
TWITTER("twitter", "twitterScope");
TWITTER("twitter", "twitterScope")
}
companion object {

3
app/src/main/java/com/nextcloud/talk/ui/dialog/MoreCallActionsDialog.kt
View File

@ -118,7 +118,7 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee
availableReactions.forEach {
val emojiView = EmojiTextView(context)
emojiView.text = it.toString()
emojiView.textSize = 20f
emojiView.textSize = TEXT_SIZE
emojiView.layoutParams = param
emojiView.setOnClickListener { view ->
@ -198,5 +198,6 @@ class MoreCallActionsDialog(private val callActivity: CallActivity) : BottomShee
companion object {
private const val TAG = "MoreCallActionsDialog"
private const val TEXT_SIZE = 20f
}
}

4
app/src/main/java/com/nextcloud/talk/webrtc/WebSocketInstance.kt
View File

@ -289,8 +289,8 @@ class WebSocketInstance internal constructor(
val (_, roomWebSocketMessage) = LoganSquare.parse(text, JoinedRoomOverallWebSocketMessage::class.java)
if (roomWebSocketMessage != null) {
currentRoomToken = roomWebSocketMessage.roomId
if (roomWebSocketMessage
.roomPropertiesWebSocketMessage != null &&
if (
roomWebSocketMessage.roomPropertiesWebSocketMessage != null &&
!TextUtils.isEmpty(currentRoomToken)
) {
sendRoomJoinedEvent()

2
build.gradle
View File

@ -38,7 +38,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}"
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14'
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0"
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.3.2"
// NOTE: Do not place your application dependencies here; they belong

2
detekt.yml
View File

@ -1,5 +1,5 @@
build:
maxIssues: 80
maxIssues: 73
weights:
# complexity: 2
# LongParameterList: 1