Fix issue on overwrite a problem

geckour · geckour · commit b5c875fa101c · 2019-02-25T06:53:54.000+09:00
diff --git a/app/src/main/java/com/geckour/lopicmaker/ui/main/edit/EditorFragment.kt b/app/src/main/java/com/geckour/lopicmaker/ui/main/edit/EditorFragment.kt
@@ -9,15 +9,13 @@ import android.util.Size
 import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProviders
-import com.geckour.lopicmaker.App
 import com.geckour.lopicmaker.R
 import com.geckour.lopicmaker.databinding.FragmentEditorBinding
 import com.geckour.lopicmaker.ui.main.MainViewModel
 import com.geckour.lopicmaker.util.Algorithm
 import com.geckour.lopicmaker.util.MyAlertDialogFragment
 import com.geckour.lopicmaker.util.observe
 import timber.log.Timber
-import java.sql.Timestamp
 
 class EditorFragment : Fragment(), MyAlertDialogFragment.DialogListener {
 
@@ -232,24 +230,7 @@ class EditorFragment : Fragment(), MyAlertDialogFragment.DialogListener {
             MyAlertDialogFragment.RequestCode.CONFIRM_BEFORE_SAVE -> {
                 (result as? String)?.apply {
                     if (this.isNotEmpty()) {
-                        val metadata: MyAlertDialogFragment.ProblemMetadata? =
-                            try {
-                                App.gson.fromJson(this, MyAlertDialogFragment.ProblemMetadata::class.java)
-                            } catch (e: Exception) {
-                                Timber.e(e)
-                                null
-                            }
-                        viewModel.problem.value?.also { problem ->
-                            problem.draft =
-                                viewModel.satisfactionState.value !=
-                                        Algorithm.SatisfactionState.Satisfiable
-                            problem.editedAt = Timestamp(System.currentTimeMillis())
-                            metadata?.let {
-                                problem.title = it.title
-                                problem.tags = it.tags
-                            }
-                            viewModel.overwriteProblem(requireContext(), problem)
-                        }
+                        viewModel.overwriteProblem(requireContext(), this)
                     }
                 } ?: viewModel.snackbarStringResId.postValue(R.string.editor_fragment_error_invalid_title)
             }
diff --git a/app/src/main/java/com/geckour/lopicmaker/ui/main/edit/EditorViewModel.kt b/app/src/main/java/com/geckour/lopicmaker/ui/main/edit/EditorViewModel.kt
@@ -20,6 +20,7 @@ import com.geckour.lopicmaker.util.SingleLiveEvent
 import com.geckour.lopicmaker.util.fromJson
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import java.sql.Timestamp
 import java.util.concurrent.TimeoutException
 
 class EditorViewModel : ViewModel() {
@@ -87,15 +88,37 @@ class EditorViewModel : ViewModel() {
         }
     }
 
-    internal fun overwriteProblem(context: Context, problem: Problem) {
-        try {
-            viewModelScope.launch {
-                problem.upsert(DB.getInstance(context))
-                snackbarStringResId.postValue(R.string.editor_fragment_message_complete_save)
+    internal fun overwriteProblem(context: Context, data: String) {
+        problem.value?.apply {
+            try {
+                viewModelScope.launch {
+                    val metadata: MyAlertDialogFragment.ProblemMetadata? =
+                        try {
+                            App.gson.fromJson(data)
+                        } catch (e: Exception) {
+                            Timber.e(e)
+                            null
+                        }
+                    this@apply.draft =
+                        satisfactionState.value !=
+                                Algorithm.SatisfactionState.Satisfiable
+                    this@apply.editedAt = Timestamp(System.currentTimeMillis())
+                    this@apply.thumb = nonNullAlgorithm.getThumbnailImage()
+                    metadata?.let {
+                        this@apply.title = it.title
+                        this@apply.tags = it.tags
+                    }
+                    problem.postValue(this@apply)
+                    val result = this@apply.upsert(DB.getInstance(context))
+                    snackbarStringResId.postValue(
+                        if (result > -1) R.string.editor_fragment_message_complete_save
+                        else R.string.editor_fragment_error_failure_save
+                    )
+                }
+            } catch (t: Throwable) {
+                Timber.e(t)
+                snackbarStringResId.postValue(R.string.editor_fragment_error_failure_save)
             }
-        } catch (t: Throwable) {
-            Timber.e(t)
-            snackbarStringResId.postValue(R.string.editor_fragment_error_failure_save)
         }
     }
 
