Fixed messages deletion when get error, fixed Crossfade, fixed error …

…handling
F0x1d · Apr 27, 2023 · e2f07dd · e2f07dd
1 parent e169565
commit e2f07dd
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.f0x1d.sense"
         minSdk 23
         targetSdk 33
-        versionCode 6
-        versionName "1.0.5"
+        versionCode 7
+        versionName "1.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/f0x1d/sense/OpenAIApplication.kt b/app/src/main/java/com/f0x1d/sense/OpenAIApplication.kt
@@ -22,7 +22,10 @@ class OpenAIApplication: Application() {
         super.onCreate()
 
         applicationScope.launch(Dispatchers.IO) {
-            database.messagesDao().markAllAsNotGenerating() // maybe some geniuses will remove app from recents
+            database.messagesDao().apply {
+                markAllAsNotGenerating()
+                deleteEmptyMessages()
+            } // maybe some geniuses will remove app from recents
         }
     }
 }
diff --git a/app/src/main/java/com/f0x1d/sense/database/dao/MessagesDao.kt b/app/src/main/java/com/f0x1d/sense/database/dao/MessagesDao.kt
@@ -21,6 +21,12 @@ interface MessagesDao {
     @Query("UPDATE ChatMessage SET generating = 0 WHERE generating = 1 AND chat_id = :chatId")
     suspend fun markAllAsNotGeneratingInChat(chatId: Long)
 
+    @Query("DELETE FROM ChatMessage WHERE content is NULL AND chat_id = :chatId")
+    suspend fun deleteEmptyMessagesInChat(chatId: Long)
+
     @Query("UPDATE ChatMessage SET generating = 0 WHERE generating = 1")
     suspend fun markAllAsNotGenerating()
+
+    @Query("DELETE FROM ChatMessage WHERE content is NULL")
+    suspend fun deleteEmptyMessages()
 }
diff --git a/app/src/main/java/com/f0x1d/sense/repository/network/OpenAIRepository.kt b/app/src/main/java/com/f0x1d/sense/repository/network/OpenAIRepository.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.isActive
+import retrofit2.HttpException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -45,7 +46,11 @@ class OpenAIRepository @Inject constructor(
             )
         ).execute()
 
-        val reader = response.body()?.byteStream()?.bufferedReader() ?: throw Exception()
+        if (response.errorBody() != null) {
+            throw HttpException(response)
+        }
+
+        val reader = response.body()?.byteStream()?.bufferedReader() ?: throw Exception("null stream")
         try {
             val contents = mutableMapOf<Int, String>()
             while (currentCoroutineContext().isActive) {

diff --git a/app/src/main/java/com/f0x1d/sense/ui/activity/MainActivity.kt b/app/src/main/java/com/f0x1d/sense/ui/activity/MainActivity.kt
@@ -43,10 +43,10 @@ class MainActivity: ComponentActivity() {
         setContent {
             OpenAITheme {
                 Surface(modifier = Modifier.imePadding()) {
-                    val apiKey by viewModel.apiKey.collectAsStateWithLifecycle(initialValue = "")
+                    val openSetup by viewModel.shouldOpenSetup.collectAsStateWithLifecycle(initialValue = false)
 
-                    Crossfade(targetState = apiKey) {
-                        if (it == null) {
+                    Crossfade(targetState = openSetup) {
+                        if (it) {
                             SetupScreen()
                         } else {
                             val navController = rememberNavController()

diff --git a/app/src/main/java/com/f0x1d/sense/ui/screen/SettingsScreen.kt b/app/src/main/java/com/f0x1d/sense/ui/screen/SettingsScreen.kt
@@ -41,13 +41,13 @@ fun SettingsScreen(navController: NavController) {
         ) {
             Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
                 SettingsTextField(
-                    value = apiKey ?: "",
+                    value = apiKey,
                     onValueChange = { viewModel.updateFor(viewModel.apiKey, it) },
                     labelResource = R.string.api_key
                 )
 
                 SettingsTextField(
-                    value = model ?: "",
+                    value = model,
                     onValueChange = { viewModel.updateFor(viewModel.model, it) },
                     labelResource = R.string.model
                 )

diff --git a/app/src/main/java/com/f0x1d/sense/viewmodel/ChatViewModel.kt b/app/src/main/java/com/f0x1d/sense/viewmodel/ChatViewModel.kt
@@ -88,7 +88,10 @@ class ChatViewModel @AssistedInject constructor(
             responseMessages.values.map { it.copy(generating = false) }
         )
     }) {
-        database.messagesDao().markAllAsNotGeneratingInChat(chatId)
+        database.messagesDao().apply {
+            markAllAsNotGeneratingInChat(chatId)
+            deleteEmptyMessagesInChat(chatId)
+        }
     }
 }
 

diff --git a/app/src/main/java/com/f0x1d/sense/viewmodel/MainViewModel.kt b/app/src/main/java/com/f0x1d/sense/viewmodel/MainViewModel.kt
@@ -4,12 +4,16 @@ import android.app.Application
 import com.f0x1d.sense.store.datastore.SettingsDataStore
 import com.f0x1d.sense.viewmodel.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 @HiltViewModel
 class MainViewModel @Inject constructor(
     application: Application,
     private val settingsDataStore: SettingsDataStore
 ): BaseViewModel(application) {
-    val apiKey = settingsDataStore.apiKey
+    val shouldOpenSetup = settingsDataStore.apiKey.map {
+        it == null
+    }.distinctUntilChanged()
 }