Fix intent search introduced in last version.

Fixes issue #145
rdoeffinger · Sep 11, 2021 · 0406523 · 0406523
1 parent abd7512
commit 0406523
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hughes.android.dictionary"
     android:installLocation="auto"
-    android:versionCode="114"
-    android:versionName="5.5.9" >
+    android:versionCode="115"
+    android:versionName="5.6.0" >
 
     <uses-feature
         android:name="android.hardware.touchscreen"

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -373,7 +373,7 @@ public void onCreate(Bundle savedInstanceState) {
 
                         }
                         intent.putExtra(C.DICT_FILE, application.getPath(info.uncompressedFilename)
-                                        .toString());
+                                        .getUri().toString());
                         break;
                     }
                 }
@@ -428,7 +428,7 @@ public void onCreate(Bundle savedInstanceState) {
         if (intent.getStringExtra(C.DICT_FILE) == null) {
             String dictfile = prefs.getString(getString(R.string.defaultDicKey), null);
             if (dictfile != null)
-                intent.putExtra(C.DICT_FILE, application.getPath(dictfile).toString());
+                intent.putExtra(C.DICT_FILE, application.getPath(dictfile).getUri().toString());
         }
         String dictFilename = intent.getStringExtra(C.DICT_FILE);
         if (dictFilename == null && intent.getStringExtra(C.SEARCH_TOKEN) != null) {
@@ -449,14 +449,14 @@ public void onCreate(Bundle savedInstanceState) {
                         Log.d(LOG, "Checking index " + idx.shortName);
                         if (idx.findExact(search) != null) {
                             Log.d(LOG, "Found exact match");
-                            dictFilename = dictfile.toString();
+                            dictFilename = dictfile.getUri().toString();
                             intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
                             break;
                         }
                         int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
                         Log.d(LOG, "Found partial match length " + matchLen);
                         if (matchLen > bestMatchLen) {
-                            bestFname = dictfile.toString();
+                            bestFname = dictfile.getUri().toString();
                             bestIndex = idx.shortName;
                             bestMatchLen = matchLen;
                         }