diff --git a/build.gradle b/build.gradle index 9a01f56e..c70bdf1b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "io.realm:realm-gradle-plugin:3.7.0" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath "io.realm:realm-gradle-plugin:4.1.1" } } diff --git a/qksms/build.gradle b/qksms/build.gradle index 6f9e8650..bb3213a8 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -53,7 +53,7 @@ dependencies { kapt "android.arch.lifecycle:compiler:1.0.0-alpha9-1" kapt 'com.github.bumptech.glide:compiler:4.3.0' kapt "com.google.dagger:dagger-compiler:2.11" - kapt 'io.realm:realm-annotations:3.7.0' - kapt 'io.realm:realm-annotations-processor:3.7.0' + kapt 'io.realm:realm-annotations:4.1.1' + kapt 'io.realm:realm-annotations-processor:4.1.1' provided 'javax.annotation:jsr250-api:1.0' } diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt index ac27806f..e7f48869 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt @@ -81,7 +81,7 @@ class NotificationManager @Inject constructor( .setStyle(style) if (Build.VERSION.SDK_INT >= 24 && conversation != null) { - notification.addAction(getReplyAction(conversation.contacts[0].address, conversation.id)) + notification.addAction(getReplyAction(conversation.contacts[0]?.address.orEmpty(), conversation.id)) } notificationManager.notify(threadId.toInt(), notification.build()) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 6caed71b..774915a9 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -29,6 +29,7 @@ class MessageRepository @Inject constructor( return Realm.getDefaultInstance() .where(Message::class.java) .findAllSortedAsync("date", Sort.DESCENDING) + .where() .distinctAsync("threadId") } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt index 275550d2..ad8e6cf0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt @@ -46,7 +46,7 @@ class MessagesViewModel(val threadId: Long) : QkViewModel