Removed font stuff, added notes. Added language names to what's new.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index e1c4c707d1d0d0d380b5771cedeade170e5b2bb5..f526cb9eebbd46b0d09cde37c042a8459b441a28 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -248,15 +248,8 @@ public class DictionaryActivity extends ListActivity {
     }).start();\r
     \r
     \r
-    final int fontWorkAround = prefs.getInt(C.FONT_WORKAROUND, 1);\r
-    if (fontWorkAround == 0) {\r
-      Log.w(LOG, "Loading font seemed to fail last time, trying with default font.");\r
-      Toast.makeText(this, getString(R.string.fontWorkaround), Toast.LENGTH_LONG).show();\r
-      prefs.edit().putString(getString(R.string.fontKey), "SYSTEM").commit();\r
-    }\r
-    prefs.edit().putInt(C.FONT_WORKAROUND, 0).commit();\r
     String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");\r
-    if (fontWorkAround == 0 || "SYSTEM".equals(fontName)) {\r
+    if ("SYSTEM".equals(fontName)) {\r
       typeface = Typeface.DEFAULT;\r
     } else {\r
       try {\r
@@ -391,11 +384,6 @@ public class DictionaryActivity extends ListActivity {
   @Override\r
   protected void onPause() {\r
     super.onPause();\r
-    \r
-    // If the app exits normally, this will happen.\r
-    final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
-    Log.d(LOG, "Loading font seemed to work.");\r
-    prefs.edit().putInt(C.FONT_WORKAROUND, 1).commit();\r
   }\r
   \r
   private static void setDictionaryPrefs(final Context context,\r
@@ -403,7 +391,7 @@ public class DictionaryActivity extends ListActivity {
     final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
     prefs.putString(C.DICT_FILE, dictFile.getPath());\r
     prefs.putInt(C.INDEX_INDEX, indexIndex);\r
-    prefs.putString(C.SEARCH_TOKEN, searchToken);\r
+    prefs.putString(C.SEARCH_TOKEN, "");  // Don't need to save search token.\r
     prefs.commit();\r
   }\r
 \r