The changes of comments in pull 54

app/src/main/java/org/myhush/silentdragon/chat/Addressbook.kt

@@ -4,21 +4,21 @@ object Addressbook {
     class Contact {
         var addressList: ArrayList<String> = ArrayList()
         val messageList: ArrayList<Message> = ArrayList()
-        var firstName = ""
-        var lastName = ""
+        var fullname = ""
+        var nickname = ""
 
-        constructor(firstName: String, lastName: String){
-            this.firstName = firstName
-            this.lastName = lastName
+        constructor(fullname: String, nickname: String){
+            this.fullname = fullname
+            this.nickname = nickname
         }
-        constructor(firstName: String, lastName: String, address: String){
-            this.firstName = firstName
-            this.lastName = lastName
+        constructor(fullname: String, nickname: String, address: String){
+            this.fullname = fullname
+            this.nickname = nickname
             this.addressList.add(address)
         }
-        constructor(firstName: String, lastName: String, addressList: ArrayList<String>){
-            this.firstName = firstName
-            this.lastName = lastName
+        constructor(fullname: String, nickname: String, addressList: ArrayList<String>){
+            this.fullname = fullname
+            this.nickname = nickname
             this.addressList = addressList
         }
     }

app/src/main/java/org/myhush/silentdragon/chat/ChatActivity.kt

@@ -6,7 +6,6 @@ import android.support.v4.app.FragmentTransaction
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_chat.*
 import org.myhush.silentdragon.*
 
@@ -61,8 +60,8 @@ class ChatActivity : AppCompatActivity() {
         val fragment = ChatItemFragment()
         val fragTx: FragmentTransaction = supportFragmentManager.beginTransaction()
 
-        fragment.firstName = contact.firstName
-        fragment.lastName = contact.lastName
+        fragment.fullname = contact.fullname
+        fragment.nickname = contact.nickname
         fragment.lastMessage = contact.addressList[0]
 
         fragTx.add(R.id.ChatTable, fragment)

app/src/main/java/org/myhush/silentdragon/chat/ChatItemFragment.kt

@@ -7,12 +7,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import org.myhush.silentdragon.DataModel
 import org.myhush.silentdragon.R
 
 class ChatItemFragment : Fragment() {
-    var firstName: String = ""
-    var lastName: String = ""
+    var fullname: String = ""
+    var nickname: String = ""
     var lastMessage: String = ""
     var v: View? = null
 
@@ -29,14 +28,14 @@ class ChatItemFragment : Fragment() {
         v?.setOnClickListener {
             val intent = Intent(activity, ConversationActivity::class.java)
 
-            intent.putExtra("displayName", "$firstName $lastName") // Send some information
+            intent.putExtra("displayName", "$fullname $nickname") // Send some information
 
             startActivity(intent)
         }
     }
 
     fun updateData(){
-        v!!.findViewById<TextView>(R.id.textViewContactName).text = "$firstName $lastName"
+        v!!.findViewById<TextView>(R.id.textViewContactName).text = "$fullname $nickname"
         v!!.findViewById<TextView>(R.id.textViewLastMessage).text = lastMessage
     }
 

app/src/main/java/org/myhush/silentdragon/chat/ConversationActivity.kt

@@ -1,17 +1,15 @@
 package org.myhush.silentdragon.chat
 
-import android.content.SharedPreferences
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.support.v4.app.FragmentTransaction
 import org.myhush.silentdragon.R
 import org.myhush.silentdragon.conversation_item_recive
 import org.myhush.silentdragon.conversation_item_send
-import java.lang.Exception
 
 class ConversationActivity : AppCompatActivity() {
     var displayName = ""
-    var messages: ArrayList<Message> = ArrayList()
+    var contact: Addressbook.Contact? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -22,18 +20,9 @@ class ConversationActivity : AppCompatActivity() {
         restoreChat()
     }
 
-    private fun restoreChat(){
-
-        try{
-            val m1 = Message("Test", "XXXXX", "YYYYYY", 99999999)
-            attachMessage(m1)
-        } catch (e: Exception){
-            var pref: SharedPreferences = getSharedPreferences("MainFile",0)
-
-            var editor: SharedPreferences.Editor = pref.edit()
-            editor.putString("Error", e.stackTrace.contentDeepToString())
-
-            editor.commit()
+    private fun restoreChat() {
+        contact?.messageList?.forEach {
+            attachMessage(it)
         }
     }
 
@@ -54,6 +43,5 @@ class ConversationActivity : AppCompatActivity() {
             }
         }
         fragTx.commit()
-        messages.add(message)
     }
 }

app/src/main/java/org/myhush/silentdragon/chat/Message.kt

@@ -1,21 +1,22 @@
 package org.myhush.silentdragon.chat
 
+import org.myhush.silentdragon.DataModel
+
 class Message {
     var memo = ""
     var fromAddress = ""
     var toAddress = ""
     var messageType = MessageType.SEND
     var dateTime: Long = 0
+    var txID = ""
+    var txHeight: Int = -1
 
-    constructor(memo: String, toAddress: String, fromAddress: String){
-        this.memo = memo
-        this.fromAddress = fromAddress
-        this.toAddress = toAddress
-    }
-    constructor(memo: String, toAddress: String, fromAddress: String, dateTime: Long){
-        this.memo = memo
+    constructor(fromAddress: String, tx: DataModel.TransactionItem){
+        this.memo = tx.memo.toString()
+        this.txID = tx.txid.toString()
+        this.dateTime = tx.datetime
+        this.toAddress = tx.addr
         this.fromAddress = fromAddress
-        this.toAddress = toAddress
-        this.dateTime = dateTime
     }
+
 }