From cdcf0ace012c39c30cf8981794ce0a95598b30cc Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sat, 19 Sep 2015 13:42:57 +0200
Subject: [PATCH] Remvoed count parameter from getMessagesCursor.

---
 .../nutomic/ensichat/util/DatabaseTest.scala  | 21 +++++++------------
 .../ensichat/fragments/ChatFragment.scala     |  4 ++--
 .../com/nutomic/ensichat/util/Database.scala  |  4 ++--
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala b/app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala
index e11946d..0ac6516 100644
--- a/app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala
+++ b/app/src/androidTest/scala/com/nutomic/ensichat/util/DatabaseTest.scala
@@ -55,8 +55,8 @@ class DatabaseTest extends AndroidTestCase {
   /**
    * Calls [[Database.getMessagesCursor]] with parameters and converts the result to sorted set.
    */
-  private def getMessages(address: Address, count: Int): SortedSet[Message] = {
-    val c = database.getMessagesCursor(address, Option(count))
+  private def getMessages(address: Address): SortedSet[Message] = {
+    val c = database.getMessagesCursor(address)
     var messages = new TreeSet[Message]()(Message.Ordering)
     while (c.moveToNext()) {
       messages += Database.messageFromCursor(c)
@@ -65,27 +65,20 @@ class DatabaseTest extends AndroidTestCase {
     messages
   }
 
-  def testMessageCount(): Unit = {
-    val msg1 = getMessages(m1.header.origin, 1)
-    assertEquals(1, msg1.size)
-
-    val msg2 = getMessages(m1.header.origin, 3)
-    assertEquals(2, msg2.size)
-  }
-
   def testMessageOrder(): Unit = {
-    val msg = getMessages(m1.header.target, 1)
-    assertTrue(msg.contains(m1))
+    val msg = getMessages(m1.header.target).firstKey
+    assertEquals(m1.body, msg.body)
   }
 
   def testMessageSelect(): Unit = {
-    val msg = getMessages(m1.header.target, 2)
+    val msg = getMessages(m1.header.target)
     assertTrue(msg.contains(m1))
+    assertFalse(msg.contains(m2))
     assertTrue(msg.contains(m3))
   }
 
   def testMessageFields(): Unit = {
-    val msg = getMessages(m2.header.target, 1).firstKey
+    val msg = getMessages(m2.header.target).firstKey
     val header = msg.header.asInstanceOf[ContentHeader]
 
     assertEquals(h2.origin, header.origin)
diff --git a/app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala b/app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala
index 38f3c52..32aab04 100644
--- a/app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala
+++ b/app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala
@@ -53,7 +53,7 @@ class ChatFragment extends ListFragment with OnClickListener {
       database.getContact(address).foreach(c => getActivity.setTitle(c.name))
 
       adapter = new DatesAdapter(getActivity,
-        new MessagesAdapter(getActivity, database.getMessagesCursor(address, None), address))
+        new MessagesAdapter(getActivity, database.getMessagesCursor(address), address))
 
       if (listView != null) {
         listView.setAdapter(adapter)
@@ -125,7 +125,7 @@ class ChatFragment extends ListFragment with OnClickListener {
 
       msg.body match {
         case _: Text =>
-          adapter.changeCursor(database.getMessagesCursor(address, None))
+          adapter.changeCursor(database.getMessagesCursor(address))
         case _ =>
       }
     }
diff --git a/app/src/main/scala/com/nutomic/ensichat/util/Database.scala b/app/src/main/scala/com/nutomic/ensichat/util/Database.scala
index 3037996..a50cfbc 100644
--- a/app/src/main/scala/com/nutomic/ensichat/util/Database.scala
+++ b/app/src/main/scala/com/nutomic/ensichat/util/Database.scala
@@ -63,11 +63,11 @@ class Database(context: Context)
     db.execSQL(Database.CreateMessagesTable)
   }
 
-  def getMessagesCursor(address: Address, count: Option[Int]): Cursor = {
+  def getMessagesCursor(address: Address): Cursor = {
     getReadableDatabase.query(true,
       "messages", Array("_id", "origin", "target", "message_id", "text", "date"),
       "origin = ? OR target = ?", Array(address.toString, address.toString),
-      null, null, "date ASC", count.map(_.toString).orNull)
+      null, null, "date ASC", null)
   }
 
   /**