Fix Settings so that translator reloads when changed

Exaeta · Jul 26, 2014 · d6fb5f3 · d6fb5f3
1 parent 2f59c1b
commit d6fb5f3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/main/java/com/brentandjody/stenoime/SettingsActivity.java b/main/java/com/brentandjody/stenoime/SettingsActivity.java
@@ -20,7 +20,7 @@
  */
 public class SettingsActivity extends PreferenceActivity {
 
-    private static final String TAG = "StenoIME";
+    private static final String TAG = SettingsActivity.class.getSimpleName();
     private static final int SELECT_DICTIONARY_CODE = 4;
     private static final int PURCHASE_REQUEST_CODE = 20201;
     private static final String PAYLOAD = "jOOnnqldcn20p843nKK;nNl";
@@ -79,14 +79,16 @@ public boolean onPreferenceClick(Preference preference) {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 ListPreference translator = (ListPreference) preference;
-                translator.setValue(newValue.toString());
                 translator.setSummary(translator.getEntry());
                 Translator.TYPE tType = Translator.TYPE.values()[Integer.parseInt(newValue.toString())];
                 App.setTranslatorType(tType);
-                return false;
+                Log.d(TAG, "Setting translator type:"+tType);
+                findPreference(StenoApp.KEY_OPTIMIZER_ENABLED).setEnabled(!newValue.equals("0"));
+                return true;
             }
         });
         SwitchPreference optimizer = (SwitchPreference) findPreference(StenoApp.KEY_OPTIMIZER_ENABLED);
+        optimizer.setEnabled(!(translator.getValue().equals("0")));
         optimizer.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {

diff --git a/main/java/com/brentandjody/stenoime/StenoApp.java b/main/java/com/brentandjody/stenoime/StenoApp.java
@@ -25,7 +25,7 @@
 public class StenoApp extends Application {
 
     public static final String DELIMITER = ":";
-    public static final String TAG = "Steno Keyboard";
+    public static final String TAG = StenoApp.class.getSimpleName();
 
     public static final String KEY_DICTIONARIES = "dictionaries";
     public static final String KEY_DICTIONARY_SIZE = "dictionary_size";
@@ -136,22 +136,24 @@ public Dictionary getDictionary(Dictionary.OnDictionaryLoadedListener listener)
         // if dictionary is empty, load it - otherwise just return it
         // if listener is null, don't reset it (use last registered listener)
         if ((!isDictionaryLoaded()) && (!mDictionary.isLoading()) ) {
-            if (listener != null) {
-                mDictionary.setOnDictionaryLoadedListener(listener);
-            } else {
-                Log.w(TAG, "Dictionary callback is null");
-            }
             int size = prefs.getInt(KEY_DICTIONARY_SIZE, 100000);
             mDictionary.load(getDictionaryNames(), getAssets(), size);
-
         }
+        if (listener != null) {
+            mDictionary.setOnDictionaryLoadedListener(listener);
+        } else {
+            Log.w(TAG, "Dictionary callback is null");
+        }
+
         return mDictionary;
     }
 
     public void unloadDictionary() {
-        Log.d(TAG, "Unloading Dictionary");
-        mDictionary.clear();
-        mDictionary = new Dictionary(getApplicationContext());
+        if (mDictionary!=null) {
+            Log.d(TAG, "Unloading Dictionary");
+            mDictionary.clear();
+            mDictionary = new Dictionary(getApplicationContext());
+        }
     }
 
     public String[] getDictionaryNames() {

diff --git a/main/java/com/brentandjody/stenoime/StenoIME.java b/main/java/com/brentandjody/stenoime/StenoIME.java
@@ -145,6 +145,7 @@ public void onStartInput(EditorInfo attribute, boolean restarting) {
             removeVirtualKeyboard();
         } else {
             initializeMachine();
+            initializeTranslator();
             initializePreview();
             if (mTranslator!= null) {
                 if (mTranslator.usesDictionary())
@@ -480,11 +481,20 @@ private void initializePreview() {
     private void initializeTranslator() {
         Log.d(TAG, "initializeTranslator()");
         switch (App.getTranslatorType()) {
-            case RawStrokes: mTranslator = new RawStrokeTranslator();
+            case RawStrokes:
+                if (mTranslator!=null && mTranslator.usesDictionary()) {//if old translator used dictionary, unload it
+                    Log.d(TAG, "Unloading unused dictionary");
+                    App.unloadDictionary();
+                }
+                if (! (mTranslator instanceof RawStrokeTranslator)) {
+                    mTranslator = new RawStrokeTranslator();
+                }
                 break;
             case SimpleDictionary:
-                mTranslator = new SimpleTranslator(getApplicationContext());
-                ((SimpleTranslator) mTranslator).setDictionary(App.getDictionary(this));
+                if (! (mTranslator instanceof SimpleTranslator)) {
+                    mTranslator = new SimpleTranslator(getApplicationContext());
+                }
+                ((SimpleTranslator) mTranslator).setDictionary(App.getDictionary(StenoIME.this));
                 break;
         }
     }