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

Merge pull request #1194 from nextcloud/dependabot/gradle/io.requery-requery-1.6.1

Browse source 
Bump requery from 1.5.1 to 1.6.1
This commit is contained in:
Andy Scherzinger 2021-04-30 00:11:56 +02:00 committed by GitHub
commit 30f9de4fb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -219,7 +219,7 @@ dependencies {
compileOnly 'javax.annotation:javax.annotation-api:1.3.2' compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
// Android only // Android only
implementation 'org.greenrobot:eventbus:3.2.0' 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 'io.requery:requery-android:1.6.1'
implementation 'net.zetetic:android-database-sqlcipher:3.5.9' implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
kapt 'io.requery:requery-processor:1.6.1' kapt 'io.requery:requery-processor:1.6.1'

9
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View file

@ -434,14 +434,17 @@ class ChatController(args: Bundle) :
messageHolders.registerContentType( messageHolders.registerContentType(
CONTENT_TYPE_SYSTEM_MESSAGE, MagicSystemMessageViewHolder::class.java, 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 this
) )
messageHolders.registerContentType( messageHolders.registerContentType(
CONTENT_TYPE_UNREAD_NOTICE_MESSAGE, CONTENT_TYPE_UNREAD_NOTICE_MESSAGE,
MagicUnreadNoticeMessageViewHolder::class.java, R.layout.item_date_header, MagicUnreadNoticeMessageViewHolder::class.java,
MagicUnreadNoticeMessageViewHolder::class.java, R.layout.item_date_header, this R.layout.item_date_header,
MagicUnreadNoticeMessageViewHolder::class.java,
R.layout.item_date_header, this
) )
adapter = TalkMessagesListAdapter( adapter = TalkMessagesListAdapter(

1
app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt
View file

@ -128,6 +128,7 @@ object DrawableUtils {
drawableMap["text/css"] = R.drawable.ic_mimetype_text_code drawableMap["text/css"] = R.drawable.ic_mimetype_text_code
drawableMap["text/csv"] = R.drawable.ic_mimetype_x_office_spreadsheet drawableMap["text/csv"] = R.drawable.ic_mimetype_x_office_spreadsheet
drawableMap["text/html"] = R.drawable.ic_mimetype_text_code 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"] = R.drawable.ic_mimetype_text_code
drawableMap["text/x-c++src"] = 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 drawableMap["text/x-h"] = R.drawable.ic_mimetype_text_code

2
scripts/analysis/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 3 errors and 370 warnings</span> <span class="mdl-layout-title">Lint Report: 3 errors and 369 warnings</span>