From b1d14f766de49d572e90443522a7e0df4a2e3992 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 18 Sep 2012 10:52:28 +0400
Subject: [PATCH] Bug with several "in use" labels fixed in OpenCV Manager UI.

---
 android/service/engine/AndroidManifest.xml        |  6 +++---
 .../opencv/engine/manager/ManagerActivity.java    | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml
index 4e7e77cc81..b8aea3ee46 100644
--- a/android/service/engine/AndroidManifest.xml
+++ b/android/service/engine/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.opencv.engine"
-    android:versionCode="15"
-    android:versionName="1.5" >
+    android:versionCode="16"
+    android:versionName="1.6" >
 
     <uses-sdk android:minSdkVersion="8" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
@@ -17,7 +17,7 @@
     	</intent-filter>
     </service>
 
-    <activity 
+    <activity
         android:name="org.opencv.engine.manager.ManagerActivity"
         android:label="@string/app_name"
         android:screenOrientation="portrait">
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 6813164d09..9295146f8c 100644
--- a/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
+++ b/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
@@ -308,10 +308,19 @@ public class ManagerActivity extends Activity
 	           	ActivePackagePath = mActivePackageMap.get(OpenCVersion);
 	            Log.d(TAG, OpenCVersion + " -> " + ActivePackagePath);
 
-	            if (null != ActivePackagePath && ActivePackagePath.indexOf(mInstalledPackageInfo[i].packageName) >= 0)
+	            if (null != ActivePackagePath)
 	            {
-	            	temp.put("Activity", "y");
-	            	PublicName += " (in use)";
+	            	int start = ActivePackagePath.indexOf(mInstalledPackageInfo[i].packageName);
+	            	int stop = start + mInstalledPackageInfo[i].packageName.length();
+	            	if (start >= 0 && ActivePackagePath.charAt(stop) == '/')
+	            	{
+	            		temp.put("Activity", "y");
+	            		PublicName += " (in use)";
+	            	}
+	            	else
+	            	{
+	            		temp.put("Activity", "n");
+	            	}
 	            }
 	            else
 	            {