chat: smoother refresh (fixes #3784) (#3786)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Jul 8, 2024 · d37137a · d37137a
1 parent 8f4c631
commit d37137a
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 95 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1659
-        versionName "0.16.59"
+        versionCode 1660
+        versionName "0.16.60"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmChatHistory.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmChatHistory.kt
@@ -18,6 +18,7 @@ open class RealmChatHistory : RealmObject() {
     var aiProvider: String? = null
     var title: String? = null
     var createdDate: String? = null
+    var updatedDate: String? = null
     var conversations: RealmList<Conversation>? = null
     companion object {
         @JvmStatic
@@ -33,6 +34,7 @@ open class RealmChatHistory : RealmObject() {
             chatHistory._id = JsonUtils.getString("_id", act)
             chatHistory.title = JsonUtils.getString("title", act)
             chatHistory.createdDate = JsonUtils.getString("createdDate", act)
+            chatHistory.updatedDate = JsonUtils.getString("updatedDate", act)
             chatHistory.user = JsonUtils.getString("user", act)
             chatHistory.aiProvider = JsonUtils.getString("aiProvider", act)
             chatHistory.conversations = parseConversations(mRealm, JsonUtils.getJsonArray("conversations", act))

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatDetailFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatDetailFragment.kt
@@ -16,10 +16,12 @@ import org.ole.planet.myplanet.datamanager.*
 import org.ole.planet.myplanet.model.*
 import org.ole.planet.myplanet.model.RealmChatHistory.Companion.addConversationToChatHistory
 import org.ole.planet.myplanet.service.UserProfileDbHandler
+import org.ole.planet.myplanet.ui.dashboard.DashboardActivity
 import org.ole.planet.myplanet.utilities.Utilities
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.util.Date
 
 class ChatDetailFragment : Fragment() {
     lateinit var fragmentChatDetailBinding: FragmentChatDetailBinding
@@ -30,6 +32,7 @@ class ChatDetailFragment : Fragment() {
     private var aiName: String = ""
     private var aiModel: String = ""
     private lateinit var mRealm: Realm
+    var user: RealmUserModel? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -43,7 +46,7 @@ class ChatDetailFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         mRealm = DatabaseService(requireContext()).realmInstance
-        val user = UserProfileDbHandler(requireContext()).userModel
+        user = UserProfileDbHandler(requireContext()).userModel
         mAdapter = ChatAdapter(ArrayList(), requireContext(), fragmentChatDetailBinding.recyclerGchat)
         fragmentChatDetailBinding.recyclerGchat.adapter = mAdapter
         val layoutManager: RecyclerView.LayoutManager = LinearLayoutManager(requireContext())
@@ -268,19 +271,21 @@ class ChatDetailFragment : Fragment() {
             override fun onResponse(call: Call<ChatModel>, response: Response<ChatModel>) {
                 val responseBody = response.body()
                 if (response.isSuccessful && responseBody != null) {
+                    val jsonObject = JsonObject()
                     if (responseBody.status == "Success") {
                         val chatResponse = response.body()?.chat
                         if (chatResponse != null) {
                             mAdapter.responseSource = ChatAdapter.RESPONSE_SOURCE_NETWORK
                             mAdapter.addResponse(chatResponse)
                             _id = "${response.body()?.couchDBResponse?.id}"
                             _rev = "${response.body()?.couchDBResponse?.rev}"
-                            val jsonObject = JsonObject()
                             jsonObject.addProperty("_rev", "${response.body()?.couchDBResponse?.rev}")
                             jsonObject.addProperty("_id", "${response.body()?.couchDBResponse?.id}")
-                            jsonObject.addProperty("time", "")
-                            jsonObject.addProperty("title", "")
-                            jsonObject.addProperty("updatedTime", "")
+                            jsonObject.addProperty("aiProvider", aiName)
+                            jsonObject.addProperty("user", user?.name)
+                            jsonObject.addProperty("title", query)
+                            jsonObject.addProperty("createdTime", Date().time)
+                            jsonObject.addProperty("updatedDate", "")
 
                             val conversationsArray = JsonArray()
                             val conversationObject = JsonObject()
@@ -289,16 +294,22 @@ class ChatDetailFragment : Fragment() {
                             conversationsArray.add(conversationObject)
 
                             jsonObject.add("conversations", conversationsArray)
+
+                            requireActivity().runOnUiThread {
+                                RealmChatHistory.insert(mRealm, jsonObject)
+                            }
+                            (requireActivity() as? DashboardActivity)?.refreshChatHistoryList()
                         }
                     } else {
                         fragmentChatDetailBinding.textGchatIndicator.visibility = View.VISIBLE
                         fragmentChatDetailBinding.textGchatIndicator.text = context?.getString(R.string.message_placeholder, responseBody.message)
-                        val jsonObject = JsonObject()
                         jsonObject.addProperty("_rev", "")
                         jsonObject.addProperty("_id", "")
-                        jsonObject.addProperty("time", "")
-                        jsonObject.addProperty("title", "")
-                        jsonObject.addProperty("updatedTime", "")
+                        jsonObject.addProperty("aiProvider", aiName)
+                        jsonObject.addProperty("user", user?.name)
+                        jsonObject.addProperty("title", query)
+                        jsonObject.addProperty("createdTime", Date().time)
+                        jsonObject.addProperty("updatedDate", "")
 
                         val conversationsArray = JsonArray()
                         val conversationObject = JsonObject()
@@ -310,6 +321,7 @@ class ChatDetailFragment : Fragment() {
                         requireActivity().runOnUiThread {
                             RealmChatHistory.insert(mRealm, jsonObject)
                         }
+                        (requireActivity() as? DashboardActivity)?.refreshChatHistoryList()
                     }
                 } else {
                     fragmentChatDetailBinding.textGchatIndicator.visibility = View.VISIBLE
@@ -318,23 +330,6 @@ class ChatDetailFragment : Fragment() {
                     } else {
                         response.message()
                     }
-                    val jsonObject = JsonObject()
-                    jsonObject.addProperty("_rev", "")
-                    jsonObject.addProperty("_id", "")
-                    jsonObject.addProperty("time", "")
-                    jsonObject.addProperty("title", "")
-                    jsonObject.addProperty("updatedTime", "")
-
-                    val conversationsArray = JsonArray()
-                    val conversationObject = JsonObject()
-                    conversationObject.addProperty("query", query)
-                    conversationObject.addProperty("response", "")
-                    conversationsArray.add(conversationObject)
-
-                    jsonObject.add("conversations", conversationsArray)
-                    requireActivity().runOnUiThread {
-                        RealmChatHistory.insert(mRealm, jsonObject)
-                    }
                 }
 
                 fragmentChatDetailBinding.buttonGchatSend.isEnabled = true
@@ -343,23 +338,6 @@ class ChatDetailFragment : Fragment() {
             }
 
             override fun onFailure(call: Call<ChatModel>, t: Throwable) {
-                val jsonObject = JsonObject()
-                jsonObject.addProperty("_rev", "")
-                jsonObject.addProperty("_id", "")
-                jsonObject.addProperty("time", "")
-                jsonObject.addProperty("title", "")
-                jsonObject.addProperty("updatedTime", "")
-
-                val conversationsArray = JsonArray()
-                val conversationObject = JsonObject()
-                conversationObject.addProperty("query", query)
-                conversationObject.addProperty("response", "")
-                conversationsArray.add(conversationObject)
-
-                jsonObject.add("conversations", conversationsArray)
-                requireActivity().runOnUiThread {
-                    RealmChatHistory.insert(mRealm, jsonObject)
-                }
                 fragmentChatDetailBinding.textGchatIndicator.visibility = View.VISIBLE
                 fragmentChatDetailBinding.textGchatIndicator.text = context?.getString(R.string.message_placeholder, t.message)
                 fragmentChatDetailBinding.buttonGchatSend.isEnabled = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatHistoryListAdapter.kt b/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatHistoryListAdapter.kt
@@ -55,10 +55,10 @@ class ChatHistoryListAdapter(var context: Context, private var chatHistory: List
             if (chat.conversations != null && chat.conversations?.isNotEmpty() == true) {
                 chat.conversations?.get(0)?.query?.contains(query, ignoreCase = true) == true
             } else {
-                chat.title?.contains(query, ignoreCase = true) == true
+                chat.title?.contains(query, ignoreCase = true) ==true
             }
         }
-            notifyItemRangeChanged(0, filteredChatHistory.size)
+        notifyDataSetChanged()
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
@@ -77,23 +77,9 @@ class ChatHistoryListAdapter(var context: Context, private var chatHistory: List
     }
 
     fun updateChatHistory(newChatHistory: List<RealmChatHistory>) {
-        val oldListSize = chatHistory.size
-        val newListSize = newChatHistory.size
         chatHistory = newChatHistory
         filteredChatHistory = newChatHistory
-        if(oldListSize<newListSize){
-            notifyItemRangeInserted(oldListSize,newListSize-oldListSize)
-        }
-        else if(oldListSize>newListSize){
-            notifyItemRangeRemoved(newListSize,oldListSize-newListSize)
-        }
-        else{
-            for(i in 0 until newListSize){
-                if(chatHistory[i] != newChatHistory[i]){
-                    notifyItemChanged(i)
-                }
-            }
-        }
+        notifyDataSetChanged()
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatHistoryListFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatHistoryListFragment.kt
@@ -54,42 +54,13 @@ class ChatHistoryListFragment : Fragment() {
             }
         }
 
-        val mRealm = DatabaseService(requireActivity()).realmInstance
-        val chats = mRealm.where(RealmChatHistory::class.java).findAll()
-
-        val list = mRealm.where(RealmChatHistory::class.java).equalTo("user", user?.name)
-            .sort("id", Sort.DESCENDING)
-            .findAll()
-
-        val filteredHistoryList = ArrayList<RealmChatHistory>()
-        for (chat in chats) {
-            val model = list.find { it.id == chat.id }
-            if (model != null && !filteredHistoryList.contains(model)) {
-                filteredHistoryList.add(model)
-            }
-        }
-        showNoData(fragmentChatHistoryListBinding.noChats, filteredHistoryList.size, "chatHistory")
-        if (filteredHistoryList.isEmpty()) {
-            fragmentChatHistoryListBinding.searchBar.visibility = View.GONE
-            fragmentChatHistoryListBinding.recyclerView.visibility = View.GONE
-        }
-        val adapter = ChatHistoryListAdapter(requireContext(), list, this)
-        adapter.setChatHistoryItemClickListener(object : ChatHistoryListAdapter.ChatHistoryItemClickListener {
-            override fun onChatHistoryItemClicked(conversations: RealmList<Conversation>?, id: String, rev:String?) {
-                conversations?.let { sharedViewModel.setSelectedChatHistory(it) }
-                sharedViewModel.setSelected_id(id)
-                rev?.let { sharedViewModel.setSelected_rev(it) }
-
-                fragmentChatHistoryListBinding.slidingPaneLayout.openPane()
-            }
-        })
-        fragmentChatHistoryListBinding.recyclerView.adapter = adapter
+        refreshChatHistoryList()
 
         fragmentChatHistoryListBinding.searchBar.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                adapter.filter(s.toString())
+                (fragmentChatHistoryListBinding.recyclerView.adapter as? ChatHistoryListAdapter)?.filter(s.toString())
             }
 
             override fun afterTextChanged(s: Editable?) {}
@@ -102,8 +73,30 @@ class ChatHistoryListFragment : Fragment() {
             .sort("id", Sort.DESCENDING)
             .findAll()
 
-        val adapter = fragmentChatHistoryListBinding.recyclerView.adapter as ChatHistoryListAdapter
-        adapter.updateChatHistory(list)
+        val adapter = fragmentChatHistoryListBinding.recyclerView.adapter as? ChatHistoryListAdapter
+        if (adapter == null) {
+            val newAdapter = ChatHistoryListAdapter(requireContext(), list, this)
+            newAdapter.setChatHistoryItemClickListener(object : ChatHistoryListAdapter.ChatHistoryItemClickListener {
+                override fun onChatHistoryItemClicked(conversations: RealmList<Conversation>?, id: String, rev: String?) {
+                    conversations?.let { sharedViewModel.setSelectedChatHistory(it) }
+                    sharedViewModel.setSelected_id(id)
+                    rev?.let { sharedViewModel.setSelected_rev(it) }
+
+                    fragmentChatHistoryListBinding.slidingPaneLayout.openPane()
+                }
+            })
+            fragmentChatHistoryListBinding.recyclerView.adapter = newAdapter
+        } else {
+            adapter.updateChatHistory(list)
+            fragmentChatHistoryListBinding.searchBar.visibility = View.VISIBLE
+            fragmentChatHistoryListBinding.recyclerView.visibility = View.VISIBLE
+        }
+
+        showNoData(fragmentChatHistoryListBinding.noChats, list.size, "chatHistory")
+        if (list.isEmpty()) {
+            fragmentChatHistoryListBinding.searchBar.visibility = View.GONE
+            fragmentChatHistoryListBinding.recyclerView.visibility = View.GONE
+        }
     }
 }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -204,6 +204,13 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
         })
     }
 
+    fun refreshChatHistoryList() {
+        val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+        if (fragment is ChatHistoryListFragment) {
+            fragment.refreshChatHistoryList()
+        }
+    }
+
     private fun hideWifi() {
         val nav_Menu = activityDashboardBinding.appBarBell.bellToolbar.menu
         nav_Menu.findItem(R.id.menu_goOnline)

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -204,6 +204,13 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
         })
     }
 
+    fun refreshChatHistoryList() {
+        val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+        if (fragment is ChatHistoryListFragment) {
+            fragment.refreshChatHistoryList()
+        }
+    }
+
     private fun hideWifi() {
         val nav_Menu = activityDashboardBinding.appBarBell.bellToolbar.menu
         nav_Menu.findItem(R.id.menu_goOnline)