From cc518f62585769b462979540b9f3c118d67ef652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 19:40:27 +0000 Subject: [PATCH 1/4] Bump requery from 1.5.1 to 1.6.1 Bumps [requery](https://github.com/requery/requery) from 1.5.1 to 1.6.1. - [Release notes](https://github.com/requery/requery/releases) - [Changelog](https://github.com/requery/requery/blob/master/CHANGELOG.md) - [Commits](https://github.com/requery/requery/commits) Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 945c1978e..d896364ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -219,7 +219,7 @@ dependencies { compileOnly 'javax.annotation:javax.annotation-api:1.3.2' // Android only implementation 'org.greenrobot:eventbus:3.2.0' - implementation 'io.requery:requery:1.5.1' + implementation 'io.requery:requery:1.6.1' implementation 'io.requery:requery-android:1.6.1' implementation 'net.zetetic:android-database-sqlcipher:3.5.9' kapt 'io.requery:requery-processor:1.6.1' From 8442a5a65e1dbe584460b37106a6fede8ba647de Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 22:43:01 +0200 Subject: [PATCH 2/4] reformat class Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/controllers/ChatController.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 7facc123a..ea65f469f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -434,14 +434,17 @@ class ChatController(args: Bundle) : messageHolders.registerContentType( CONTENT_TYPE_SYSTEM_MESSAGE, MagicSystemMessageViewHolder::class.java, - R.layout.item_system_message, MagicSystemMessageViewHolder::class.java, R.layout.item_system_message, + R.layout.item_system_message, MagicSystemMessageViewHolder::class.java, + R.layout.item_system_message, this ) messageHolders.registerContentType( CONTENT_TYPE_UNREAD_NOTICE_MESSAGE, - MagicUnreadNoticeMessageViewHolder::class.java, R.layout.item_date_header, - MagicUnreadNoticeMessageViewHolder::class.java, R.layout.item_date_header, this + MagicUnreadNoticeMessageViewHolder::class.java, + R.layout.item_date_header, + MagicUnreadNoticeMessageViewHolder::class.java, + R.layout.item_date_header, this ) adapter = TalkMessagesListAdapter( From d2edd6010c7d64ec627cb121309aa6802a0732e3 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Apr 2021 22:43:23 +0200 Subject: [PATCH 3/4] show contacts icon for vcf file Signed-off-by: Andy Scherzinger --- app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt index 2deafa3e5..9b6aa4d64 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt @@ -128,6 +128,7 @@ object DrawableUtils { drawableMap["text/css"] = R.drawable.ic_mimetype_text_code drawableMap["text/csv"] = R.drawable.ic_mimetype_x_office_spreadsheet drawableMap["text/html"] = R.drawable.ic_mimetype_text_code + drawableMap["text/vcard"] = R.drawable.ic_mimetype_text_vcard drawableMap["text/x-c"] = R.drawable.ic_mimetype_text_code drawableMap["text/x-c++src"] = R.drawable.ic_mimetype_text_code drawableMap["text/x-h"] = R.drawable.ic_mimetype_text_code From eb00702c1966955feae09a5dd38eff0aa0495706 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 30 Apr 2021 00:02:37 +0200 Subject: [PATCH 4/4] Drone: update Lint results to reflect reduced error/warning count [skip ci] Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index ac0be8569..7a97c565d 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 370 warnings + Lint Report: 3 errors and 369 warnings