Fix directory/dictionary mixup.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 8575fa6eda81b4262d268d5652f412860db79290..2f4eaae250142ab2724dd682d9deee32c88e8f7b 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -209,6 +209,19 @@ public class DictionaryActivity extends ActionBarActivity {
         outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
     }
 
+    private int getMatchLen(String search, Index.IndexEntry e)
+    {
+        if (e == null) return 0;
+        for (int i = 0; i < search.length(); ++i)
+        {
+            String a = search.substring(0, i + 1);
+            String b = e.token.substring(0, i + 1);
+            if (!a.equalsIgnoreCase(b))
+                return i;
+        }
+        return search.length();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // This needs to be before super.onCreate, otherwise ActionbarSherlock
@@ -301,6 +314,12 @@ public class DictionaryActivity extends ActionBarActivity {
             if (query != null)
                 getIntent().putExtra(C.SEARCH_TOKEN, query);
         }
+        if (intentAction != null && intentAction.equals(Intent.ACTION_SEND))
+        {
+            String query = intent.getStringExtra(Intent.EXTRA_TEXT);
+            if (query != null)
+                getIntent().putExtra(C.SEARCH_TOKEN, query);
+        }
         /*
          * This processes text on M+ devices where QuickDic shows up in the context menu.
          */
@@ -313,7 +332,7 @@ public class DictionaryActivity extends ActionBarActivity {
         /**
          * @author Dominik Köppl If no dictionary is chosen, use the default
          *         dictionary specified in the preferences If this step does
-         *         fail (no default directory specified), show a toast and
+         *         fail (no default dictionary specified), show a toast and
          *         abort.
          */
         if (intent.getStringExtra(C.DICT_FILE) == null)
@@ -323,6 +342,38 @@ public class DictionaryActivity extends ActionBarActivity {
                 intent.putExtra(C.DICT_FILE, application.getPath(dictfile).toString());
         }
         String dictFilename = intent.getStringExtra(C.DICT_FILE);
+        if (dictFilename == null && intent.getStringExtra(C.SEARCH_TOKEN) != null)
+        {
+            final List<DictionaryInfo> dics = application.getDictionariesOnDevice(null);
+            final String search = intent.getStringExtra(C.SEARCH_TOKEN);
+            String bestFname = null;
+            String bestIndex = null;
+            int bestMatchLen = 2; // ignore shorter matches
+            AtomicBoolean dummy = new AtomicBoolean();
+            for (int i = 0; dictFilename == null && i < dics.size(); ++i)
+            {
+                try {
+                    final String fname = dics.get(i).uncompressedFilename;
+                    Dictionary dic = new Dictionary(new RandomAccessFile(new File(fname), "r"));
+                    for (int j = 0; j < dic.indices.size(); ++j) {
+                        Index idx = dic.indices.get(j);
+                        if (idx.findExact(search) != null)
+                        {
+                            dictFilename = fname;
+                            intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+                            break;
+                        }
+                        int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
+                        if (matchLen > bestMatchLen)
+                        {
+                            dictFilename = fname;
+                            intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+                            bestMatchLen = matchLen;
+                        }
+                    }
+                } catch (Exception e) {}
+            }
+        }
 
         if (dictFilename == null)
         {
@@ -532,15 +583,8 @@ public class DictionaryActivity extends ActionBarActivity {
         languageButton.setScaleType(ScaleType.FIT_CENTER);
         languageButton.setOnClickListener(new OnClickListener() {
             @Override
-            public void onClick(View arg0) {
-                onLanguageButtonClick();
-            }
-        });
-        languageButton.setOnLongClickListener(new OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+            public void onClick(View v) {
                 onLanguageButtonLongClick(v.getContext());
-                return true;
             }
         });
         languageButton.setAdjustViewBounds(true);