Undefind behavior in Async Service Helper fixed.
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 24 Oct 2012 08:28:31 +0000 (12:28 +0400)
committerAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 24 Oct 2012 08:28:31 +0000 (12:28 +0400)
modules/java/generator/src/java/android+AsyncServiceHelper.java
modules/java/generator/src/java/android+BaseLoaderCallback.java

index 80d8131..0ed4053 100644 (file)
@@ -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);
                                }
                             };
 
index 58045e3..edc9487 100644 (file)
@@ -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!");