Try to fix font issue.

[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 78c8a476b822cb0de1d69de411af4cef3a0d4512..89869b646e0dd4aa543288fe514cf68f9ffa0e62 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -247,8 +247,15 @@ public class DictionaryActivity extends ListActivity {
       }\r
     }).start();\r
     \r
-    final String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");\r
-    if ("SYSTEM".equals(fontName)) {\r
+    \r
+    final int fontWorkAround = prefs.getInt(C.FONT_WORKAROUND, 1);\r
+    if (fontWorkAround == 0) {\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
       typeface = Typeface.DEFAULT;\r
     } else {\r
       try {\r
@@ -258,6 +265,9 @@ public class DictionaryActivity extends ListActivity {
         Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()), Toast.LENGTH_LONG).show();\r
       }\r
     }\r
+//    if (!"SYSTEM".equals(fontName)) {\r
+//      throw new RuntimeException("Test force using system font: " + fontName);\r
+//    }\r
     if (typeface == null) {\r
       Log.w(LOG, "Unable to create typeface, using default.");\r
       typeface = Typeface.DEFAULT;\r
@@ -267,7 +277,10 @@ public class DictionaryActivity extends ListActivity {
       fontSizeSp = Integer.parseInt(fontSize.trim());\r
     } catch (NumberFormatException e) {\r
       fontSizeSp = 14;\r
-    }\r
+    } \r
+    // Things worked with loading the font.\r
+    prefs.edit().putInt(C.FONT_WORKAROUND, 1).commit();\r
+\r
 \r
     setContentView(R.layout.dictionary_activity);\r
     searchText = (EditText) findViewById(R.id.SearchText);\r