mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: fix crash when opening settings on pre-7 devices (#1483)

Browse Source
This commit is contained in:
Alexander Epaneshnikov
2022-11-02 21:55:35 +03:00
committed by GitHub
parent 94e0024bf4 d3ae703e60
commit d88fa7f6b6
4 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/com/reecedunn/espeak/TtsSettingsActivity.java
+5 -3
View File
@@ -44,9 +44,11 @@ public class TtsSettingsActivity extends PreferenceActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected ();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
{
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected ();
}
// Migrate old eyes-free settings to the new settings:
storageContext = EspeakApp.getStorageContext();
android/src/com/reecedunn/espeak/preference/SeekBarPreference.java
+6 -2
View File
@@ -20,6 +20,7 @@ package com.reecedunn.espeak.preference;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.DialogPreference;
import android.preference.PreferenceManager;
import android.util.AttributeSet;
@@ -115,8 +116,11 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
String text = Integer.toString(mProgress);
callChangeListener(text);
if (shouldCommit()) {
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected ();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
{
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected ();
}
SharedPreferences.Editor editor = getEditor();
editor.putString(getKey(), text);
editor.commit();
android/src/com/reecedunn/espeak/preference/SpeakPunctuationPreference.java
+6 -2
View File
@@ -20,6 +20,7 @@ package com.reecedunn.espeak.preference;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.DialogPreference;
import android.preference.PreferenceManager;
import android.text.Editable;
@@ -130,8 +131,11 @@ public class SpeakPunctuationPreference extends DialogPreference {
onDataChanged(level, characters);
if (shouldCommit()) {
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
{
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected ();
}
SharedPreferences.Editor editor = getEditor();
if (editor != null) {
editor.putString(VoiceSettings.PREF_PUNCTUATION_CHARACTERS, characters);
android/src/com/reecedunn/espeak/preference/VoiceVariantPreference.java
+6 -2
View File
@@ -21,6 +21,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.DialogPreference;
import android.preference.PreferenceManager;
import android.util.AttributeSet;
@@ -330,8 +331,11 @@ public class VoiceVariantPreference extends DialogPreference {
case DialogInterface.BUTTON_POSITIVE:
onDataChanged();
if (shouldCommit()) {
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
{
PreferenceManager preferenceManager = getPreferenceManager();
preferenceManager.setStorageDeviceProtected ();
}
SharedPreferences.Editor editor = getEditor();
if (editor != null) {
VoiceVariant variant = variants[mCategoryIndex][mVariantIndex].getVariant();