Improved JavaScript TTS initialization process

mikunimaru · mikunimaru · commit a9a80afcae04 · 2021-07-07T21:01:37.000+09:00
Fixed a problem that null may be passed
as an argument when initializing JavaScriptTTS.
Changed to refer to context from within the class
instead of the argument when initializing JavaScriptTTS.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java
@@ -393,7 +393,7 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity i
     private boolean mFocusTypeAnswer;
 
     /** Text to speech */
-    private JavaScriptTTS mTalker = new JavaScriptTTS(AbstractFlashcardViewer.this);
+    private JavaScriptTTS mTalker = new JavaScriptTTS();
 
     // ----------------------------------------------------------------------------
     // LISTENERS
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/JavaScriptTTS.java b/AnkiDroid/src/main/java/com/ichi2/anki/JavaScriptTTS.java
@@ -38,7 +38,8 @@ public class JavaScriptTTS implements TextToSpeech.OnInitListener {
     private static boolean mTtsOk;
     private static final Bundle mTtsParams = new Bundle();
 
-    JavaScriptTTS(Context context) {
+    JavaScriptTTS() {
+        Context mContext = AnkiDroidApp.getInstance().getApplicationContext();
         mTts = new TextToSpeech(context, this);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ public class JavaScriptTTS implements TextToSpeech.OnInitListener {`
`38`	`38`	`private static boolean mTtsOk;`
`39`	`39`	`private static final Bundle mTtsParams = new Bundle();`
`40`	`40`
`41`		`- JavaScriptTTS(Context context) {`
	`41`	`+ JavaScriptTTS() {`
	`42`	`+ Context mContext = AnkiDroidApp.getInstance().getApplicationContext();`
`42`	`43`	`mTts = new TextToSpeech(context, this);`
`43`	`44`	`}`
`44`	`45`