Update manifest for launch!

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3e5b8b709227958d6445381a31f1232aea4fdd1e..8fdac89697e631d810b80a29ec659dabf410b3a8 100644 (file)
--- 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 311b56b5350bd036fb31fd5ba2c8eaa7346bf5a5..730d9969245ff6f2eb59b50d4a7d094a34623261 100644 (file)
--- 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 e7d97dd3696ea49a94365edf00201f724f149885..4d48c9d7027281ebf614881d4a7f01d3e002e074 100644 (file)
--- 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 6bfb379dd3bc6b54dccd2ee104bf7f5ac4a39a07..ac828e6092a8633db7b2a47b3931d093e7ad80b6 100644 (file)
--- 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) {\r
       return;\r
     }\r
-    \r
+\r
+    final SearchOperation searchOperation = currentSearchOperation;\r
+    currentSearchOperation = null;\r
+\r
     // Before we close the RAF, we have to wind the current search down.\r
-    if (currentSearchOperation != null) {\r
+    if (searchOperation != null) {\r
       Log.d(LOG, "Interrupting search to shut down.");\r
-      final SearchOperation searchOperation = currentSearchOperation;\r
       currentSearchOperation = null;\r
       searchOperation.interrupted.set(true);\r
-      synchronized (searchOperation) {\r
-        while (!searchOperation.done) {\r
-          try {\r
-            searchOperation.wait();\r
-          } catch (InterruptedException e) {\r
-            Log.d(LOG, "Interrupted.", e);\r
-          }\r
-        }\r
-      }\r
     }\r
     \r
     try {\r
@@ -419,9 +412,7 @@ public class DictionaryActivity extends ListActivity {
   // --------------------------------------------------------------------------\r
 \r
   private void onClearSearchTextButton(final Button clearSearchTextButton) {\r
-    clearSearchTextButton.requestFocus();\r
-    searchText.setText("");\r
-    searchText.requestFocus();\r
+    setSearchText("", true);\r
     Log.d(LOG, "Trying to show soft keyboard.");\r
     final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
     manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);\r
@@ -858,6 +849,8 @@ public class DictionaryActivity extends ListActivity {
             }\r
           });\r
         }\r
+      } catch (Exception e) {\r
+        Log.e(LOG, "Failure during search (can happen during Activity close.");\r
       } finally {\r
         synchronized (this) {\r
           done = true;\r

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 768e378490ad83ae86fe2d7e88995ba624dc8412..8136120abfbcc268801f59edf537e6373ced75d0 100644 (file)
--- 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 {
   }\r
   \r
   public synchronized Collator getCollator() {\r
-    if (collator == null) {\r
+    // Don't think this is thread-safe...\r
+//    if (collator == null) {\r
       this.collator = Collator.getInstance(locale);\r
       this.collator.setStrength(Collator.IDENTICAL);\r
-    }\r
+//    }\r
     return collator;\r
   }\r
   \r