From 4f0f6686d171f09a4b71af748087a221ef090d46 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 24 Oct 2012 12:28:31 +0400 Subject: [PATCH] Undefind behavior in Async Service Helper fixed. --- .../generator/src/java/android+AsyncServiceHelper.java | 18 +++++++++++------- .../generator/src/java/android+BaseLoaderCallback.java | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java index 80d8131..0ed4053 100644 --- a/modules/java/generator/src/java/android+AsyncServiceHelper.java +++ b/modules/java/generator/src/java/android+AsyncServiceHelper.java @@ -118,7 +118,7 @@ class AsyncServiceHelper } else { - Log.d(TAG, "Wating current installation process"); + Log.d(TAG, "Waiting current installation process"); InstallCallbackInterface WaitQuery = new InstallCallbackInterface() { private LoaderCallbackInterface mUserAppCallback = Callback; public String getPackageName() @@ -268,17 +268,21 @@ class AsyncServiceHelper { Log.d(TAG, "OpenCV package was not installed!"); mStatus = LoaderCallbackInterface.MARKET_ERROR; + Log.d(TAG, "Init finished with status " + mStatus); + Log.d(TAG, "Unbind from service"); + mAppContext.unbindService(mServiceConnection); + Log.d(TAG, "Calling using callback"); + mUserAppCallback.onManagerConnected(mStatus); } } catch (RemoteException e) { e.printStackTrace(); mStatus = LoaderCallbackInterface.INIT_FAILED; + Log.d(TAG, "Init finished with status " + mStatus); + Log.d(TAG, "Unbind from service"); + mAppContext.unbindService(mServiceConnection); + Log.d(TAG, "Calling using callback"); + mUserAppCallback.onManagerConnected(mStatus); } - - Log.d(TAG, "Init finished with status " + mStatus); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(mStatus); } }; diff --git a/modules/java/generator/src/java/android+BaseLoaderCallback.java b/modules/java/generator/src/java/android+BaseLoaderCallback.java index 58045e3..edc9487 100644 --- a/modules/java/generator/src/java/android+BaseLoaderCallback.java +++ b/modules/java/generator/src/java/android+BaseLoaderCallback.java @@ -28,7 +28,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface { /** OpenCV loader can not start Google Play Market. **/ case LoaderCallbackInterface.MARKET_ERROR: { - Log.d(TAG, "Google Play service is not installed! You can get it here"); + Log.e(TAG, "Package installation failed!"); AlertDialog MarketErrorMessage = new AlertDialog.Builder(mAppContext).create(); MarketErrorMessage.setTitle("OpenCV Manager"); MarketErrorMessage.setMessage("Package installation failed!"); -- 2.7.4