Merge branch 'master' of https://github.com/espeak-ng/espeak-ng

.gitignore

@@ -29,6 +29,10 @@ local.properties
 
 # android gradle output:
 
+gradle/
+gradlew
+gradlew.bat
+
 .gradle/
 .idea/
 build/

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) {

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;