From 355b9520929bb0ed40cbd80509505488d400e9a8 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 20 Apr 2018 13:50:02 +0200
Subject: [PATCH] More bugfixes
---
build.gradle.kts | 14 +++++++++++++-
.../quasseldroid/viewmodel/QuasselViewModel.kt | 4 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 96bf52831..32b0c03de 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.1.1")
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.31")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
}
}
@@ -16,3 +16,15 @@ allprojects {
maven(url = "https://jitpack.io")
}
}
+
+subprojects {
+ configurations.all {
+ resolutionStrategy {
+ eachDependency {
+ if (requested.name == "kotlin-compiler-embeddable") {
+ useVersion("1.2.31")
+ }
+ }
+ }
+ }
+}
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index 8a3e7d08e..2c69ea831 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -37,9 +37,9 @@ class QuasselViewModel : ViewModel() {
val expandedMessages = BehaviorSubject.createDefault(emptySet<MsgId>())
- val buffer = BehaviorSubject.createDefault(-1)
+ val buffer = BehaviorSubject.createDefault(Int.MAX_VALUE)
- val bufferViewConfigId = BehaviorSubject.createDefault(-1)
+ val bufferViewConfigId = BehaviorSubject.createDefault(Int.MAX_VALUE)
val MAX_RECENT_MESSAGES = 20
val recentlySentMessages = BehaviorSubject.createDefault(emptyList<CharSequence>())
--
GitLab