Merge pull request #284 from martenrebane/MOPPAND-933

Fixed accessibility crash on startup

Author: kristelmerilain

app/src/main/java/ee/ria/DigiDoc/android/main/home/HomeMenuView.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.speech.tts.TextToSpeech;
+import android.speech.tts.Voice;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -13,6 +14,7 @@
 import androidx.core.widget.NestedScrollView;
 
 import java.util.Locale;
+import java.util.Set;
 
 import ee.ria.DigiDoc.R;
 import ee.ria.DigiDoc.common.TextUtil;
@@ -38,8 +40,16 @@ public final class HomeMenuView extends NestedScrollView {
             new TextToSpeech.OnInitListener() {
         @Override
         public void onInit(int status) {
-            Locale accessibilityLocale = textToSpeech.getVoice().getLocale();
-            if (accessibilityLocale.getLanguage().equals("et")) {
+            Voice textToSpeechVoice = textToSpeech.getVoice();
+            String language = Locale.getDefault().getLanguage();
+            boolean isESTLanguageAvailable = isTextToSpeechLanguageAvailable(textToSpeech.getAvailableLanguages(),
+                    Set.of(new Locale("est", "EST"), new Locale("et", "ET")));
+            if ((textToSpeechVoice == null && isESTLanguageAvailable) ||
+                    (textToSpeechVoice != null &&
+                            textToSpeechVoice.getLocale().getLanguage().equals("et"))) {
+                language = "et";
+            }
+            if (language.equals("et")) {
                 helpView.setContentDescription(
                         getResources().getString(R.string.main_home_menu_help) +
                                 " link " +
@@ -114,4 +124,10 @@ public void locale(@Nullable Integer locale) {
     public Observable<Integer> localeChecks() {
         return checkedChanges(localeView).skipInitialValue();
     }
+
+    private boolean isTextToSpeechLanguageAvailable(Set<Locale> availableLocales, Set<Locale> locales) {
+        return locales.stream().anyMatch(lo ->
+                availableLocales.stream().anyMatch(al -> al.getLanguage().equals(lo.getLanguage()))
+        );
+    }
 }

gradle.properties

@@ -1,5 +1,5 @@
-appVersionCode=39
-appVersionName=2.4.5
+appVersionCode=40
+appVersionName=2.4.6
 
 appAbiFilters=arm64-v8a;armeabi-v7a;x86;x86_64