Fixed bugs

Author: niedev

.idea/misc.xml

@@ -254,8 +254,8 @@ public void onClick(View view) {
                 }*/
 
                 if(!text.isEmpty()) {
-                    CustomLocale firstLanguage = global.getFirstLanguage(true);
-                    CustomLocale secondLanguage = global.getSecondLanguage(true);
+                    CustomLocale firstLanguage = global.getFirstTextLanguage(true);
+                    CustomLocale secondLanguage = global.getSecondTextLanguage(true);
                     //we deactivate translate button
                     deactivateTranslationButton();
                     //we start the translation
@@ -457,8 +457,8 @@ public void onClick(View v) {
         invertLanguagesButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CustomLocale firstLanguage = global.getFirstLanguage(true);
-                CustomLocale secondLanguage = global.getSecondLanguage(true);
+                CustomLocale firstLanguage = global.getFirstTextLanguage(true);
+                CustomLocale secondLanguage = global.getSecondTextLanguage(true);
                 animator.animateSwitchLanguages(activity, firstLanguageSelector, secondLanguageSelector, invertLanguagesButton, new CustomAnimator.Listener() {
                     @Override
                     public void onAnimationEnd() {

app/src/main/java/nie/translator/rtranslator/voice_translation/_text_translation/TranslationFragment.java

@@ -4,6 +4,7 @@
 import android.os.Environment;
 
 import java.io.File;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 
@@ -27,9 +28,11 @@ public static void initializeService(){
 
     public static void loadModelIntoCache(Context context, CustomLocale lang) throws Exception{
         String langCode = lang.getLanguage();
-        String toEngCfg = modelConfigGeneration(context, langCode, ModelType.TO_ENGLISH);
-        String fromEngCfg = modelConfigGeneration(context, langCode, ModelType.FROM_ENGLISH);
-        loadModelIntoCacheNative(toEngCfg, fromEngCfg, langCode);
+        if(!Objects.equals(langCode, "en")) {
+            String toEngCfg = modelConfigGeneration(context, langCode, ModelType.TO_ENGLISH);
+            String fromEngCfg = modelConfigGeneration(context, langCode, ModelType.FROM_ENGLISH);
+            loadModelIntoCacheNative(toEngCfg, fromEngCfg, langCode);
+        }
     }
 
     public static void unloadModelFromCache(CustomLocale lang){

app/src/main/java/nie/translator/rtranslator/voice_translation/neural_networks/translation/BergamotTranslator.java

@@ -110,7 +110,8 @@ public class Translator extends NeuralNetworkApi {
             "fr",
             "de",
             "ko",
-            "ja"
+            "ja",
+            "en"
     };
 
 
@@ -491,12 +492,15 @@ public void loadMozillaModels(CustomLocale srcLang, CustomLocale trgLang, Global
                     }
                     //we load in bergamot translator the new models that are not already loaded
                     ArrayList<CustomLocale> allUniqueModels = bergamotModelsIndicator.getAllUniqueModels();
-                    if (!allUniqueModels.contains(srcLang)) {
+                    if (!allUniqueModels.contains(srcLang) && !srcLang.getLanguage().equals("en")) {
                         BergamotTranslator.loadModelIntoCache(global, srcLang);
                     }
+                    if (!allUniqueModels.contains(trgLang) && !trgLang.getLanguage().equals("en")) {
+                        BergamotTranslator.loadModelIntoCache(global, trgLang);
+                    }
                     //we update the indicator to reflect the new models status
-                    currentModeModels[0] = srcLang;
-                    currentModeModels[1] = trgLang;
+                    currentModeModels[0] = !srcLang.getLanguage().equals("en") ? srcLang : null;
+                    currentModeModels[1] = !trgLang.getLanguage().equals("en") ? trgLang : null;
                     //we notify the success of the loading
                     listener.onSuccess();
                 } catch (Exception e) {