From 772787ee263d3df5e54761b134db03f5fe813d26 Mon Sep 17 00:00:00 2001
From: thadh <thadh@THADH-LAPTOP.ad.corp.google.com>
Date: Tue, 27 Oct 2009 08:01:00 -0700
Subject: [PATCH] a

---
 res/layout/no_dictionary.xml                  |   9 +-
 res/values-de/strings.xml                     |   7 +-
 res/values/strings.xml                        |   7 +-
 .../hughes/android/dictionary/Dictionary.java |  22 ++
 .../dictionary/DictionaryActivity.java        | 200 +++++++++---------
 .../dictionary/DictionaryActivityTest.java    | 123 +++++++++--
 src/com/hughes/android/dictionary/Entry.java  |  59 +++++-
 .../dictionary/NoDictionaryActivity.java      |  21 +-
 8 files changed, 324 insertions(+), 124 deletions(-)

diff --git a/res/layout/no_dictionary.xml b/res/layout/no_dictionary.xml
index 6bcf86b..9ab0b85 100755
--- a/res/layout/no_dictionary.xml
+++ b/res/layout/no_dictionary.xml
@@ -11,7 +11,7 @@
 	>
 
 	<TextView 
-		android:id="@+id/noDictTextId" 
+		android:id="@+id/statusTextId" 
 		android:layout_width="wrap_content" 
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical|fill_vertical"
@@ -31,6 +31,13 @@
     android:layout_height="wrap_content"
   />
 
+  <Button 
+    android:id="@+id/launchDict"
+    android:text="@string/launchDict"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+  />
+
 </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b82a3af..a7662f6 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -6,12 +6,12 @@
 	
 	<!-- Main -->
 	<string name="searchText">Stichwort</string>
-	<string name="unableToReadDictionaryFile">Wörterbuch Datei existiert nicht: %s</string>
 	<string name="downloadDictionary">Wörterbuch herunterladen...</string>
 	<string name="switchToLanguage">Switch to %s</string>
 	<string name="preferences">Einstellungen...</string>
 	<string name="about">Über QuickDic...</string>
 	<string name="addToWordList">Zu Wortliste hinzufugen: %s</string>
+  <string name="failedAddingToWordList">Fehler bei Wortliste hinzufugen: %s</string>
 
 	<!-- About. -->
 	<string name="titleWithVersion">QuickDic 1.2</string>
@@ -26,6 +26,11 @@
 	<string name="downloadFinished">Herunterladen fertig, %d Bytes heruntergeladen.</string>
 	<string name="errorDownloadingFile">"Fehler während des Herunterladens: \n%s"</string>
 
+  <!-- NoDictionary. -->
+  <string name="unableToReadDictionaryFile">Wörterbuch Datei existiert nicht: %s</string>
+  <string name="DictionaryFileExists">Wörterbuch Datei existiert: %s</string>
+  <string name="launchDict">"Launch dictionary."</string>
+
 	<!-- Preferences -->
 	<string name="wordListFileKey">wordListFile</string>
 	<string name="wordListFileTitle">Wortliste Datei</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index db1481a..1a8a8f4 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6,12 +6,12 @@
 	
 	<!-- Main -->
 	<string name="searchText">Search Text</string>
-	<string name="unableToReadDictionaryFile">Unable to read dictionary file: %s</string>
 	<string name="downloadDictionary">Download dictionary...</string>
 	<string name="switchToLanguage">Switch to %s</string>
 	<string name="preferences">Preferences...</string>
 	<string name="about">About...</string>
 	<string name="addToWordList">Add to word list: %s</string>
+  <string name="failedAddingToWordList">Failure adding to word list: %s</string>
 
 	<!-- About. -->
 	<string name="titleWithVersion">QuickDic 1.2</string>
@@ -26,6 +26,11 @@
 	<string name="downloadFinished">Download finished, %d bytes downloaded.</string>
 	<string name="errorDownloadingFile">"Error downloading file: \n%s"</string>
 
