From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sun, 30 Oct 2016 00:00:49 +0000 (+0200)
Subject: List files only once, also avoids a potential race condition.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=e80b754605d7734346da688d9549ee06c85b4ebf

List files only once, also avoids a potential race condition.
---

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 5d1ca0e..1e46f4b 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -406,7 +406,8 @@ public class DictionaryApplication extends Application {
         final File defaultDictDir = new File(Environment.getExternalStorageDirectory(), "quickDic");
         String dir = defaultDictDir.getAbsolutePath();
         File dictDir = new File(dir);
-        if (dictDir.isDirectory() && dictDir.list() != null && dictDir.list().length > 0) {
+        String[] fileList = dictDir.isDirectory() ? dictDir.list() : null;
+        if (fileList != null && fileList.length > 0) {
             return dir;
         }
         File efd = null;