Commit 7541c590 authored by Maksim Shabunin's avatar Maksim Shabunin

AndroidMgr: Reversed file existence checking

parent caffbaaf
...@@ -11,16 +11,18 @@ import android.text.TextUtils; ...@@ -11,16 +11,18 @@ import android.text.TextUtils;
import java.io.File; import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
public class OpenCVEngineService extends Service { public class OpenCVEngineService extends Service {
private static final String TAG = "OpenCVEngine/Service"; private static final String TAG = "OpenCVEngine/Service";
private IBinder mEngineInterface = null; private IBinder mEngineInterface = null;
private ArrayList<LibVariant> variants = new ArrayList<LibVariant>(); private List<LibVariant> variants = new ArrayList<LibVariant>();
private class LibVariant { private class LibVariant {
public String version; public String version;
public ArrayList<String> files; public List<String> files;
public void parseFile(XmlResourceParser p) { public void parseFile(XmlResourceParser p) {
try { try {
...@@ -51,10 +53,9 @@ public class OpenCVEngineService extends Service { ...@@ -51,10 +53,9 @@ public class OpenCVEngineService extends Service {
public boolean hasAllFiles(String path) { public boolean hasAllFiles(String path) {
boolean result = true; boolean result = true;
File f = new File(path); List<String> actualFiles = Arrays.asList((new File(path)).list());
for (File one : f.listFiles()) { for (String f : files)
result &= files.contains(one.getName()); result &= actualFiles.contains(f);
}
return result; return result;
} }
...@@ -100,6 +101,7 @@ public class OpenCVEngineService extends Service { ...@@ -100,6 +101,7 @@ public class OpenCVEngineService extends Service {
&& lib.files.size() != 0 && lib.files.size() != 0
&& lib.hasAllFiles(getApplication().getApplicationInfo().nativeLibraryDir)) { && lib.hasAllFiles(getApplication().getApplicationInfo().nativeLibraryDir)) {
variants.add(lib); variants.add(lib);
Log.d(TAG, "Added config: " + lib.version);
} }
} }
super.onCreate(); super.onCreate();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment