Răsfoiți Sursa

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

Bump requery from 1.5.1 to 1.6.1
Andy Scherzinger 4 ani în urmă
părinte
comite
30f9de4fb3

+ 1 - 1
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'

+ 6 - 3
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(

+ 1 - 0
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

+ 1 - 1
scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 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>