"in use" label update fix in OpenCV Manager UI.
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Tue, 18 Sep 2012 06:09:31 +0000 (10:09 +0400)
committerAlexander Smorkalov <alexander.smorkalov@itseez.com>
Tue, 18 Sep 2012 07:07:26 +0000 (11:07 +0400)
android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java

index 6f106d6..6813164 100644 (file)
@@ -185,7 +185,7 @@ public class ManagerActivity extends Activity
         filter.addAction(Intent.ACTION_PACKAGE_INSTALL);
         filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
         filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
-
+        
         registerReceiver(mPackageChangeReciever, filter);
     }
 
@@ -199,7 +199,11 @@ public class ManagerActivity extends Activity
     protected void onResume() {
        super.onResume();
        Log.d(TAG, "Filling package list on resume");
-       FillPackageList();
+        if (!bindService(new Intent("org.opencv.engine.BIND"), mServiceConnection, Context.BIND_AUTO_CREATE))
+        {
+               TextView EngineVersionView = (TextView)findViewById(R.id.EngineVersionValue);
+               EngineVersionView.setText("not avaliable");
+        }
     }
 
     protected SimpleAdapter mInstalledPacksAdapter;
@@ -218,9 +222,13 @@ public class ManagerActivity extends Activity
 
                @Override
                public void onReceive(Context context, Intent intent) {
-                       Log.d("OpenCV Manager/Reciever", "Bradcast message " + intent.getAction() + " reciever");
-                       Log.d("OpenCV Manager/Reciever", "Filling package list on broadcast message");
-                       FillPackageList();
+                       Log.d("OpenCVManager/Reciever", "Bradcast message " + intent.getAction() + " reciever");
+                       Log.d("OpenCVManager/Reciever", "Filling package list on broadcast message");
+               if (!bindService(new Intent("org.opencv.engine.BIND"), mServiceConnection, Context.BIND_AUTO_CREATE))
+               {
+                       TextView EngineVersionView = (TextView)findViewById(R.id.EngineVersionValue);
+                       EngineVersionView.setText("not avaliable");
+               }
                }
        };
 
index b684ce1..15987da 100644 (file)
@@ -23,7 +23,6 @@ public class PackageListAdapter extends SimpleAdapter {
          View view = super.getView(position, convertView, parent);
          @SuppressWarnings("unchecked")
          Map<String, String> item = (Map<String, String>)getItem(position);
-         Log.d("PackageListAdapter", item.get("Activity"));
          if (item.get("Activity") == "y")
          {
                  view.setBackgroundColor(0x50ffffff);