From 4d43cc69c721f8c994f61c1210b7b2b10db61004 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 27 Mar 2018 22:00:50 +0200
Subject: [PATCH] Fix a minor reordering issue
---
app/build.gradle.kts | 2 +-
buildSrc/src/main/kotlin/VersionContext.kt | 6 ++++--
.../de/kuschku/quasseldroid/persistence/QuasselDatabase.kt | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f9a4c52a0..5f394079e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -43,7 +43,7 @@ android {
signingConfig = signingConfigs.getByName("default")
- resConfigs("auto")
+ resConfigs("de", "en")
vectorDrawables.useSupportLibrary = true
diff --git a/buildSrc/src/main/kotlin/VersionContext.kt b/buildSrc/src/main/kotlin/VersionContext.kt
index 288212239..806b41a63 100644
--- a/buildSrc/src/main/kotlin/VersionContext.kt
+++ b/buildSrc/src/main/kotlin/VersionContext.kt
@@ -1,5 +1,7 @@
data class VersionContext(val version: String)
-inline fun withVersion(version: String, f: VersionContext.() -> Unit) {
- VersionContext(version).f()
+inline fun withVersion(version: Any?, f: VersionContext.() -> Unit) {
+ (version as? String)?.let {
+ VersionContext(version).f()
+ }
}
\ No newline at end of file
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
index 274e2465f..ee90f8462 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
@@ -207,7 +207,7 @@ FROM
WHERE bufferId = ?
AND type & ~? > 0
) t
-ORDER BY time DESC
+ORDER BY time, messageId DESC
""", arrayOf(bufferId, type, bufferId, bufferId, type)))
fun QuasselDatabase.MessageDao.findByBufferIdWithDayChange(bufferId: Int, type: Int) =
@@ -241,5 +241,5 @@ FROM
WHERE bufferId = ?
AND type & ~? > 0
) t
-ORDER BY time DESC
+ORDER BY time, messageId DESC
""", arrayOf(bufferId, type, bufferId, bufferId, type)))
\ No newline at end of file
--
GitLab