From 690bb8b7d24e09e07eb1aa23791784923185c09c Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 15 Jan 2017 18:12:22 +0000 Subject: [PATCH 1/2] Ignore any present gradle wrapper. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 2c1fc894..1be463cd 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,10 @@ local.properties # android gradle output: +gradle/ +gradlew +gradlew.bat + .gradle/ .idea/ build/ From d1c56e6120deeb768f481599bd6313bb9e476b23 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 15 Jan 2017 18:13:27 +0000 Subject: [PATCH 2/2] Android: Fix installing the voices -- use the new espeak-ng-data path. --- android/src/com/reecedunn/espeak/CheckVoiceData.java | 2 +- android/src/com/reecedunn/espeak/DownloadVoiceData.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/com/reecedunn/espeak/CheckVoiceData.java b/android/src/com/reecedunn/espeak/CheckVoiceData.java index bf83eb83..379f337a 100755 --- a/android/src/com/reecedunn/espeak/CheckVoiceData.java +++ b/android/src/com/reecedunn/espeak/CheckVoiceData.java @@ -51,7 +51,7 @@ public class CheckVoiceData extends Activity { }; public static File getDataPath(Context context) { - return new File(context.getDir("voices", MODE_PRIVATE), "espeak-data"); + return new File(context.getDir("voices", MODE_PRIVATE), "espeak-ng-data"); } public static boolean hasBaseResources(Context context) { diff --git a/android/src/com/reecedunn/espeak/DownloadVoiceData.java b/android/src/com/reecedunn/espeak/DownloadVoiceData.java index 48ee1ead..54183902 100755 --- a/android/src/com/reecedunn/espeak/DownloadVoiceData.java +++ b/android/src/com/reecedunn/espeak/DownloadVoiceData.java @@ -153,7 +153,7 @@ public class DownloadVoiceData extends Activity { } final String version = FileUtils.read(mContext.getResources().openRawResource(R.raw.espeakdata_version)); - final File outputFile = new File(mOutput, "espeak-data/version"); + final File outputFile = new File(mOutput, "espeak-ng-data/version"); FileUtils.write(outputFile, version); return RESULT_OK;