X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryActivity.java;h=3062b7249a14e2c4f4ab31b6d98bcd76a37ef628;hb=3b4ed15ecaa3227aae17eceffe5e81285d328faf;hp=6dc95c68dc95b2c9bdba2d18f4c9d418201718a9;hpb=131ee153d1b5af73d423882c5852cb1061e75e03;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 6dc95c6..3062b72 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -29,19 +29,22 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
 import android.support.v7.widget.Toolbar;
 import android.text.ClipboardManager;
 import android.text.InputType;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.StyleSpan;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -74,7 +77,6 @@ import android.widget.ListView;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
-import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
@@ -83,7 +85,6 @@ import com.hughes.android.dictionary.engine.EntrySource;
 import com.hughes.android.dictionary.engine.HtmlEntry;
 import com.hughes.android.dictionary.engine.Index;
 import com.hughes.android.dictionary.engine.Index.IndexEntry;
-import com.hughes.android.dictionary.engine.Language.LanguageResources;
 import com.hughes.android.dictionary.engine.PairEntry;
 import com.hughes.android.dictionary.engine.PairEntry.Pair;
 import com.hughes.android.dictionary.engine.RowBase;
@@ -98,6 +99,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collections;
@@ -108,7 +110,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -116,43 +117,44 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DictionaryActivity extends ActionBarActivity {
+public class DictionaryActivity extends AppCompatActivity {
 
-    static final String LOG = "QuickDic";
+    private static final String LOG = "QuickDic";
 
-    DictionaryApplication application;
+    private DictionaryApplication application;
 
-    File dictFile = null;
-    RandomAccessFile dictRaf = null;
+    private File dictFile = null;
+    private FileChannel dictRaf = null;
+    private String dictFileTitleName = null;
 
-    Dictionary dictionary = null;
+    private Dictionary dictionary = null;
 
-    int indexIndex = 0;
+    private int indexIndex = 0;
 
-    Index index = null;
+    private Index index = null;
 
-    List<RowBase> rowsToShow = null; // if not null, just show these rows.
+    private List<RowBase> rowsToShow = null; // if not null, just show these rows.
 
-    final Random rand = new Random();
+    private final Random rand = new Random();
 
-    final Handler uiHandler = new Handler();
+    private final Handler uiHandler = new Handler();
 
     private final ExecutorService searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
-        public Thread newThread(Runnable r) {
+        public Thread newThread(@NonNull Runnable r) {
             return new Thread(r, "searchExecutor");
         }
     });
 
     private SearchOperation currentSearchOperation = null;
 
-    TextToSpeech textToSpeech;
-    volatile boolean ttsReady;
+    private TextToSpeech textToSpeech;
+    private volatile boolean ttsReady;
 
-    Typeface typeface;
-    DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
-    int textColorFg = Color.BLACK;
-    int fontSizeSp;
+    private Typeface typeface;
+    private DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
+    private int textColorFg = Color.BLACK;
+    private int fontSizeSp;
 
     private ListView listView;
     private ListView getListView() {
@@ -170,11 +172,12 @@ public class DictionaryActivity extends ActionBarActivity {
         return getListView().getAdapter();
     }
 
-    SearchView searchView;
-    ImageButton languageButton;
-    SearchView.OnQueryTextListener onQueryTextListener;
+    private SearchView searchView;
+    private ImageButton languageButton;
+    private SearchView.OnQueryTextListener onQueryTextListener;
 
-    MenuItem nextWordMenuItem, previousWordMenuItem, randomWordMenuItem;
+    private MenuItem nextWordMenuItem;
+    private MenuItem previousWordMenuItem;
 
     // Never null.
     private File wordList = null;
@@ -182,7 +185,7 @@ public class DictionaryActivity extends ActionBarActivity {
     private boolean clickOpensContextMenu = false;
 
     // Visible for testing.
-    ListAdapter indexAdapter = null;
+    private ListAdapter indexAdapter = null;
 
     /**
      * For some languages, loading the transliterators used in this search takes
@@ -223,12 +226,33 @@ public class DictionaryActivity extends ActionBarActivity {
         return search.length();
     }
 
+    private void dictionaryOpenFail(Exception e) {
+        Log.e(LOG, "Unable to load dictionary.", e);
+        if (dictRaf != null) {
+            indexAdapter = null;
+            setListAdapter(null);
+            try {
+                dictRaf.close();
+            } catch (IOException e1) {
+                Log.e(LOG, "Unable to close dictRaf.", e1);
+            }
+            dictRaf = null;
+        }
+        if (!isFinishing())
+            Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
+                           Toast.LENGTH_LONG).show();
+        startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
+        finish();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        DictionaryApplication.INSTANCE.init(getApplicationContext());
+        application = DictionaryApplication.INSTANCE;
         // This needs to be before super.onCreate, otherwise ActionbarSherlock
         // doesn't makes the background of the actionbar white when you're
         // in the dark theme.
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+        setTheme(application.getSelectedTheme().themeId);
 
         Log.d(LOG, "onCreate:" + this);
         super.onCreate(savedInstanceState);
@@ -236,18 +260,26 @@ public class DictionaryActivity extends ActionBarActivity {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         // Don't auto-launch if this fails.
-        prefs.edit().remove(C.DICT_FILE).commit();
+        prefs.edit().remove(C.DICT_FILE).remove(C.INDEX_SHORT_NAME).commit();
 
         setContentView(R.layout.dictionary_activity);
 
-        application = (DictionaryApplication) getApplication();
         theme = application.getSelectedTheme();
         textColorFg = getResources().getColor(theme.tokenRowFgColor);
 
+        if (dictRaf != null) {
+            try {
+                dictRaf.close();
+            } catch (IOException e) {
+                Log.e(LOG, "Failed to close dictionary", e);
+            }
+            dictRaf = null;
+        }
+
         final Intent intent = getIntent();
         String intentAction = intent.getAction();
-        /**
-         * @author Dominik Köppl Querying the Intent
+        /*
+          @author Dominik Köppl Querying the Intent
          *         com.hughes.action.ACTION_SEARCH_DICT is the advanced query
          *         Arguments: SearchManager.QUERY -> the phrase to search from
          *         -> language in which the phrase is written to -> to which
@@ -296,8 +328,8 @@ public class DictionaryActivity extends ActionBarActivity {
 
             }
         }
-        /**
-         * @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a
+        /*
+          @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a
          *         simple query Arguments follow from android standard (see
          *         documentation)
          */
@@ -320,8 +352,20 @@ public class DictionaryActivity extends ActionBarActivity {
                 getIntent().putExtra(C.SEARCH_TOKEN, query);
             }
         }
-        /**
-         * @author Dominik Köppl If no dictionary is chosen, use the default
+        // Support opening dictionary file directly
+        if (intentAction != null && intentAction.equals(Intent.ACTION_VIEW)) {
+            Uri uri = intent.getData();
+            intent.putExtra(C.DICT_FILE, uri.toString());
+            dictFileTitleName = uri.getLastPathSegment();
+            try {
+                dictRaf = getContentResolver().openAssetFileDescriptor(uri, "r").createInputStream().getChannel();
+            } catch (Exception e) {
+                dictionaryOpenFail(e);
+                return;
+            }
+        }
+        /*
+          @author Dominik Köppl If no dictionary is chosen, use the default
          *         dictionary specified in the preferences If this step does
          *         fail (no default dictionary specified), show a toast and
          *         abort.
@@ -343,7 +387,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 try {
                     Log.d(LOG, "Checking dictionary " + dics.get(i).uncompressedFilename);
                     final File dictfile = application.getPath(dics.get(i).uncompressedFilename);
-                    Dictionary dic = new Dictionary(new RandomAccessFile(dictfile, "r"));
+                    Dictionary dic = new Dictionary(new RandomAccessFile(dictfile, "r").getChannel());
                     for (int j = 0; j < dic.indices.size(); ++j) {
                         Index idx = dic.indices.get(j);
                         Log.d(LOG, "Checking index " + idx.shortName);
@@ -370,12 +414,13 @@ public class DictionaryActivity extends ActionBarActivity {
         }
 
         if (dictFilename == null) {
-            Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
             startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
             finish();
             return;
         }
-        if (dictFilename != null)
+        if (dictRaf == null)
             dictFile = new File(dictFilename);
 
         ttsReady = false;
@@ -388,24 +433,14 @@ public class DictionaryActivity extends ActionBarActivity {
         });
 
         try {
-            final String name = application.getDictionaryName(dictFile.getName());
-            this.setTitle("QuickDic: " + name);
-            dictRaf = new RandomAccessFile(dictFile, "r");
+            if (dictRaf == null) {
+                dictFileTitleName = application.getDictionaryName(dictFile.getName());
+                dictRaf = new RandomAccessFile(dictFile, "r").getChannel();
+            }
+            this.setTitle("QuickDic: " + dictFileTitleName);
             dictionary = new Dictionary(dictRaf);
         } catch (Exception e) {
-            Log.e(LOG, "Unable to load dictionary.", e);
-            if (dictRaf != null) {
-                try {
-                    dictRaf.close();
-                } catch (IOException e1) {
-                    Log.e(LOG, "Unable to close dictRaf.", e1);
-                }
-                dictRaf = null;
-            }
-            Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
-                           Toast.LENGTH_LONG).show();
-            startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
-            finish();
+            dictionaryOpenFail(e);
             return;
         }
         String targetIndex = intent.getStringExtra(C.INDEX_SHORT_NAME);
@@ -421,27 +456,36 @@ public class DictionaryActivity extends ActionBarActivity {
         }
         Log.d(LOG, "Loading index " + indexIndex);
         index = dictionary.indices.get(indexIndex);
+        getListView().setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
         getListView().setEmptyView(findViewById(android.R.id.empty));
+        getListView().setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int row, long id) {
+                onListItemClick(getListView(), view, row, id);
+            }
+        });
+
         setListAdapter(new IndexAdapter(index));
 
+        // Pre-load the Transliterator (will spawn its own thread)
+        TransliteratorManager.init(new TransliteratorManager.Callback() {
+            @Override
+            public void onTransliteratorReady() {
+                uiHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onSearchTextChange(searchView.getQuery().toString());
+                    }
+                });
+            }
+        }, DictionaryApplication.threadBackground);
+
         // Pre-load the collators.
         new Thread(new Runnable() {
             public void run() {
-                android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
+                android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_LESS_FAVORABLE);
                 final long startMillis = System.currentTimeMillis();
                 try {
-                    TransliteratorManager.init(new TransliteratorManager.Callback() {
-                        @Override
-                        public void onTransliteratorReady() {
-                            uiHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    onSearchTextChange(searchView.getQuery().toString());
-                                }
-                            });
-                        }
-                    });
-
                     for (final Index index : dictionary.indices) {
                         final String searchToken = index.sortedIndexEntries.get(0).token;
                         final IndexEntry entry = index.findExact(searchToken);
@@ -459,25 +503,32 @@ public class DictionaryActivity extends ActionBarActivity {
         }).start();
 
         String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.otf.jpg");
-        if ("SYSTEM".equals(fontName)) {
-            typeface = Typeface.DEFAULT;
-        } else if ("SERIF".equals(fontName)) {
-            typeface = Typeface.SERIF;
-        } else if ("SANS_SERIF".equals(fontName)) {
-            typeface = Typeface.SANS_SERIF;
-        } else if ("MONOSPACE".equals(fontName)) {
-            typeface = Typeface.MONOSPACE;
-        } else {
-            if ("FreeSerif.ttf.jpg".equals(fontName)) {
-                fontName = "FreeSerif.otf.jpg";
-            }
-            try {
-                typeface = Typeface.createFromAsset(getAssets(), fontName);
-            } catch (Exception e) {
-                Log.w(LOG, "Exception trying to use typeface, using default.", e);
-                Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()),
-                               Toast.LENGTH_LONG).show();
-            }
+        switch (fontName) {
+            case "SYSTEM":
+                typeface = Typeface.DEFAULT;
+                break;
+            case "SERIF":
+                typeface = Typeface.SERIF;
+                break;
+            case "SANS_SERIF":
+                typeface = Typeface.SANS_SERIF;
+                break;
+            case "MONOSPACE":
+                typeface = Typeface.MONOSPACE;
+                break;
+            default:
+                if ("FreeSerif.ttf.jpg".equals(fontName)) {
+                    fontName = "FreeSerif.otf.jpg";
+                }
+                try {
+                    typeface = Typeface.createFromAsset(getAssets(), fontName);
+                } catch (Exception e) {
+                    Log.w(LOG, "Exception trying to use typeface, using default.", e);
+                    if (!isFinishing())
+                        Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()),
+                                Toast.LENGTH_LONG).show();
+                }
+                break;
         }
         if (typeface == null) {
             Log.w(LOG, "Unable to create typeface, using default.");
@@ -523,7 +574,7 @@ public class DictionaryActivity extends ActionBarActivity {
         setSearchText(text, true);
         Log.d(LOG, "Trying to restore searchText=" + text);
 
-        setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
+        setDictionaryPrefs(this, dictFile, index.shortName);
 
         updateLangButton();
         searchView.requestFocus();
@@ -544,13 +595,6 @@ public class DictionaryActivity extends ActionBarActivity {
             ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         customSearchView.setLayoutParams(layoutParams);
 
-        listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int row, long id) {
-                onListItemClick(getListView(), view, row, id);
-            }
-        });
-
         languageButton = new ImageButton(customSearchView.getContext());
         languageButton.setId(R.id.languageButton);
         languageButton.setScaleType(ScaleType.FIT_CENTER);
@@ -626,16 +670,11 @@ public class DictionaryActivity extends ActionBarActivity {
         showKeyboard();
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
     /**
      * Invoked when MyWebView returns, since the user might have clicked some
      * hypertext in the MyWebView.
      */
+    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent result) {
         super.onActivityResult(requestCode, resultCode, result);
         if (result != null && result.hasExtra(C.SEARCH_TOKEN)) {
@@ -645,12 +684,14 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     private static void setDictionaryPrefs(final Context context, final File dictFile,
-                                           final String indexShortName, final String searchToken) {
+                                           final String indexShortName) {
         final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(
                 context).edit();
-        prefs.putString(C.DICT_FILE, dictFile.getPath());
-        prefs.putString(C.INDEX_SHORT_NAME, indexShortName);
-        prefs.putString(C.SEARCH_TOKEN, ""); // Don't need to save search token.
+        if (dictFile != null) {
+            prefs.putString(C.DICT_FILE, dictFile.getPath());
+            prefs.putString(C.INDEX_SHORT_NAME, indexShortName);
+        }
+        prefs.remove(C.SEARCH_TOKEN); // Don't need to save search token.
         prefs.commit();
     }
 
@@ -674,6 +715,9 @@ public class DictionaryActivity extends ActionBarActivity {
         textToSpeech.shutdown();
         textToSpeech = null;
 
+        indexAdapter = null;
+        setListAdapter(null);
+
         try {
             Log.d(LOG, "Closing RAF.");
             dictRaf.close();
@@ -715,11 +759,10 @@ public class DictionaryActivity extends ActionBarActivity {
         manager.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
     }
 
-    void updateLangButton() {
-        final LanguageResources languageResources =
-            DictionaryApplication.isoCodeToResources.get(index.shortName);
-        if (languageResources != null && languageResources.flagId != 0) {
-            languageButton.setImageResource(languageResources.flagId);
+    private void updateLangButton() {
+        final int flagId = IsoUtils.INSTANCE.getFlagIdForIsoCode(index.shortName);
+        if (flagId != 0) {
+            languageButton.setImageResource(flagId);
         } else {
             if (indexIndex % 2 == 0) {
                 languageButton.setImageResource(android.R.drawable.ic_media_next);
@@ -744,7 +787,8 @@ public class DictionaryActivity extends ActionBarActivity {
                 Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
             }
         } catch (Exception e) {
-            Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
         }
     }
 
@@ -772,14 +816,14 @@ public class DictionaryActivity extends ActionBarActivity {
                               searchView.getQuery().toString(), false);
     }
 
-    void onLanguageButtonLongClick(final Context context) {
+    private void onLanguageButtonLongClick(final Context context) {
         final Dialog dialog = new Dialog(context);
         dialog.setContentView(R.layout.select_dictionary_dialog);
         dialog.setTitle(R.string.selectDictionary);
 
         final List<DictionaryInfo> installedDicts = application.getDictionariesOnDevice(null);
 
-        ListView listView = (ListView) dialog.findViewById(android.R.id.list);
+        ListView listView = dialog.findViewById(android.R.id.list);
         final Button button = new Button(listView.getContext());
         final String name = getString(R.string.dictionaryManager);
         button.setText(name);
@@ -802,10 +846,10 @@ public class DictionaryActivity extends ActionBarActivity {
 
                 final LinearLayout result = new LinearLayout(parent.getContext());
 
-                for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
+                for (int i = 0; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) {
                     final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
-                    final View button = application.createButton(parent.getContext(),
-                                        dictionaryInfo, indexInfo);
+                    final View button = IsoUtils.INSTANCE.createButton(parent.getContext(),
+                            indexInfo, application.languageButtonPixels);
                     final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
                             getLaunchIntent(getApplicationContext(),
                                             application.getPath(dictionaryInfo.uncompressedFilename),
@@ -856,7 +900,7 @@ public class DictionaryActivity extends ActionBarActivity {
         dialog.show();
     }
 
-    void onUpDownButton(final boolean up) {
+    private void onUpDownButton(final boolean up) {
         if (isFiltered()) {
             return;
         }
@@ -881,7 +925,7 @@ public class DictionaryActivity extends ActionBarActivity {
         defocusSearchText();
     }
 
-    void onRandomWordButton() {
+    private void onRandomWordButton() {
         int destIndexEntry = rand.nextInt(index.sortedIndexEntries.size());
         final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
         setSearchText(dest.token, false);
@@ -893,8 +937,6 @@ public class DictionaryActivity extends ActionBarActivity {
     // Options Menu
     // --------------------------------------------------------------------------
 
-    final Random random = new Random();
-
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
 
@@ -925,7 +967,7 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
-        randomWordMenuItem = menu.add(getString(R.string.randomWord));
+        final MenuItem randomWordMenuItem = menu.add(getString(R.string.randomWord));
         randomWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
@@ -934,8 +976,6 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         });
 
-        application.onCreateGlobalOptionsMenu(this, menu);
-
         {
             final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager));
             MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
@@ -956,18 +996,22 @@ public class DictionaryActivity extends ActionBarActivity {
                     final Context context = getListView().getContext();
                     final Dialog dialog = new Dialog(context);
                     dialog.setContentView(R.layout.about_dictionary_dialog);
-                    final TextView textView = (TextView) dialog.findViewById(R.id.text);
+                    final TextView textView = dialog.findViewById(R.id.text);
 
-                    final String name = application.getDictionaryName(dictFile.getName());
-                    dialog.setTitle(name);
+                    dialog.setTitle(dictFileTitleName);
 
                     final StringBuilder builder = new StringBuilder();
                     final DictionaryInfo dictionaryInfo = dictionary.getDictionaryInfo();
-                    dictionaryInfo.uncompressedBytes = dictFile.length();
                     if (dictionaryInfo != null) {
+                        try {
+                            dictionaryInfo.uncompressedBytes = dictRaf.size();
+                        } catch (IOException e) {
+                        }
                         builder.append(dictionaryInfo.dictInfo).append("\n\n");
-                        builder.append(getString(R.string.dictionaryPath, dictFile.getPath()))
-                        .append("\n");
+                        if (dictFile != null) {
+                            builder.append(getString(R.string.dictionaryPath, dictFile.getPath()))
+                            .append("\n");
+                        }
                         builder.append(
                             getString(R.string.dictionarySize, dictionaryInfo.uncompressedBytes))
                         .append("\n");
@@ -1002,6 +1046,8 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
+        DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
+
         return true;
     }
 
@@ -1011,9 +1057,22 @@ public class DictionaryActivity extends ActionBarActivity {
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        AdapterContextMenuInfo adapterContextMenuInfo = (AdapterContextMenuInfo) menuInfo;
+        final AdapterContextMenuInfo adapterContextMenuInfo = (AdapterContextMenuInfo) menuInfo;
         final RowBase row = (RowBase) getListAdapter().getItem(adapterContextMenuInfo.position);
 
+        if (clickOpensContextMenu && (row instanceof HtmlEntry.Row ||
+            (row instanceof TokenRow && ((TokenRow)row).getIndexEntry().htmlEntries.size() > 0))) {
+            final List<HtmlEntry> html = row instanceof TokenRow ? ((TokenRow)row).getIndexEntry().htmlEntries : Collections.singletonList(((HtmlEntry.Row)row).getEntry());
+            final String highlight = row instanceof HtmlEntry.Row ? row.getTokenRow(true).getToken() : null;
+            final MenuItem open = menu.add("Open");
+            open.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                public boolean onMenuItemClick(MenuItem item) {
+                    showHtml(html, highlight);
+                    return false;
+                }
+            });
+        }
+
         final android.view.MenuItem addToWordlist = menu.add(getString(R.string.addToWordList,
                 wordList.getName()));
         addToWordlist
@@ -1129,7 +1188,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 Log.w(LOG, "Skipping findExact on index " + index.shortName);
             }
         }
-        if (numFound != 1 || indexToUse == -1) {
+        if (numFound != 1) {
             indexToUse = defaultIndexToUse;
         }
         // Without this extra delay, the call to jumpToRow that this
@@ -1147,7 +1206,7 @@ public class DictionaryActivity extends ActionBarActivity {
      * Called when user clicks outside of search text, so that they can start
      * typing again immediately.
      */
-    void defocusSearchText() {
+    private void defocusSearchText() {
         // Log.d(LOG, "defocusSearchText");
         // Request focus so that if we start typing again, it clears the text
         // input.
@@ -1158,15 +1217,20 @@ public class DictionaryActivity extends ActionBarActivity {
         // searchView.selectAll();
     }
 
-    protected void onListItemClick(ListView l, View v, int row, long id) {
+    private void onListItemClick(ListView l, View v, int rowIdx, long id) {
         defocusSearchText();
         if (clickOpensContextMenu && dictRaf != null) {
             openContextMenu(v);
+        } else {
+            final RowBase row = (RowBase)getListAdapter().getItem(rowIdx);
+            if (!(row instanceof PairEntry.Row)) {
+                v.performClick();
+            }
         }
     }
 
     @SuppressLint("SimpleDateFormat")
-    void onAppendToWordList(final RowBase row) {
+    private void onAppendToWordList(final RowBase row) {
         defocusSearchText();
 
         final StringBuilder rawText = new StringBuilder();
@@ -1183,15 +1247,15 @@ public class DictionaryActivity extends ActionBarActivity {
             out.close();
         } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
-            Toast.makeText(this,
-                           getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
-                           Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this,
+                               getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
+                               Toast.LENGTH_LONG).show();
         }
-        return;
     }
 
     @SuppressWarnings("deprecation")
-    void onCopy(final RowBase row) {
+    private void onCopy(final RowBase row) {
         defocusSearchText();
 
         Log.d(LOG, "Copy, row=" + row);
@@ -1242,7 +1306,7 @@ public class DictionaryActivity extends ActionBarActivity {
             indexAdapter = new IndexAdapter(index);
             setListAdapter(indexAdapter);
             Log.d(LOG, "changingIndex, newLang=" + index.longName);
-            setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
+            setDictionaryPrefs(this, dictFile, index.shortName);
             updateLangButton();
         }
         setSearchText(newSearchText, true, hideKeyboard);
@@ -1253,7 +1317,6 @@ public class DictionaryActivity extends ActionBarActivity {
         // Disable the listener, because sometimes it doesn't work.
         searchView.setOnQueryTextListener(null);
         searchView.setQuery(text, false);
-        moveCursorToRight();
         searchView.setOnQueryTextListener(onQueryTextListener);
 
         if (triggerSearch) {
@@ -1270,24 +1333,6 @@ public class DictionaryActivity extends ActionBarActivity {
         setSearchText(text, triggerSearch, true);
     }
 
-    // private long cursorDelayMillis = 100;
-    private void moveCursorToRight() {
-        // if (searchText.getLayout() != null) {
-        // cursorDelayMillis = 100;
-        // // Surprising, but this can crash when you rotate...
-        // Selection.moveToRightEdge(searchView.getQuery(),
-        // searchText.getLayout());
-        // } else {
-        // uiHandler.postDelayed(new Runnable() {
-        // @Override
-        // public void run() {
-        // moveCursorToRight();
-        // }
-        // }, cursorDelayMillis);
-        // cursorDelayMillis = Math.min(10 * 1000, 2 * cursorDelayMillis);
-        // }
-    }
-
     // --------------------------------------------------------------------------
     // SearchOperation
     // --------------------------------------------------------------------------
@@ -1335,7 +1380,7 @@ public class DictionaryActivity extends ActionBarActivity {
         getListView().setSelected(true);
     }
 
-    static final Pattern WHITESPACE = Pattern.compile("\\s+");
+    private static final Pattern WHITESPACE = Pattern.compile("\\s+");
 
     final class SearchOperation implements Runnable {
 
@@ -1405,11 +1450,15 @@ public class DictionaryActivity extends ActionBarActivity {
     // IndexAdapter
     // --------------------------------------------------------------------------
 
-    static ViewGroup.LayoutParams WEIGHT_1 = new LinearLayout.LayoutParams(
-        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
-
-    static ViewGroup.LayoutParams WEIGHT_0 = new LinearLayout.LayoutParams(
-        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f);
+    private void showHtml(final List<HtmlEntry> htmlEntries, final String htmlTextToHighlight) {
+        String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
+        // Log.d(LOG, "html=" + html);
+        startActivityForResult(
+            HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
+                    "<html><head><meta name=\"viewport\" content=\"width=device-width\"></head><body>%s</body></html>", html),
+                                              htmlTextToHighlight, false),
+            0);
+    }
 
     final class IndexAdapter extends BaseAdapter {
 
@@ -1437,13 +1486,23 @@ public class DictionaryActivity extends ActionBarActivity {
         IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {
             this.index = index;
             this.rows = rows;
-            this.toHighlight = new LinkedHashSet<String>(toHighlight);
+            this.toHighlight = new LinkedHashSet<>(toHighlight);
             getMetrics();
         }
 
         private void getMetrics() {
+            float scale = 1;
             // Get the screen's density scale
-            final float scale = getResources().getDisplayMetrics().density;
+            // The previous method getResources().getDisplayMetrics()
+            // used to occasionally trigger a null pointer exception,
+            // so try this instead.
+            // As it still crashes, add a fallback
+            try {
+                DisplayMetrics dm = new DisplayMetrics();
+                getWindowManager().getDefaultDisplay().getMetrics(dm);
+                scale = dm.density;
+            } catch (NullPointerException e)
+            {}
             // Convert the dps to pixels, based on density scale
             mPaddingDefault = (int) (PADDING_DEFAULT_DP * scale + 0.5f);
             mPaddingLarge = (int) (PADDING_LARGE_DP * scale + 0.5f);
@@ -1465,36 +1524,75 @@ public class DictionaryActivity extends ActionBarActivity {
         }
 
         @Override
-        public TableLayout getView(int position, View convertView, ViewGroup parent) {
-            final TableLayout result;
-            if (convertView instanceof TableLayout) {
-                result = (TableLayout) convertView;
-                result.removeAllViews();
+        public int getViewTypeCount() {
+            return 5;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            final RowBase row = getItem(position);
+            if (row instanceof PairEntry.Row) {
+                final PairEntry entry = ((PairEntry.Row)row).getEntry();
+                final int rowCount = entry.pairs.size();
+                return rowCount > 1 ? 1 : 0;
+            } else if (row instanceof TokenRow) {
+                final IndexEntry indexEntry = ((TokenRow)row).getIndexEntry();
+                return indexEntry.htmlEntries.isEmpty() ? 2 : 3;
+            } else if (row instanceof HtmlEntry.Row) {
+                return 4;
             } else {
-                result = new TableLayout(parent.getContext());
+                throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());
             }
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
             final RowBase row = getItem(position);
             if (row instanceof PairEntry.Row) {
-                return getView(position, (PairEntry.Row) row, parent, result);
+                return getView(position, (PairEntry.Row) row, parent, (TableLayout)convertView);
             } else if (row instanceof TokenRow) {
-                return getView((TokenRow) row, parent, result);
+                return getView((TokenRow) row, parent, (TextView)convertView);
             } else if (row instanceof HtmlEntry.Row) {
-                return getView((HtmlEntry.Row) row, parent, result);
+                return getView((HtmlEntry.Row) row, parent, (TextView)convertView);
             } else {
                 throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());
             }
         }
 
+        private void addBoldSpans(String token, String col1Text, Spannable col1Spannable) {
+            int startPos = 0;
+            while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
+                col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos
+                                      + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                startPos += token.length();
+            }
+        }
+
         private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent,
-                                    final TableLayout result) {
+                                    TableLayout result) {
+            final Context context = parent.getContext();
             final PairEntry entry = row.getEntry();
             final int rowCount = entry.pairs.size();
+            if (result == null) {
+                result = new TableLayout(context);
+                result.setStretchAllColumns(true);
+                // Because we have a Button inside a ListView row:
+                // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1
+                result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+                result.setClickable(true);
+                result.setFocusable(false);
+                result.setLongClickable(true);
+//                result.setBackgroundResource(android.R.drawable.menuitem_background);
 
-            final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
-            layoutParams.weight = 0.5f;
-            layoutParams.leftMargin = mPaddingLarge;
+                result.setBackgroundResource(theme.normalRowBg);
+            } else if (result.getChildCount() > rowCount) {
+                result.removeViews(rowCount, result.getChildCount() - rowCount);
+            }
+
+            for (int r = result.getChildCount(); r < rowCount; ++r) {
+                final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT);
+                layoutParams.leftMargin = mPaddingLarge;
 
-            for (int r = 0; r < rowCount; ++r) {
                 final TableRow tableRow = new TableRow(result.getContext());
 
                 final TextView col1 = new TextView(tableRow.getContext());
@@ -1503,51 +1601,25 @@ public class DictionaryActivity extends ActionBarActivity {
                     col1.setTextIsSelectable(true);
                     col2.setTextIsSelectable(true);
                 }
+                col1.setTextColor(textColorFg);
+                col2.setTextColor(textColorFg);
 
                 // Set the columns in the table.
                 if (r > 0) {
                     final TextView bullet = new TextView(tableRow.getContext());
-                    bullet.setText(" • ");
+                    bullet.setText(" •");
                     tableRow.addView(bullet);
                 }
                 tableRow.addView(col1, layoutParams);
-                final TextView margin = new TextView(tableRow.getContext());
-                margin.setText(" ");
-                tableRow.addView(margin);
                 if (r > 0) {
                     final TextView bullet = new TextView(tableRow.getContext());
-                    bullet.setText(" • ");
+                    bullet.setText(" •");
                     tableRow.addView(bullet);
                 }
                 tableRow.addView(col2, layoutParams);
                 col1.setWidth(1);
                 col2.setWidth(1);
 
-                // Set what's in the columns.
-
-                final Pair pair = entry.pairs.get(r);
-                final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;
-                final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;
-
-                col1.setText(col1Text, TextView.BufferType.SPANNABLE);
-                col2.setText(col2Text, TextView.BufferType.SPANNABLE);
-
-                // Bold the token instances in col1.
-                final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections
-                                           .singleton(row.getTokenRow(true).getToken());
-                final Spannable col1Spannable = (Spannable) col1.getText();
-                for (final String token : toBold) {
-                    int startPos = 0;
-                    while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
-                        col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos
-                                              + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-                        startPos += token.length();
-                    }
-                }
-
-                createTokenLinkSpans(col1, col1Spannable, col1Text);
-                createTokenLinkSpans(col2, (Spannable) col2.getText(), col2Text);
-
                 col1.setTypeface(typeface);
                 col2.setTypeface(typeface);
                 col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
@@ -1565,15 +1637,32 @@ public class DictionaryActivity extends ActionBarActivity {
                 result.addView(tableRow);
             }
 
-            // Because we have a Button inside a ListView row:
-            // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1
-            result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-            result.setClickable(true);
-            result.setFocusable(true);
-            result.setLongClickable(true);
-//            result.setBackgroundResource(android.R.drawable.menuitem_background);
+            for (int r = 0; r < rowCount; ++r) {
+                final TableRow tableRow = (TableRow)result.getChildAt(r);
+                final TextView col1 = (TextView)tableRow.getChildAt(r == 0 ? 0 : 1);
+                final TextView col2 = (TextView)tableRow.getChildAt(r == 0 ? 1 : 3);
 
-            result.setBackgroundResource(theme.normalRowBg);
+                // Set what's in the columns.
+                final Pair pair = entry.pairs.get(r);
+                final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;
+                final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;
+                final Spannable col1Spannable = new SpannableString(col1Text);
+                final Spannable col2Spannable = new SpannableString(col2Text);
+
+                // Bold the token instances in col1.
+                if (toHighlight != null) {
+                    for (final String token : toHighlight) {
+                        addBoldSpans(token, col1Text, col1Spannable);
+                    }
+                } else
+                    addBoldSpans(row.getTokenRow(true).getToken(), col1Text, col1Spannable);
+
+                createTokenLinkSpans(col1, col1Spannable, col1Text);
+                createTokenLinkSpans(col2, col2Spannable, col2Text);
+
+                col1.setText(col1Spannable);
+                col2.setText(col2Spannable);
+            }
 
             result.setOnClickListener(new TextView.OnClickListener() {
                 @Override
@@ -1585,42 +1674,41 @@ public class DictionaryActivity extends ActionBarActivity {
             return result;
         }
 
-        private TableLayout getPossibleLinkToHtmlEntryView(final boolean isTokenRow,
+        private TextView getPossibleLinkToHtmlEntryView(final boolean isTokenRow,
                 final String text, final boolean hasMainEntry, final List<HtmlEntry> htmlEntries,
-                final String htmlTextToHighlight, ViewGroup parent, final TableLayout result) {
+                final String htmlTextToHighlight, ViewGroup parent, TextView textView) {
             final Context context = parent.getContext();
+            if (textView == null) {
+                textView = new TextView(context);
+                // set up things invariant across one ItemViewType
+                // ItemViewTypes handled here are:
+                // 2: isTokenRow == true, htmlEntries.isEmpty() == true
+                // 3: isTokenRow == true, htmlEntries.isEmpty() == false
+                // 4: isTokenRow == false, htmlEntries.isEmpty() == false
+                textView.setPadding(isTokenRow ? mPaddingDefault : mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
+                textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
+                textView.setLongClickable(true);
+
+                textView.setTypeface(typeface);
+                if (isTokenRow) {
+                    textView.setTextAppearance(context, theme.tokenRowFg);
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+                } else {
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+                }
+                textView.setTextColor(textColorFg);
+                if (!htmlEntries.isEmpty()) {
+                    textView.setClickable(true);
+                    textView.setMovementMethod(LinkMovementMethod.getInstance());
+                }
+            }
 
-            final TableRow tableRow = new TableRow(result.getContext());
-            tableRow.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
+            textView.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
                                            : theme.tokenRowOtherBg);
-            if (isTokenRow) {
-                tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
-            } else {
-                tableRow.setPadding(mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
-            }
-            result.addView(tableRow);
 
             // Make it so we can long-click on these token rows, too:
-            final TextView textView = new TextView(context);
-            textView.setText(text, BufferType.SPANNABLE);
-            createTokenLinkSpans(textView, (Spannable) textView.getText(), text);
-            textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
-            result.setLongClickable(true);
-
-            // Doesn't work:
-            // textView.setTextColor(android.R.color.secondary_text_light);
-            textView.setTypeface(typeface);
-            TableRow.LayoutParams lp = new TableRow.LayoutParams(0);
-            if (isTokenRow) {
-                textView.setTextAppearance(context, theme.tokenRowFg);
-                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
-            } else {
-                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
-            }
-            lp.weight = 1.0f;
-
-            textView.setLayoutParams(lp);
-            tableRow.addView(textView);
+            final Spannable textSpannable = new SpannableString(text);
+            createTokenLinkSpans(textView, textSpannable, text);
 
             if (!htmlEntries.isEmpty()) {
                 final ClickableSpan clickableSpan = new ClickableSpan() {
@@ -1628,34 +1716,26 @@ public class DictionaryActivity extends ActionBarActivity {
                     public void onClick(View widget) {
                     }
                 };
-                ((Spannable) textView.getText()).setSpan(clickableSpan, 0, text.length(),
+                textSpannable.setSpan(clickableSpan, 0, text.length(),
                         Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-                result.setClickable(true);
-                textView.setClickable(true);
-                textView.setMovementMethod(LinkMovementMethod.getInstance());
                 textView.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
-                        // Log.d(LOG, "html=" + html);
-                        startActivityForResult(
-                            HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
-                                    "<html><head></head><body>%s</body></html>", html),
-                                                              htmlTextToHighlight, false),
-                            0);
+                        showHtml(htmlEntries, htmlTextToHighlight);
                     }
                 });
             }
-            return result;
+            textView.setText(textSpannable);
+            return textView;
         }
 
-        private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
+        private TextView getView(TokenRow row, ViewGroup parent, final TextView result) {
             final IndexEntry indexEntry = row.getIndexEntry();
             return getPossibleLinkToHtmlEntryView(true, indexEntry.token, row.hasMainEntry,
                                                   indexEntry.htmlEntries, null, parent, result);
         }
 
-        private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
+        private TextView getView(HtmlEntry.Row row, ViewGroup parent, final TextView result) {
             final HtmlEntry htmlEntry = row.getEntry();
             final TokenRow tokenRow = row.getTokenRow(true);
             return getPossibleLinkToHtmlEntryView(false,
@@ -1666,7 +1746,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
     }
 
-    static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
+    private static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
 
     private void createTokenLinkSpans(final TextView textView, final Spannable spannable,
                                       final String text) {
@@ -1675,15 +1755,15 @@ public class DictionaryActivity extends ActionBarActivity {
         textView.setMovementMethod(LinkMovementMethod.getInstance());
         final Matcher matcher = CHAR_DASH.matcher(text);
         while (matcher.find()) {
-            spannable.setSpan(new NonLinkClickableSpan(textColorFg), matcher.start(),
+            spannable.setSpan(new NonLinkClickableSpan(), matcher.start(),
                               matcher.end(),
                               Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
         }
     }
 
-    String selectedSpannableText = null;
+    private String selectedSpannableText = null;
 
-    int selectedSpannableIndex = -1;
+    private int selectedSpannableIndex = -1;
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
@@ -1712,22 +1792,22 @@ public class DictionaryActivity extends ActionBarActivity {
         }
     }
 
-    final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
+    private final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
         0);
 
-    final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
+    private final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
         1);
 
     // --------------------------------------------------------------------------
     // SearchText
     // --------------------------------------------------------------------------
 
-    void onSearchTextChange(final String text) {
+    private void onSearchTextChange(final String text) {
         if ("thadolina".equals(text)) {
             final Dialog dialog = new Dialog(getListView().getContext());
             dialog.setContentView(R.layout.thadolina_dialog);
             dialog.setTitle("Ti amo, amore mio!");
-            final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);
+            final ImageView imageView = dialog.findViewById(R.id.thadolina_image);
             imageView.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -1761,11 +1841,11 @@ public class DictionaryActivity extends ActionBarActivity {
     // Filtered results.
     // --------------------------------------------------------------------------
 
-    boolean isFiltered() {
+    private boolean isFiltered() {
         return rowsToShow != null;
     }
 
-    void setFiltered(final SearchOperation searchOperation) {
+    private void setFiltered(final SearchOperation searchOperation) {
         if (nextWordMenuItem != null) {
             nextWordMenuItem.setEnabled(false);
             previousWordMenuItem.setEnabled(false);
@@ -1774,7 +1854,7 @@ public class DictionaryActivity extends ActionBarActivity {
         setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));
     }
 
-    void clearFiltered() {
+    private void clearFiltered() {
         if (nextWordMenuItem != null) {
             nextWordMenuItem.setEnabled(true);
             previousWordMenuItem.setEnabled(true);