@@ -9,6 +9,7 @@ import android.net.Uri
99import android.os.Build
1010import android.os.Build.VERSION_CODES
1111import android.os.Bundle
12+ import android.text.Html
1213import android.util.Log
1314import android.view.ActionMode
1415import android.view.LayoutInflater
@@ -109,7 +110,6 @@ class MainActivity : AppCompatActivity() {
109110 .setMessage( getString(R .string.app_error_invalid_certificate_message))
110111 .setPositiveButton(android.R .string.ok, null )
111112 .show()
112- finishAndRemoveTask() // be sure to end the application
113113 return
114114 }
115115
@@ -160,6 +160,18 @@ class MainActivity : AppCompatActivity() {
160160 }
161161 }
162162
163+ try {
164+ // Dummy check to verify handwriting generation resource and proper certificate.
165+ val generationViewModel = this .generationViewModel
166+ } catch (e: IllegalStateException ) {
167+ AlertDialog .Builder (this )
168+ .setTitle(getString(R .string.app_error_missing_resource_title))
169+ .setMessage(Html .fromHtml(getString(R .string.app_error_missing_resource_message)))
170+ .setPositiveButton(android.R .string.ok, null )
171+ .show()
172+ return
173+ }
174+
163175 generationViewModel.hwrResults.observe(this ) { hwrResults ->
164176 if (hwrResults.isNotEmpty()) {
165177 editorViewModel.write(hwrResults.last().events)
@@ -209,7 +221,7 @@ class MainActivity : AppCompatActivity() {
209221 val canUndo = editorViewModel.partHistoryState.value?.canUndo ? : false
210222 val canRedo = editorViewModel.partHistoryState.value?.canRedo ? : false
211223 val isWriting = editorViewModel.isWriting.value ? : false
212- val isProfileBuilding = generationViewModel.isProfileBuilding.value ? : false
224+ val isProfileBuilding = try { generationViewModel.isProfileBuilding.value } catch (e : Exception ) { false } ? : false
213225 val isEditorEmpty = editorViewModel.isEmpty()
214226
215227 menu?.findItem(R .id.editor_menu_undo)?.isEnabled = ! isProfileBuilding && ! isWriting && canUndo
0 commit comments