Merge pull request #22 from lambiengcode/fix/crash-when-delete-conversation

Fix/crash when delete conversation

Author: lambiengcode

.idea/appInsightsSettings.xml

@@ -1,14 +1,9 @@
 package com.chatgptlite.wanted.data.remote
 
-import android.content.ContentValues
-import android.util.Log
 import com.chatgptlite.wanted.constants.conversationCollection
-import com.chatgptlite.wanted.helpers.DataHolder
 import com.chatgptlite.wanted.models.ConversationModel
-import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query
-import com.google.firebase.firestore.QuerySnapshot
 import kotlinx.coroutines.tasks.await
 import javax.inject.Inject
 
@@ -35,42 +30,18 @@ class ConversationRepositoryImpl @Inject constructor(
  }
 
  override suspend fun deleteConversation(conversationId: String) {
- var desiredKey: String? = null
-
- getFireBaseSnapShot().documents.map { documentSnapshot ->
- val id = documentSnapshot.getString("id")
- if (id == conversationId) {
- desiredKey = documentSnapshot.id
- } else {
- null
- }
- }
- DataHolder.docPath = desiredKey.toString()
-
- val docRef = fsInstance
+ fsInstance
  .collection("conversations")
- .document(DataHolder.docPath)
-
- // Remove the 'capital' field from the document
- val updates = hashMapOf<String, Any>(
- "id" to FieldValue.delete(),
- "title" to FieldValue.delete(),
- "createdAt" to FieldValue.delete()
- )
- docRef.update(updates)
- .addOnSuccessListener {
- Log.d(
- ContentValues.TAG,
- "DocumentSnapshot successfully deleted from message!"
- )
- }
- .addOnFailureListener { e ->
- Log.w(
- ContentValues.TAG,
- "Error deleting document", e
- )
+ .whereEqualTo("id", conversationId)
+ .get()
+ .addOnSuccessListener { res ->
+ res.documents.forEach { doc ->
+ // Use the collection and document ID to form the correct path
+ fsInstance.collection("conversations").document(doc.id).delete()
+ }
  }
  }
+
  private suspend fun getFireBaseSnapShot() =
  fsInstance.collection(conversationCollection)
  .orderBy("createdAt", Query.Direction.DESCENDING).get().await()

.idea/deploymentTargetDropDown.xml

@@ -14,7 +14,6 @@ import org.json.JSONObject
 import javax.inject.Inject
 
 
-@Suppress("UNREACHABLE_CODE")
 class OpenAIRepositoryImpl @Inject constructor(
  private val openAIApi: OpenAIApi,
 ) : OpenAIRepository {

.idea/gradle.xml

@@ -2,12 +2,19 @@ package com.chatgptlite.wanted.models
 
 enum class GPTModel(val model: String, val maxTokens: Int, val isChatCompletion: Boolean = false) {
  gpt4("gpt-4", 8192, isChatCompletion = true),
- gpt4v0613("gpt-4-0613", 8192, isChatCompletion = true),
- gpt4p32k("gpt-4-32k", 32768, isChatCompletion = true),
- gpt4p32kv0613("gpt-4-32k-0613", 32768, isChatCompletion = true),
+ gpt4o("gpt-4o", 4096, isChatCompletion = true),
+ gpt4o20240513("gpt-4o-2024-05-13", 4096, isChatCompletion = true),
+ gpt4turbo("gpt-4-turbo-2024-04-09", 4096, isChatCompletion = true),
+ gpt4turbopreview("gpt-4-turbo-preview", 4096, isChatCompletion = true),
+ gpt41106preview("gpt-4-1106-preview", 4096, isChatCompletion = true),
  gpt35Turbo("gpt-3.5-turbo", 4096),
- davinci("text-davinci-003", 4096),
- curie("text-curie-001", 2048),
- babbage("text-babbage-001", 2048),
- ada("text-ada-001", 2048)
+
+ // Deprecated
+// gpt4v0613("gpt-4-0613", 8192, isChatCompletion = true),
+// gpt4p32k("gpt-4-32k", 32768, isChatCompletion = true),
+// gpt4p32kv0613("gpt-4-32k-0613", 32768, isChatCompletion = true),
+// davinci("text-davinci-003", 4096),
+// curie("text-curie-001", 2048),
+// babbage("text-babbage-001", 2048),
+// ada("text-ada-001", 2048)
 }

.idea/migrations.xml

@@ -24,6 +24,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material.icons.outlined.AddComment
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Message
 import androidx.compose.material3.Divider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -69,14 +71,9 @@ fun AppDrawer(
  onNewChatClicked = onNewChatClicked,
  onIconClicked = onIconClicked,
  conversationViewModel = { conversationViewModel.newConversation() },
- deleteConversation = { text ->
+ deleteConversation = { conversationId ->
  coroutineScope.launch {
- conversationViewModel.deleteConversation(text)
- }
- },
- deleteMessages = { text ->
- coroutineScope.launch {
- conversationViewModel.deleteMessages(text)
+ conversationViewModel.deleteConversation(conversationId)
  }
  },
  onConversation = { conversationModel: ConversationModel ->
@@ -95,7 +92,6 @@ private fun AppDrawerIn(
  onIconClicked: () -> Unit,
  conversationViewModel: () -> Unit,
  deleteConversation: (String) -> Unit,
- deleteMessages: (String) -> Unit,
  onConversation: (ConversationModel) -> Unit,
  currentConversationState: String,
  conversationState: MutableList<ConversationModel>,
@@ -119,7 +115,6 @@ private fun AppDrawerIn(
  onChatClicked,
  deleteConversation,
  onConversation,
- deleteMessages,
  currentConversationState,
  conversationState
  )
@@ -191,7 +186,6 @@ private fun ColumnScope.HistoryConversations(
  onChatClicked: (String) -> Unit,
  deleteConversation: (String) -> Unit,
  onConversation: (ConversationModel) -> Unit,
- deleteMessages: (String) -> Unit,
  currentConversationState: String,
  conversationState: List<ConversationModel>
 ) {
@@ -217,7 +211,6 @@ private fun ColumnScope.HistoryConversations(
  onDeleteClicked = {
  scope.launch {
  deleteConversation(conversationState[index].id)
- deleteMessages(conversationState[index].id)
  }
  }
  )
@@ -308,7 +301,7 @@ private fun RecycleChatItem(
  modifier = Modifier
  .height(56.dp)
  .fillMaxWidth()
- .padding(horizontal = 34.dp)
+ .padding(horizontal = 30.dp)
  .clip(CircleShape)
  .then(background)
  .clickable(onClick = onChatClicked),
@@ -343,14 +336,16 @@ private fun RecycleChatItem(
  )
  Spacer(Modifier.weight(0.9f, true))
  Icon(
- imageVector = Icons.Filled.Delete,
+ imageVector = Icons.Outlined.Delete,
  contentDescription = "Delete",
  tint = if (selected) {
  MaterialTheme.colorScheme.primary
  } else {
  MaterialTheme.colorScheme.onSurface
  },
- modifier = Modifier.clickable { onDeleteClicked() }
+ modifier = Modifier.padding(
+ end = 12.dp
+ ).clickable { onDeleteClicked() }
  )
  }
 }
@@ -406,7 +401,6 @@ fun PreviewAppDrawerIn(
  onIconClicked = {},
  conversationViewModel = {},
  deleteConversation = {},
- deleteMessages = {},
  conversationState = mutableListOf(),
  currentConversationState = String(),
  onConversation = { _: ConversationModel -> }

.idea/vcs.xml

@@ -181,21 +181,20 @@ class ConversationViewModel @Inject constructor(
  return response.toList()
  }
 
- fun deleteMessages(conversationId: String) {
+ suspend fun deleteConversation(conversationId: String) {
+ // Delete remote
+ conversationRepo.deleteConversation(conversationId)
 
+ // Delete local
  val conversations: MutableList<ConversationModel> = _conversations.value.toMutableList()
  val conversationToRemove = conversations.find { it.id == conversationId }
 
  if (conversationToRemove != null) {
  conversations.remove(conversationToRemove)
  _conversations.value = conversations
  }
- messageRepo.deleteMessage()
  }
 
- suspend fun deleteConversation(conversationId: String) =
- conversationRepo.deleteConversation(conversationId)
-
  private suspend fun fetchMessages() {
  if (_currentConversation.value.isEmpty() ||
  _messages.value[_currentConversation.value] != null) return