+  <!-- NoDictionary. -->
+  <string name="unableToReadDictionaryFile">Unable to read dictionary file: %s</string>
+  <string name="dictionaryFileExists">Dictionary file exists: %s</string>
+  <string name="launchDict">Launch dictionary.</string>
+
 	<!-- Preferences -->
 	<string name="wordListFileKey">wordListFile</string>
 	<string name="wordListFileTitle">Word list file</string>
diff --git a/src/com/hughes/android/dictionary/Dictionary.java b/src/com/hughes/android/dictionary/Dictionary.java
index cc31105..0588129 100755
--- a/src/com/hughes/android/dictionary/Dictionary.java
+++ b/src/com/hughes/android/dictionary/Dictionary.java
@@ -123,6 +123,28 @@ public final class Dictionary implements RAFSerializable<Dictionary> {
       }
       return Math.min(sortedIndex.size() - 1, start);
     }
+    
+    public int getPrevTokenRow(final int rowIndex) {
+      final IndexEntry indexEntry = getIndexEntryForRow(rowIndex);
+      final Row tokenRow = rows.get(indexEntry.startRow);
+      assert tokenRow.isToken();
+      final int prevTokenIndex = tokenRow.getIndex() - 1;
+      if (indexEntry.startRow == rowIndex && prevTokenIndex >= 0) {
+        return sortedIndex.get(prevTokenIndex).startRow;
+      }
+      return indexEntry.startRow;
+    }
+
+    public int getNextTokenRow(final int rowIndex) {
+      final IndexEntry indexEntry = getIndexEntryForRow(rowIndex);
+      final Row tokenRow = rows.get(indexEntry.startRow);
+      assert tokenRow.isToken();
+      final int nextTokenIndex = tokenRow.getIndex() + 1;
+      if (nextTokenIndex < sortedIndex.size()) {
+        return sortedIndex.get(nextTokenIndex).startRow;
+      }
+      return rows.size() - 1;
+    }
 
     public IndexEntry getIndexEntryForRow(final int rowIndex) {
       // TODO: this kinda blows.
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 0bfd39a..f1d529d 100755
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -11,7 +11,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
@@ -36,6 +35,7 @@ import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View.OnClickListener;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -43,6 +43,7 @@ import android.widget.ListView;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.hughes.android.dictionary.Dictionary.IndexEntry;
 import com.hughes.android.dictionary.Dictionary.LanguageData;
@@ -51,10 +52,12 @@ import com.hughes.android.dictionary.Dictionary.Row;
 public class DictionaryActivity extends ListActivity {
   
   // TODO:
-  // * Only have one live SearchActivity, and a way to wait for it to die.
-  // * Don't destroy dict unless we're really shutting down (not on screen rotate).
-  // * Move (re-)init code to a method, set a flag if prefs might have changed, invoke re-init in onResume, which clears flag and reloads prefs.
+  // * Version magic number at end of dictionary, checked for correctness. (Throw exception in ctor, remember to check for it).
+  // * Localize "about" string if % codes
+  // * Toast when word gets added to word list.
   // * Compress all the strings everywhere, put compression table in file.
+  // Done:
+  // * Only one way to way for current search to end. (won't do).
 
   static final String LOG = "QuickDic";
   static final String PREF_DICT_ACTIVE_LANG = "DICT_DIR_PREF";
@@ -62,31 +65,28 @@ public class DictionaryActivity extends ListActivity {
 
   // package for test.
   final Handler uiHandler = new Handler();
+  private final Executor searchExecutor = Executors.newSingleThreadExecutor();
 
   EditText searchText;
+  Button langButton;
+  int lastSelectedRow = 0;
 
-  private final Executor searchExecutor = Executors.newSingleThreadExecutor();
+  private boolean prefsMightHaveChanged = true;
 
   // Never null.
-  private boolean prefsMightHaveChanged = true;
   private File wordList;
-
   private RandomAccessFile dictRaf = null;
   private Dictionary dictionary = null;
 
   // Visible for testing.
   LanguageListAdapter languageList = null;
-
   private SearchOperation searchOperation = null;
 
-  private int selectedRowIndex;
-  private int selectedTokenRowIndex;
-
   /** Called when the activity is first created. */
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    Log.d(LOG, "onCreate");
+    Log.d(LOG, "onCreate:" + this);
 
     if (Language.EN.sortCollator.compare("pre-print", "preppy") >= 0) {
       Log
@@ -103,9 +103,20 @@ public class DictionaryActivity extends ListActivity {
 
     setContentView(R.layout.main);
     searchText = (EditText) findViewById(R.id.SearchText);
-
+    langButton = (Button) findViewById(R.id.LangButton);
+    
     Log.d(LOG, "adding text changed listener");
     searchText.addTextChangedListener(new SearchTextWatcher());
+    
+    getListView().setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+      public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2,
+          long arg3) {
+        lastSelectedRow = arg2;
+        updateSearchText();
+      }
+      public void onNothingSelected(AdapterView<?> arg0) {
+      }
+    });
 
     // Language button.
     final Button langButton = (Button) findViewById(R.id.LangButton);
@@ -132,7 +143,7 @@ public class DictionaryActivity extends ListActivity {
 
     updateLangButton();
   }
-
+  
   private void initDictionaryAndPrefs() {
     if (!prefsMightHaveChanged) {
       return;
@@ -158,7 +169,8 @@ public class DictionaryActivity extends ListActivity {
       dictRaf = new RandomAccessFile(dictFile, "r");
       dictionary = new Dictionary(dictRaf);
     } catch (Exception e) {
-      throw new RuntimeException(e);
+      Log.e(LOG, "Couldn't open dictionary.", e);
+      return;
     }
 
     final byte lang = prefs.getInt(PREF_DICT_ACTIVE_LANG, Entry.LANG1) == Entry.LANG1 ? Entry.LANG1
@@ -172,10 +184,9 @@ public class DictionaryActivity extends ListActivity {
   @Override
   public void onResume() {
     super.onResume();
-    
-    if (prefsMightHaveChanged) {
-      
-    }
+    Log.d(LOG, "onResume:" + this);
+
+    initDictionaryAndPrefs();
     
     final SharedPreferences prefs = PreferenceManager
         .getDefaultSharedPreferences(this);
@@ -183,11 +194,13 @@ public class DictionaryActivity extends ListActivity {
         .getString(PREF_ACTIVE_SEARCH_TEXT, "");
     searchText.setText(searchTextString);
     onSearchTextChange(searchTextString);
+    getListView().requestFocus();
   }
 
   @Override
   public void onPause() {
     super.onPause();
+    Log.d(LOG, "onPause:" + this);
     final Editor prefs = PreferenceManager.getDefaultSharedPreferences(this)
         .edit();
     prefs.putInt(PREF_DICT_ACTIVE_LANG, languageList.languageData.lang);
@@ -198,17 +211,16 @@ public class DictionaryActivity extends ListActivity {
   @Override
   public void onStop() {
     super.onStop();
+    Log.d(LOG, "onStop:" + this);
     if (isFinishing()) {
+      Log.i(LOG, "isFinishing()==true, closing dictionary.");
       closeCurrentDictionary();
     }
   }
 
   private void closeCurrentDictionary() {
     Log.i(LOG, "closeCurrentDictionary");
-    if (searchOperation != null) {
-      searchOperation.stopAndWait();
-      searchOperation = null;
-    }
+    waitForSearchEnd();
     languageList = null;
     setListAdapter(null);
     dictionary = null;
@@ -223,7 +235,7 @@ public class DictionaryActivity extends ListActivity {
   }
 
   public String getSelectedRowRawText() {
-    final int row = getSelectedItemPosition();
+    final int row = getSelectedRow();
     return row < 0 ? "" : languageList.languageData
         .rowToString(languageList.languageData.rows.get(row));
   }
@@ -297,14 +309,13 @@ public class DictionaryActivity extends ListActivity {
 
   @Override
   public boolean onPrepareOptionsMenu(final Menu menu) {
-    switchLanguageMenuItem.setTitle(String.format(
-        getString(R.string.switchToLanguage), dictionary.languageDatas[Entry
+    switchLanguageMenuItem.setTitle(getString(R.string.switchToLanguage,
+        dictionary.languageDatas[Entry
             .otherLang(languageList.languageData.lang)].language.symbol));
     return super.onPrepareOptionsMenu(menu);
   }
   
   void updateLangButton() {
-    final Button langButton = (Button) findViewById(R.id.LangButton);
     langButton.setText(languageList.languageData.language.symbol);
   }
 
@@ -313,6 +324,7 @@ public class DictionaryActivity extends ListActivity {
   // ----------------------------------------------------------------
   
   void onLanguageButton() {
+    waitForSearchEnd();
     languageList = new LanguageListAdapter(
         dictionary.languageDatas[(languageList.languageData == dictionary.languageDatas[0]) ? 1
             : 0]);
@@ -323,41 +335,19 @@ public class DictionaryActivity extends ListActivity {
   }
 
   void onUpButton() {
-    final int destRowIndex;
-    final Row tokenRow = languageList.languageData.rows
-        .get(selectedTokenRowIndex);
-    assert tokenRow.isToken();
-    final int prevTokenIndex = tokenRow.getIndex() - 1;
-    if (selectedRowIndex == selectedTokenRowIndex && selectedRowIndex > 0) {
-      destRowIndex = languageList.languageData.sortedIndex
-          .get(prevTokenIndex).startRow;
-      Log.d(LOG, "onUpButton, jumping back a word, destRowIndex=" + destRowIndex);
-    } else {
-      destRowIndex = selectedTokenRowIndex;
-      Log.d(LOG, "onUpButton, jumping to top of word, destRowIndex=" + destRowIndex);
-    }
+    final int destRowIndex = languageList.languageData.getPrevTokenRow(lastSelectedRow);
+    Log.d(LOG, "onUpButton, destRowIndex=" + destRowIndex);
     jumpToRow(languageList, destRowIndex);
   }
 
   void onDownButton() {
-    final Row tokenRow = languageList.languageData.rows
-        .get(selectedTokenRowIndex);
-    assert tokenRow.isToken();
-    final int nextTokenIndex = tokenRow.getIndex() + 1;
-    final int destRowIndex;
-    if (nextTokenIndex < languageList.languageData.sortedIndex.size()) {
-      destRowIndex = languageList.languageData.sortedIndex
-          .get(nextTokenIndex).startRow;
-      Log.d(LOG, "onDownButton, jumping down a word, destRowIndex=" + destRowIndex);
-    } else {
-      destRowIndex = languageList.languageData.rows.size() - 1;
-      Log.d(LOG, "onDownButton, jumping to end of dict, destRowIndex=" + destRowIndex);
-    }
+    final int destRowIndex = languageList.languageData.getNextTokenRow(lastSelectedRow);
+    Log.d(LOG, "onDownButton, destRowIndex=" + destRowIndex);
     jumpToRow(languageList, destRowIndex);
   }
 
   void onAppendToWordList() {
-    final int row = getSelectedItemPosition();
+    final int row = getSelectedRow();
     if (row < 0) {
       return;
     }
@@ -377,21 +367,17 @@ public class DictionaryActivity extends ListActivity {
       out.close();
     } catch (IOException e) {
       Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
-      final AlertDialog alert = new AlertDialog.Builder(
-          DictionaryActivity.this).create();
-      alert.setMessage("Failed to append to file: "
-          + wordList.getAbsolutePath());
-      alert.show();
+      Toast.makeText(this, getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()), Toast.LENGTH_LONG);
     }
     return;
   }
 
   void onCopy() {
-    final int row = getSelectedItemPosition();
+    final int row = getSelectedRow();
     if (row < 0) {
       return;
     }
-    Log.d(LOG, "Copy." + DictionaryActivity.this.getSelectedItemPosition());
+    Log.d(LOG, "Copy." + DictionaryActivity.this.getSelectedRow());
     final StringBuilder result = new StringBuilder();
     result.append(getSelectedRowRawText());
     final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
@@ -420,10 +406,14 @@ public class DictionaryActivity extends ListActivity {
 
   void onSearchTextChange(final String searchText) {
     Log.d(LOG, "onSearchTextChange: " + searchText);
-    searchOperation = new SearchOperation(languageList, searchText, searchOperation);
-    searchExecutor.execute(searchOperation);
+    synchronized (this) {
+      searchOperation = new SearchOperation(languageList, searchText, searchOperation);
+      searchExecutor.execute(searchOperation);
+    }
   }
 
+  
+
   // ----------------------------------------------------------------
   // ContextMenu
   // ----------------------------------------------------------------
@@ -431,13 +421,12 @@ public class DictionaryActivity extends ListActivity {
   @Override
   public void onCreateContextMenu(ContextMenu menu, View v,
       ContextMenuInfo menuInfo) {
-    final int row = getSelectedItemPosition();
+    final int row = getSelectedRow();
     if (row < 0) {
       return;
     }
 
-    final MenuItem addToWordlist = menu.add(String.format(
-        getString(R.string.addToWordList), wordList.getName()));
+    final MenuItem addToWordlist = menu.add(getString(R.string.addToWordList, wordList.getName()));
     addToWordlist.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(MenuItem item) {
         onAppendToWordList();
@@ -462,21 +451,30 @@ public class DictionaryActivity extends ListActivity {
       Log.w(LOG, "skipping jumpToRow for old list adapter: " + rowIndex);
       return;
     }
-    // selectedTokenRowIndex =
-    // languageList.languageData.getIndexEntryForRow(rowIndex).startRow;
     setSelection(rowIndex);
-    getListView().setSelected(true); // TODO: is this doing anything?
+    lastSelectedRow = rowIndex;  // TODO: find a way to delete this.
     updateSearchText();
+    getListView().setSelected(true);
+  }
+  
+  // TODO: delete me somehow.
+  private int getSelectedRow() {
+    return lastSelectedRow;
   }
 
   private void updateSearchText() {
     Log.d(LOG, "updateSearchText");
+    final int selectedRowIndex = getSelectedRow();
     if (!searchText.hasFocus()) {
-      final String word = languageList.languageData
-          .getIndexEntryForRow(selectedRowIndex).word;
-      if (!word.equals(searchText.getText().toString())) {
-        Log.d(LOG, "updateSearchText: setText: " + word);
-        searchText.setText(word);
+      if (selectedRowIndex >= 0) {
+        final String word = languageList.languageData
+            .getIndexEntryForRow(selectedRowIndex).word;
+        if (!word.equals(searchText.getText().toString())) {
+          Log.d(LOG, "updateSearchText: setText: " + word);
+          searchText.setText(word);
+        }
+      } else {
+        Log.w(LOG, "updateSearchText: nothing selected.");
       }
     }
   }
@@ -601,7 +599,7 @@ public class DictionaryActivity extends ListActivity {
     final LanguageData languageData;
     final String searchText;
     final AtomicBoolean interrupted = new AtomicBoolean(false);
-    boolean finished = false;
+    boolean searchFinished = false;
 
     SearchOperation(final LanguageListAdapter listAdapter,
         final String searchText, final SearchOperation previousSearchOperation) {
@@ -619,32 +617,34 @@ public class DictionaryActivity extends ListActivity {
       
       Log.d(LOG, "SearchOperation: " + searchText);
       final int indexLocation = languageData.lookup(searchText, interrupted);
-      if (interrupted.get()) {
-        return;
-      }
-      final IndexEntry indexEntry = languageData.sortedIndex.get(indexLocation);
-      
-      Log.d(LOG, "SearchOperation completed: " + indexEntry.toString());
-      uiHandler.post(new Runnable() {
-        public void run() {
-          // Check is just a performance operation.
-          if (!interrupted.get()) {
-            // This is safe, because it checks that the listAdapter hasn't changed.
-            jumpToRow(listAdapter, indexEntry.startRow);
+      if (!interrupted.get()) {
+        final IndexEntry indexEntry = languageData.sortedIndex.get(indexLocation);
+        
+        Log.d(LOG, "SearchOperation completed: " + indexEntry.toString());
+        uiHandler.post(new Runnable() {
+          public void run() {
+            // Check is just a performance operation.
+            if (!interrupted.get()) {
+              // This is safe, because it checks that the listAdapter hasn't changed.
+              jumpToRow(listAdapter, indexEntry.startRow);
+            }
+            synchronized (DictionaryActivity.this) {
+              searchOperation = null;
+              DictionaryActivity.this.notifyAll();
+            }
           }
-        }
-      });
-      
+        });
+      }      
       synchronized (this) {
-        finished = true;
+        searchFinished = true;
         this.notifyAll();
       }
     }
     
-    public void stopAndWait() {
+    private void stopAndWait() {
       interrupted.set(true);
       synchronized (this) {
-        while (!finished) {
+        while (!searchFinished) {
           Log.d(LOG, "stopAndWait: " + searchText);
           try {
             this.wait();
@@ -654,8 +654,18 @@ public class DictionaryActivity extends ListActivity {
         }
       }
     }
-
-
+  }  // SearchOperation
+
+  void waitForSearchEnd() {
+    synchronized (this) {
+      while (searchOperation != null) {
+        try {
+          this.wait();
+        } catch (InterruptedException e) {
+          Log.e(LOG, "Interrupted.", e);
+        }
+      }
+    }
   }
 
   private class SearchTextWatcher implements TextWatcher {
diff --git a/src/com/hughes/android/dictionary/DictionaryActivityTest.java b/src/com/hughes/android/dictionary/DictionaryActivityTest.java
index 5afcb22..ea6b692 100755
--- a/src/com/hughes/android/dictionary/DictionaryActivityTest.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivityTest.java
@@ -12,32 +12,125 @@ public class DictionaryActivityTest extends ActivityInstrumentationTestCase2<Dic
     final DictionaryActivity dict = getActivity();
     dict.finish();
   }
+  
+  abstract class NotifyRunnable implements Runnable {
+    boolean finished = false;
+    public final void run() {
+      assertEquals(false, finished);
+      run2();
+      synchronized (this) {
+        finished = true;
+        this.notifyAll();
+      }
+    }
+    public void waitForFinish() throws InterruptedException {
+      synchronized (this) {
+        while (!finished) {
+          this.wait();
+        }
+        finished = false;
+      }
+      getActivity().waitForSearchEnd();
+    }
+    protected abstract void run2();
+  }
 
-  public void testSwitchLanguage() throws Exception {
+  private void postAndWait(final NotifyRunnable notifyRunnable) throws Exception {
+    getActivity().uiHandler.post(notifyRunnable);
+    notifyRunnable.waitForFinish();
+  }
 
+  public void resetDictionary() throws Exception {
     final DictionaryActivity dict = getActivity();
-
-    final Runnable switchLang = new Runnable() {
-      public void run() {
-        getActivity().onLanguageButton();
-      }};
-
+    
     if (dict.languageList.languageData.language == Language.EN) {
-      dict.uiHandler.post(switchLang);
-      Thread.sleep(100);
+      postAndWait(switchLangRunnable());
     }
-    
     assertEquals(Language.DE, dict.languageList.languageData.language);
-      
-    dict.uiHandler.post(switchLang);
-    Thread.sleep(100);
+
+    postAndWait(new NotifyRunnable() {
+      protected void run2() {
+        dict.searchText.setText("");
+        dict.onSearchTextChange("");
+      }
+    });
+  }
+
+  public void testSwitchLanguage() throws Exception {
+    final DictionaryActivity dict = getActivity();
+    resetDictionary();
+
+    final NotifyRunnable switchLang = switchLangRunnable();
+
+    postAndWait(switchLang);
     assertEquals(Language.EN, dict.languageList.languageData.language);
+    assertEquals("EN", dict.langButton.getText().toString());
 
-    dict.uiHandler.post(switchLang);
-    Thread.sleep(200);
+    postAndWait(switchLang);
     assertEquals(Language.DE, dict.languageList.languageData.language);
+    assertEquals("DE", dict.langButton.getText().toString());
     
     dict.finish();
   }
 
+  public void testUpDownArrows() throws Exception {
+    final DictionaryActivity dict = getActivity();
+    resetDictionary();
+    assertEquals(0, dict.getSelectedItemPosition());
+    
+    final NotifyRunnable upButton = new NotifyRunnable() {
+      protected void run2() {
+        dict.onUpButton();
+      }
+    };
+    final NotifyRunnable downButton = new NotifyRunnable() {
+      protected void run2() {
+        dict.onDownButton();
+      }
+    };
+    
+    dict.getListView().requestFocus();
+    assertTrue(dict.getListView().isFocused());
+    
+    String word1 = "-1";
+    String word2 = "-14";
+    String word3 = "-15";
+
+    postAndWait(upButton);
+    assertEquals(0, dict.getSelectedItemPosition());
+    assertEquals(word1, dict.searchText.getText().toString());
+
+    postAndWait(downButton);
+    assertEquals(2, dict.getSelectedItemPosition());
+    assertEquals(word2, dict.searchText.getText().toString());
+    
+    postAndWait(downButton);
+    assertEquals(4, dict.getSelectedItemPosition());
+    assertEquals(word3, dict.searchText.getText().toString());
+
+    postAndWait(upButton);
+    assertEquals(2, dict.getSelectedItemPosition());
+    assertEquals(word2, dict.searchText.getText().toString());
+    
+    postAndWait(upButton);
+    assertEquals(0, dict.getSelectedItemPosition());
+    assertEquals(word1, dict.searchText.getText().toString());
+    
+    postAndWait(upButton);
+    assertEquals(0, dict.getSelectedItemPosition());
+
+    postAndWait(downButton);
+    assertEquals(2, dict.getSelectedItemPosition());
+
+    dict.finish();
+  }
+
+  private NotifyRunnable switchLangRunnable() {
+    final NotifyRunnable switchLang = new NotifyRunnable() {
+      public void run2() {
+        getActivity().onLanguageButton();
+      }};
+    return switchLang;
+  }
+
 }
diff --git a/src/com/hughes/android/dictionary/Entry.java b/src/com/hughes/android/dictionary/Entry.java
index b2f8c45..87e87a3 100755
--- a/src/com/hughes/android/dictionary/Entry.java
+++ b/src/com/hughes/android/dictionary/Entry.java
@@ -9,6 +9,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.hughes.util.raf.RAFFactory;
@@ -104,10 +105,52 @@ public final class Entry implements RAFSerializable<Entry> {
     return lang == LANG1 ? LANG2 : LANG1;
   }
   
-
+/*
+Lu     Letter, Uppercase
+Ll  Letter, Lowercase
+Lt  Letter, Titlecase
+Lm  Letter, Modifier
+Lo  Letter, Other
+Mn  Mark, Nonspacing
+Mc  Mark, Spacing Combining
+Me  Mark, Enclosing
+Nd  Number, Decimal Digit
+Nl  Number, Letter
+No  Number, Other
+Pc  Punctuation, Connector
+Pd  Punctuation, Dash
+Ps  Punctuation, Open
+Pe  Punctuation, Close
+Pi  Punctuation, Initial quote (may behave like Ps or Pe depending on usage)
+Pf  Punctuation, Final quote (may behave like Ps or Pe depending on usage)
+Po  Punctuation, Other
+Sm  Symbol, Math
+Sc  Symbol, Currency
+Sk  Symbol, Modifier
+So  Symbol, Other
+Zs  Separator, Space
+Zl  Separator, Line
+Zp  Separator, Paragraph
+*/
+
+  static Pattern htmlDecimalCode = Pattern.compile("&#([0-9]+);");
+  static Pattern htmlCode = Pattern.compile("&#[^;]+;");
+  
   static Entry parseFromLine(String line, final boolean hasMultipleSubentries) {
+    
     line = line.replaceAll("&lt;", "<");
     line = line.replaceAll("&gt;", ">");
+    Matcher matcher;
+    while ((matcher = htmlDecimalCode.matcher(line)).find()) {
+      final int intVal = Integer.parseInt(matcher.group(1));
+      final String charCode = "" + ((char) intVal);
+      System.out.println("Replacing " + matcher.group() + " with " + charCode);
+      line = matcher.replaceAll(charCode);
+    }
+    if ((matcher = htmlCode.matcher(line)).find()) {
+      System.err.println("HTML code: " + matcher.group());
+    }
+    
     final String[] parts = lineSplitPattern.split(line);
     if (parts.length != 2) {
       System.err.println("Entry:" + "Invalid line: " + line);
@@ -136,7 +179,8 @@ public final class Entry implements RAFSerializable<Entry> {
     bracketToClose.put(" '", "' ");
   }
   
-  static final Pattern WHITESPACE = Pattern.compile("\\s+");
+  // This used to be called WHITESPACE.
+  static final Pattern NON_TOKEN_CHAR = Pattern.compile("\\s+");
   
   public Set<String> getIndexableTokens(final byte lang) {
     final Set<String> result = new LinkedHashSet<String>();
@@ -150,17 +194,16 @@ public final class Entry implements RAFSerializable<Entry> {
     text = text.replaceAll("\"-", "-");
     text = text.replaceAll("-\"", "-");
     text = text.replaceAll("[\"/\\()<>\\[\\],;?!.]", " ");
-    text = text.replaceAll("[:] ", " ");
-    text = text.replaceAll(" [:]", " ");
+    text = text.replaceAll("[-:] ", " ");
+    text = text.replaceAll(" [-:]", " ");
     
     // Now be really conservative about what we allow inside a token:
     // See: http://unicode.org/Public/UNIDATA/UCD.html#General_Category_Values
-    text = text.replaceAll("[^-:\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nd}\\p{Nl}\\p{No}]", " ");
-    
-    result.addAll(Arrays.asList(WHITESPACE.split(text)));
+    text = text.replaceAll("[^-:\\p{L}\\p{N}\\p{S}]", " ");
+    result.addAll(Arrays.asList(NON_TOKEN_CHAR.split(text)));
 
     text = text.replaceAll("[-]", " ");
-    result.addAll(Arrays.asList(WHITESPACE.split(text)));
+    result.addAll(Arrays.asList(NON_TOKEN_CHAR.split(text)));
     
     final Set<String> result2 = new LinkedHashSet<String>();
     for (final String token : result) {
diff --git a/src/com/hughes/android/dictionary/NoDictionaryActivity.java b/src/com/hughes/android/dictionary/NoDictionaryActivity.java
index 9633a68..c2093c6 100755
--- a/src/com/hughes/android/dictionary/NoDictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/NoDictionaryActivity.java
@@ -1,5 +1,7 @@
 package com.hughes.android.dictionary;
 
+import java.io.File;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -22,8 +24,14 @@ public class NoDictionaryActivity extends Activity {
       final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
       final String dictFile = prefs.getString(getString(R.string.dictFileKey), getString(R.string.dictFileDefault));
 
-      final TextView noDictText = (TextView) findViewById(R.id.noDictTextId);
-      noDictText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
+      final boolean canReadDict = new File(dictFile).canRead();
+        
+      final TextView statusText = (TextView) findViewById(R.id.statusTextId);
+      if (!canReadDict) {
+        statusText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
+      } else {
+        statusText.setText(String.format(getString(R.string.unableToReadDictionaryFile), dictFile));
+      }
 
       final Button downloadButton = (Button) findViewById(R.id.downloadDict);
       downloadButton.setOnClickListener(new OnClickListener() {
@@ -36,6 +44,13 @@ public class NoDictionaryActivity extends Activity {
         public void onClick(View arg0) {
           startActivity(new Intent(NoDictionaryActivity.this, PreferenceActivity.class));
         }});
-  }
+
+      final Button launchButton = (Button) findViewById(R.id.launchDict);
+      launchButton.setEnabled(canReadDict);
+      launchButton.setOnClickListener(new OnClickListener() {
+        public void onClick(View arg0) {
+          startActivity(new Intent(NoDictionaryActivity.this, DictionaryActivity.class));
+        }});
+}
 
 }
-- 
2.43.0