From 64d2b5c125dbc1f0880cd4837f29a07916be0fe3 Mon Sep 17 00:00:00 2001
From: Thad Hughes <thad.hughes@gmail.com>
Date: Fri, 3 Feb 2012 17:06:45 -0800
Subject: [PATCH] Update manifest for launch!

---
 AndroidManifest.xml                           |  4 ++--
 res/values-de/strings.xml                     |  2 +-
 res/values/strings.xml                        |  2 +-
 .../dictionary/DictionaryActivity.java        | 23 +++++++------------
 .../android/dictionary/engine/Language.java   |  5 ++--
 5 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3e5b8b7..8fdac89 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,8 @@
  
  package="com.hughes.android.dictionary"
  
- android:versionCode="15"
- android:versionName="3.0.1"
+ android:versionCode="16"
+ android:versionName="3.1"
  android:installLocation="preferExternal">
 
  <uses-sdk android:minSdkVersion="4" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 311b56b..730d996 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,7 +18,7 @@
   <string name="deleteDictionary">Wörterbuch entfernen</string>
   <string name="indexInfo">%1$s: %2$,d Wörter</string>
 
-  <string name="thanksForUpdatingVersion">3.1_a</string>
+  <string name="thanksForUpdatingVersion">3.1_de_a</string>
 
   <!-- DictionaryActivity -->
   <string name="searchText">Suchtext</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e7d97dd..4d48c9d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,7 @@
   <string name="deleteDictionary">Delete dictionary</string>
   <string name="indexInfo">%1$s: %2$,d words</string>
 
-  <string name="thanksForUpdatingVersion">3.1_a</string>
+  <string name="thanksForUpdatingVersion">3.1_en_a</string>
 
   <!-- DictionaryActivity -->
   <string name="searchText">Search Text</string>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 6bfb379..ac828e6 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -387,22 +387,15 @@ public class DictionaryActivity extends ListActivity {
     if (dictRaf == null) {
       return;
     }
-    
+
+    final SearchOperation searchOperation = currentSearchOperation;
+    currentSearchOperation = null;
+
     // Before we close the RAF, we have to wind the current search down.
-    if (currentSearchOperation != null) {
+    if (searchOperation != null) {
       Log.d(LOG, "Interrupting search to shut down.");
-      final SearchOperation searchOperation = currentSearchOperation;
       currentSearchOperation = null;
       searchOperation.interrupted.set(true);
-      synchronized (searchOperation) {
-        while (!searchOperation.done) {
-          try {
-            searchOperation.wait();
-          } catch (InterruptedException e) {
-            Log.d(LOG, "Interrupted.", e);
-          }
-        }
-      }
     }
     
     try {
@@ -419,9 +412,7 @@ public class DictionaryActivity extends ListActivity {
   // --------------------------------------------------------------------------
 
   private void onClearSearchTextButton(final Button clearSearchTextButton) {
-    clearSearchTextButton.requestFocus();
-    searchText.setText("");
-    searchText.requestFocus();
+    setSearchText("", true);
     Log.d(LOG, "Trying to show soft keyboard.");
     final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
     manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
@@ -858,6 +849,8 @@ public class DictionaryActivity extends ListActivity {
             }
           });
         }
+      } catch (Exception e) {
+        Log.e(LOG, "Failure during search (can happen during Activity close.");
       } finally {
         synchronized (this) {
           done = true;
diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 768e378..8136120 100644
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -151,10 +151,11 @@ public class Language {
   }
   
   public synchronized Collator getCollator() {
-    if (collator == null) {
+    // Don't think this is thread-safe...
+//    if (collator == null) {
       this.collator = Collator.getInstance(locale);
       this.collator.setStrength(Collator.IDENTICAL);
-    }
+//    }
     return collator;
   }
   
-- 
2.43.0