From 257d8df1d49c7d078ce7f1ed368a3d5d6c33685a Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 6 Dec 2012 14:11:30 +0400 Subject: [PATCH] Bug with skiped packages fixed. --- .../src/org/opencv/engine/manager/ManagerActivity.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java index f49ce8c..13f6c8f 100644 --- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java +++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java @@ -173,6 +173,7 @@ public class ManagerActivity extends Activity mInstalledPackageView.setOnItemClickListener(new OnItemClickListener() { public void onItemClick(AdapterView adapter, View view, int position, long id) { + //if (!mListViewItems.get((int) id).get("Name").equals("Built-in OpenCV library")); if (!mInstalledPackageInfo[(int) id].packageName.equals("org.opencv.engine")) { mInstalledPackageView.setTag(Integer.valueOf((int)id)); @@ -276,8 +277,12 @@ public class ManagerActivity extends Activity mInstalledPackageInfo = mMarket.GetInstalledOpenCVPackages(); mListViewItems.clear(); - for (int i = 0; i < mInstalledPackageInfo.length; i++) + int RealPackageCount = mInstalledPackageInfo.length; + for (int i = 0; i < RealPackageCount; i++) { + if (mInstalledPackageInfo[i] == null) + break; + // Convert to Items for package list view HashMap temp = new HashMap(); @@ -289,7 +294,6 @@ public class ManagerActivity extends Activity String PackageName = mInstalledPackageInfo[i].packageName; String VersionName = mInstalledPackageInfo[i].versionName; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) NativeLibDir = mInstalledPackageInfo[i].applicationInfo.nativeLibraryDir; else @@ -306,7 +310,13 @@ public class ManagerActivity extends Activity VersionName = NativeInfo.versionName(); } else + { + mInstalledPackageInfo[i] = mInstalledPackageInfo[RealPackageCount-1]; + mInstalledPackageInfo[RealPackageCount-1] = null; + RealPackageCount--; + i--; continue; + } } int idx = 0; -- 2.7.4