From 7570253b95d23fdb304437db0ed6049ced2a2ea0 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Wed, 8 May 2013 12:27:16 +0100
Subject: [PATCH] Do not attempt an install in CheckVoiceData.

The android.speech.tts.engine.CHECK_TTS_DATA intent should just
check that the TTS data is OK. It should not attempt a
download/install of the TTS data.
---
 .../com/reecedunn/espeak/CheckVoiceData.java  | 35 ++-----------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/android/src/com/reecedunn/espeak/CheckVoiceData.java b/android/src/com/reecedunn/espeak/CheckVoiceData.java
index f16be7ea..02ae4940 100755
--- a/android/src/com/reecedunn/espeak/CheckVoiceData.java
+++ b/android/src/com/reecedunn/espeak/CheckVoiceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Reece H. Dunn
+ * Copyright (C) 2012-2013 Reece H. Dunn
  * Copyright (C) 2009 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,8 +48,6 @@ import java.util.Set;
 public class CheckVoiceData extends Activity {
     private static final String TAG = "eSpeakTTS";
 
-    private static final int REQUEST_DOWNLOAD = 1;
-
     /** Resources required for eSpeak to run correctly. */
     private static final String[] BASE_RESOURCES = {
         "version",
@@ -104,33 +102,15 @@ public class CheckVoiceData extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        checkForVoices(false);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-            case REQUEST_DOWNLOAD:
-                checkForVoices(true);
-                break;
-        }
-    }
-
-    private void checkForVoices(boolean attemptedInstall) {
         final File dataPath = getDataPath(this);
 
         ArrayList<String> availableLanguages = new ArrayList<String>();
         ArrayList<String> unavailableLanguages = new ArrayList<String>();
 
         if (!hasBaseResources(this) || canUpgradeResources(this)) {
-            if (!attemptedInstall) {
-                downloadVoiceData();
-                return;
-            }
-            // No base resource, can't load available voices.
             unavailableLanguages.add(Locale.ENGLISH.toString());
             returnResults(Engine.CHECK_VOICE_DATA_MISSING_DATA, dataPath, availableLanguages,
-                    unavailableLanguages);
+                          unavailableLanguages);
             return;
         }
 
@@ -152,16 +132,7 @@ public class CheckVoiceData extends Activity {
         }
 
         returnResults(Engine.CHECK_VOICE_DATA_PASS, dataPath, availableLanguages,
-                unavailableLanguages);
-    }
-
-    /**
-     * Launches the voice data installer.
-     */
-    private void downloadVoiceData() {
-        final Intent checkIntent = new Intent(this, DownloadVoiceData.class);
-
-        startActivityForResult(checkIntent, REQUEST_DOWNLOAD);
+                      unavailableLanguages);
     }
 
     private void returnResults(int result, File dataPath, ArrayList<String> availableLanguages,