mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-22 04:55:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2473 from nextcloud/chore/noid/housekeepingOne

Browse source 
Code scanner warnings housekeeping - part one
This commit is contained in:
Tim Krüger 2022-10-07 09:25:54 +02:00 committed by GitHub
commit 89607b8776
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.kt
View file

@ -784,12 +784,7 @@ class ConversationsListController(bundle: Bundle) :
for (flexItem in conversationItems) {
val conversation: Conversation = (flexItem as ConversationItem).model
val position = adapter!!.getGlobalPositionOf(flexItem)
if ((
conversation.unreadMention ||
conversation.unreadMessages > 0 &&
conversation.type === Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
) && position > lastVisibleItem
) {
if (hasUnreadItems(conversation) && position > lastVisibleItem) {
nextUnreadConversationScrollPosition = position
if (!binding.newMentionPopupBubble.isShown) {
binding.newMentionPopupBubble.show()
@ -809,6 +804,11 @@ class ConversationsListController(bundle: Bundle) :
}
}
private fun hasUnreadItems(conversation: Conversation) =
conversation.unreadMention ||
conversation.unreadMessages > 0 &&
conversation.type === Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
private fun showNewConversationsScreen() {
val bundle = Bundle()
bundle.putBoolean(KEY_NEW_CONVERSATION, true)
@ -1203,8 +1203,7 @@ class ConversationsListController(bundle: Bundle) :
conversationMenuBundle = bundle
if (activity != null &&
conversationMenuBundle != null &&
currentUser != null &&
conversationMenuBundle!!.getLong(KEY_INTERNAL_USER_ID) == currentUser!!.id
isInternalUserEqualsCurrentUser(currentUser, conversationMenuBundle)
) {
val conversation = Parcels.unwrap<Conversation>(conversationMenuBundle!!.getParcelable(KEY_ROOM))
if (conversation != null) {
@ -1239,6 +1238,10 @@ class ConversationsListController(bundle: Bundle) :
}
}
private fun isInternalUserEqualsCurrentUser(currentUser: User?, conversationMenuBundle: Bundle?): Boolean {
return currentUser != null && conversationMenuBundle!!.getLong(KEY_INTERNAL_USER_ID) == currentUser.id
}
private fun showUnauthorizedDialog() {
if (activity != null) {
val dialogBuilder = MaterialAlertDialogBuilder(binding.floatingActionButton.context)

2
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View file

@ -183,7 +183,7 @@ public class NotificationWorker extends Worker {
}
}
muteCall = !(conversation.getNotificationCalls() == 1);
muteCall = conversation.getNotificationCalls() != 1;
}
@Override

2
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
View file

@ -283,7 +283,7 @@ public class DisplayUtils {
public static Drawable getTintedDrawable(Resources res, @DrawableRes int drawableResId, @ColorRes int colorResId) {
Drawable drawable = ResourcesCompat.getDrawable(res, drawableResId, null);
;
int color = res.getColor(colorResId);
if (drawable != null) {
drawable.setTint(color);

2
detekt.yml
View file

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