Check the TTS file before putting and after getting

Author: DeweyReed

app-tts/src/main/java/com/github/deweyreed/timer/app/tts/TtsBakeryDiskCache.kt

@@ -1,6 +1,7 @@
 package com.github.deweyreed.timer.app.tts
 
 import android.content.Context
+import android.media.MediaMetadataRetriever
 import com.bumptech.glide.disklrucache.DiskLruCache
 import timber.log.Timber
 import java.io.File
@@ -30,10 +31,29 @@ internal object TtsBakeryDiskCache {
         } catch (e: IOException) {
             Timber.e(e)
         }
+        if (result != null && !isValidTtsFile(result)) {
+            delete(context, text)
+            result = null
+        }
         return result
     }
 
+    private fun isValidTtsFile(file: File): Boolean {
+        return try {
+            val retriever = MediaMetadataRetriever()
+            retriever.setDataSource(file.canonicalPath)
+            retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO) != null
+        } catch (_: Exception) {
+            false
+        }
+    }
+
     fun put(context: Context, text: String, file: File): Unit = synchronized(this) {
+        if (!isValidTtsFile(file)) {
+            file.delete()
+            error("Invalid TTS file")
+        }
+
         val key = getSpeechKey(text)
         try {
             val editor = getDiskLruCache(context).edit(key)
@@ -46,12 +66,21 @@ internal object TtsBakeryDiskCache {
                 editor.abortUnlessCommitted()
             }
         } catch (e: IOException) {
-            e.printStackTrace()
+            Timber.e(e)
         } finally {
             file.delete()
         }
     }
 
+    private fun delete(context: Context, text: String) {
+        val key = getSpeechKey(text)
+        try {
+            getDiskLruCache(context).remove(key)
+        } catch (e: IOException) {
+            Timber.e(e)
+        }
+    }
+
     // From Glide SafeKeyGenerator
     private fun getSpeechKey(text: String): String {
         val messageDigest = MessageDigest.getInstance("SHA-256")

app-tts/src/main/java/com/github/deweyreed/timer/app/tts/TtsBakeryWorker.kt

@@ -1,7 +1,6 @@
 package com.github.deweyreed.timer.app.tts
 
 import android.content.Context
-import android.media.MediaMetadataRetriever
 import android.os.Bundle
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
@@ -79,26 +78,9 @@ internal class TtsBakeryWorker @AssistedInject constructor(
         }
         val file = File(folder, UUID.randomUUID().toString())
         textToSpeech.synthesizeToFile(text, file)
-
-        if (!isValidTtsFile(file)) {
-            if (file.exists()) {
-                file.delete()
-            }
-            error("Invalid speech file")
-        }
         TtsBakeryDiskCache.put(applicationContext, text, file)
     }
 
-    private fun isValidTtsFile(file: File): Boolean {
-        return try {
-            val retriever = MediaMetadataRetriever()
-            retriever.setDataSource(file.canonicalPath)
-            retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO) != null
-        } catch (_: Exception) {
-            false
-        }
-    }
-
     companion object {
         private const val EXTRA_TEXT = "text"