merged Android samples

diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
index a47eb46..61f7db3 100644 (file)
--- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
+++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java
@@ -1,5 +1,9 @@
 package org.opencv.samples.colorblobdetect;
 
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -12,6 +16,38 @@ public class ColorBlobDetectionActivity extends Activity {
        private static final String TAG = "Example/ColorBlobDetection";
        private ColorBlobDetectionView mView;
        
+          private BaseLoaderCallback  mOpenCVCallBack = new BaseLoaderCallback(this) {
+               @Override
+               public void onManagerConnected(int status) {
+                       switch (status) {
+                                       case LoaderCallbackInterface.SUCCESS:
+                                       {
+                                               Log.i(TAG, "OpenCV loaded successfully");
+                                               // Create and set View
+                                               mView = new ColorBlobDetectionView(mAppContext);
+                                               setContentView(mView);
+                                               // Check native OpenCV camera
+                                               if( !mView.openCamera() ) {
+                                                       AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
+                                                       ad.setCancelable(false); // This blocks the 'BACK' button
+                                                       ad.setMessage("Fatal error: can't open camera!");
+                                                       ad.setButton("OK", new DialogInterface.OnClickListener() {
+                                                           public void onClick(DialogInterface dialog, int which) {
+                                                               dialog.dismiss();
+                                                               finish();
+                                                           }
+                                                       });
+                                                       ad.show();
+                                               }
+                                       } break;
+                                       default:
+                                       {
+                                               super.onManagerConnected(status);
+                                       } break;
+                               }
+               }
+               };
+       
        public ColorBlobDetectionActivity()
        {
                Log.i(TAG, "Instantiated new " + this.getClass());
@@ -21,14 +57,15 @@ public class ColorBlobDetectionActivity extends Activity {
        protected void onPause() {
         Log.i(TAG, "onPause");
                super.onPause();
-               mView.releaseCamera();
+               if (null != mView)
+                       mView.releaseCamera();
        }
 
        @Override
        protected void onResume() {
         Log.i(TAG, "onResume");
                super.onResume();
-               if( !mView.openCamera() ) {
+               if( (null != mView) && !mView.openCamera() ) {
                        AlertDialog ad = new AlertDialog.Builder(this).create();  
                        ad.setCancelable(false); // This blocks the 'BACK' button  
                        ad.setMessage("Fatal error: can't open camera!");  
@@ -47,8 +84,14 @@ public class ColorBlobDetectionActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {        
         Log.i(TAG, "onCreate");
         super.onCreate(savedInstanceState);
+        
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mView = new ColorBlobDetectionView(this);
-        setContentView(mView);
+        
+        Log.i(TAG, "Trying to load OpenCV library");
+        if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
+        {
+               Log.e(TAG, "Cannot connect to OpenCV Manager");
+               finish();
+        }
     }
 }
\ No newline at end of file

diff --git a/samples/android/fix_properties.bat b/samples/android/fix_properties.bat
index 6750c4e..134f6ef 100644 (file)
--- a/samples/android/fix_properties.bat
+++ b/samples/android/fix_properties.bat
@@ -4,5 +4,5 @@ call android update project --target android-11 --library ../../OpenCV-2.4.1/ --
 call android update project --target android-11                               --name "Tutorial 0 (Basic) - Android Camera"            --path ./tutorial-0-androidcamera
 call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 1 (Basic) - Add OpenCV"                --path ./tutorial-1-addopencv
 call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 2 (Basic) - Use OpenCV Camera"         --path ./tutorial-2-opencvcamera
-call android update project --target android-11                               --name "Tutorial 3 (Advanced) - Add Native OpenCV"      --path ./tutorial-3-native
+call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 3 (Advanced) - Add Native OpenCV"      --path ./tutorial-3-native
 call android update project --target android-11 --library ../../OpenCV-2.4.1/ --name "Tutorial 4 (Advanced) - Mix Java+Native OpenCV" --path ./tutorial-4-mixed
\ No newline at end of file

diff --git a/samples/android/fix_properties.sh b/samples/android/fix_properties.sh
index ea11ee5..2d2b88f 100644 (file)
--- a/samples/android/fix_properties.sh
+++ b/samples/android/fix_properties.sh
@@ -4,7 +4,7 @@ android update project --target android-11 --library ../../OpenCV-2.4.0/ --name
 android update project --target android-11                               --name "Tutorial 0 (Basic) - Android Camera"            --path ./tutorial-0-androidcamera
 android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 1 (Basic) - Add OpenCV"                --path ./tutorial-1-addopencv
 android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 2 (Basic) - Use OpenCV Camera"         --path ./tutorial-2-opencvcamera
-android update project --target android-11                               --name "Tutorial 3 (Advanced) - Add Native OpenCV"      --path ./tutorial-3-native
+android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 3 (Advanced) - Add Native OpenCV"      --path ./tutorial-3-native
 android update project --target android-11 --library ../../OpenCV-2.4.0/ --name "Tutorial 4 (Advanced) - Mix Java+Native OpenCV" --path ./tutorial-4-mixed
 
 exit

diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
index b720f77..d595165 100644 (file)
--- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
+++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
@@ -1,5 +1,7 @@
 package org.opencv.samples.imagemanipulations;
 
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
 import org.opencv.android.OpenCVLoader;
 
 import android.app.Activity;
@@ -36,6 +38,38 @@ public class ImageManipulationsActivity extends Activity {
     public static int           viewMode = VIEW_MODE_RGBA;
     
     private ImageManipulationsView mView;
+    
+    private BaseLoaderCallback  mOpenCVCallBack = new BaseLoaderCallback(this) {
+       @Override
+       public void onManagerConnected(int status) {
+               switch (status) {
+                               case LoaderCallbackInterface.SUCCESS:
+                               {
+                                       Log.i(TAG, "OpenCV loaded successfully");
+                                       // Create and set View
+                                       mView = new ImageManipulationsView(mAppContext);
+                                       setContentView(mView);
+                                       // Check native OpenCV camera
+                                       if( !mView.openCamera() ) {
+                                               AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
+                                               ad.setCancelable(false); // This blocks the 'BACK' button
+                                               ad.setMessage("Fatal error: can't open camera!");
+                                               ad.setButton("OK", new DialogInterface.OnClickListener() {
+                                                   public void onClick(DialogInterface dialog, int which) {
+                                                       dialog.dismiss();
+                                                       finish();
+                                                   }
+                                               });
+                                               ad.show();
+                                       }
+                               } break;
+                               default:
+                               {
+                                       super.onManagerConnected(status);
+                               } break;
+                       }
+       }
+       };
 
     public ImageManipulationsActivity() {
         Log.i(TAG, "Instantiated new " + this.getClass());
@@ -45,14 +79,15 @@ public class ImageManipulationsActivity extends Activity {
        protected void onPause() {
         Log.i(TAG, "onPause");
                super.onPause();
-               mView.releaseCamera();
+               if (null != mView)
+                       mView.releaseCamera();
        }
 
        @Override
        protected void onResume() {
         Log.i(TAG, "onResume");
                super.onResume();
-               if( !mView.openCamera() ) {
+               if( (null != mView) && !mView.openCamera() ) {
                        AlertDialog ad = new AlertDialog.Builder(this).create();  
                        ad.setCancelable(false); // This blocks the 'BACK' button  
                        ad.setMessage("Fatal error: can't open camera!");  
@@ -72,16 +107,12 @@ public class ImageManipulationsActivity extends Activity {
         Log.i(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        /** Try to load OpenCV library **/
-        if (OpenCVLoader.initDebug())
-        {
-                mView = new ImageManipulationsView(this);
-                setContentView(mView);
-        }
-        else
+        
+        Log.i(TAG, "Trying to load OpenCV library");
+        if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
         {
-                       Log.e(TAG, "OpenCV loading failed!");
-                       finish();
+               Log.e(TAG, "Cannot connect to OpenCV Manager");
+               finish();
         }
     }
 

diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
index 83732d3..645f4f1 100644 (file)
--- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java
@@ -1,5 +1,9 @@
 package org.opencv.samples.tutorial1;
 
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -17,6 +21,38 @@ public class Sample1Java extends Activity {
     private MenuItem            mItemPreviewCanny;
     private Sample1View         mView;
 
+    private BaseLoaderCallback  mOpenCVCallBack = new BaseLoaderCallback(this) {
+       @Override
+       public void onManagerConnected(int status) {
+               switch (status) {
+                               case LoaderCallbackInterface.SUCCESS:
+                               {
+                                       Log.i(TAG, "OpenCV loaded successfully");
+                                       // Create and set View
+                                       mView = new Sample1View(mAppContext);
+                                       setContentView(mView);
+                                       // Check native OpenCV camera
+                                       if( !mView.openCamera() ) {
+                                               AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
+                                               ad.setCancelable(false); // This blocks the 'BACK' button
+                                               ad.setMessage("Fatal error: can't open camera!");
+                                               ad.setButton("OK", new DialogInterface.OnClickListener() {
+                                                   public void onClick(DialogInterface dialog, int which) {
+                                                       dialog.dismiss();
+                                                       finish();
+                                                   }
+                                               });
+                                               ad.show();
+                                       }
+                               } break;
+                               default:
+                               {
+                                       super.onManagerConnected(status);
+                               } break;
+                       }
+       }
+       };
+    
     public Sample1Java() {
         Log.i(TAG, "Instantiated new " + this.getClass());
     }
@@ -25,14 +61,15 @@ public class Sample1Java extends Activity {
        protected void onPause() {
         Log.i(TAG, "onPause");
                super.onPause();
-               mView.releaseCamera();
+               if (null != mView)
+                       mView.releaseCamera();
        }
 
        @Override
        protected void onResume() {
         Log.i(TAG, "onResume");
                super.onResume();
-               if( !mView.openCamera() ) {
+               if( (null != mView) && !mView.openCamera() ) {
                        AlertDialog ad = new AlertDialog.Builder(this).create();  
                        ad.setCancelable(false); // This blocks the 'BACK' button  
                        ad.setMessage("Fatal error: can't open camera!");  
@@ -52,8 +89,13 @@ public class Sample1Java extends Activity {
         Log.i(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mView = new Sample1View(this);
-        setContentView(mView);
+
+        Log.i(TAG, "Trying to load OpenCV library");
+        if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
+        {
+               Log.e(TAG, "Cannot connect to OpenCV Manager");
+               finish();
+        }
     }
 
     @Override

diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
index 781a37c..706f0a5 100644 (file)
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
@@ -1,5 +1,9 @@
 package org.opencv.samples.tutorial2;
 
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -24,6 +28,38 @@ public class Sample2NativeCamera extends Activity {
     
     private Sample2View                mView;
 
+    private BaseLoaderCallback  mOpenCVCallBack = new BaseLoaderCallback(this) {
+       @Override
+       public void onManagerConnected(int status) {
+               switch (status) {
+                               case LoaderCallbackInterface.SUCCESS:
+                               {
+                                       Log.i(TAG, "OpenCV loaded successfully");
+                                       // Create and set View
+                                       mView = new Sample2View(mAppContext);
+                                       setContentView(mView);
+                                       // Check native OpenCV camera
+                                       if( !mView.openCamera() ) {
+                                               AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
+                                               ad.setCancelable(false); // This blocks the 'BACK' button
+                                               ad.setMessage("Fatal error: can't open camera!");
+                                               ad.setButton("OK", new DialogInterface.OnClickListener() {
+                                                   public void onClick(DialogInterface dialog, int which) {
+                                                       dialog.dismiss();
+                                                       finish();
+                                                   }
+                                               });
+                                               ad.show();
+                                       }
+                               } break;
+                               default:
+                               {
+                                       super.onManagerConnected(status);
+                               } break;
+                       }
+       }
+       };
+    
     public Sample2NativeCamera() {
         Log.i(TAG, "Instantiated new " + this.getClass());
     }
@@ -32,14 +68,15 @@ public class Sample2NativeCamera extends Activity {
        protected void onPause() {
         Log.i(TAG, "onPause");
                super.onPause();
-               mView.releaseCamera();
+               if (null != mView)
+                       mView.releaseCamera();
        }
 
        @Override
        protected void onResume() {
         Log.i(TAG, "onResume");
                super.onResume();
-               if( !mView.openCamera() ) {
+               if((null != mView) && !mView.openCamera() ) {
                        AlertDialog ad = new AlertDialog.Builder(this).create();  
                        ad.setCancelable(false); // This blocks the 'BACK' button  
                        ad.setMessage("Fatal error: can't open camera!");  
@@ -59,8 +96,12 @@ public class Sample2NativeCamera extends Activity {
         Log.i(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mView = new Sample2View(this);
-        setContentView(mView);
+        Log.i(TAG, "Trying to load OpenCV library");
+        if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
+        {
+               Log.e(TAG, "Cannot connect to OpenCV Manager");
+               finish();
+        }
     }
 
     @Override

diff --git a/samples/android/tutorial-3-native/CMakeLists.txt b/samples/android/tutorial-3-native/CMakeLists.txt
index 6b790e4..c3c1970 100644 (file)
--- a/samples/android/tutorial-3-native/CMakeLists.txt
+++ b/samples/android/tutorial-3-native/CMakeLists.txt
@@ -1,6 +1,12 @@
 set(sample example-tutorial-3-native)
 
-add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS opencv_features2d)
+if(BUILD_FAT_JAVA_LIB)
+  set(native_deps opencv_java)
+else()
+  set(native_deps opencv_features2d)
+endif()
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS ${native_deps})
 if(TARGET ${sample})
   add_dependencies(opencv_android_examples ${sample})
 endif()

diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
index 73fd47c..201ba16 100644 (file)
--- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
+++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java
@@ -1,5 +1,9 @@
 package org.opencv.samples.tutorial3;
 
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -10,6 +14,42 @@ import android.view.Window;
 public class Sample3Native extends Activity {
     private static final String TAG = "Sample::Activity";
     private Sample3View mView;
+    
+    private BaseLoaderCallback  mOpenCVCallBack = new BaseLoaderCallback(this) {
+       @Override
+       public void onManagerConnected(int status) {
+               switch (status) {
+                               case LoaderCallbackInterface.SUCCESS:
+                               {
+                                       Log.i(TAG, "OpenCV loaded successfully");
+                                       
+                                       // Load native library after(!) OpenCV initialization
+                                       System.loadLibrary("native_sample");
+                                       
+                                       // Create and set View
+                                       mView = new Sample3View(mAppContext);
+                                       setContentView(mView);
+                                       // Check native OpenCV camera
+                                       if( !mView.openCamera() ) {
+                                               AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
+                                               ad.setCancelable(false); // This blocks the 'BACK' button
+                                               ad.setMessage("Fatal error: can't open camera!");
+                                               ad.setButton("OK", new DialogInterface.OnClickListener() {
+                                                   public void onClick(DialogInterface dialog, int which) {
+                                                       dialog.dismiss();
+                                                       finish();
+                                                   }
+                                               });
+                                               ad.show();
+                                       }
+                               } break;
+                               default:
+                               {
+                                       super.onManagerConnected(status);
+                               } break;
+                       }
+       }
+       };
 
     public Sample3Native() {
         Log.i(TAG, "Instantiated new " + this.getClass());
@@ -19,14 +59,15 @@ public class Sample3Native extends Activity {
        protected void onPause() {
         Log.i(TAG, "onPause");
                super.onPause();
-               mView.releaseCamera();
+               if (null != mView)
+                       mView.releaseCamera();
        }
 
        @Override
        protected void onResume() {
         Log.i(TAG, "onResume");
                super.onResume();
-               if( !mView.openCamera() ) {
+               if((null != mView) && !mView.openCamera() ) {
                        AlertDialog ad = new AlertDialog.Builder(this).create();  
                        ad.setCancelable(false); // This blocks the 'BACK' button  
                        ad.setMessage("Fatal error: can't open camera!");  
@@ -46,7 +87,11 @@ public class Sample3Native extends Activity {
         Log.i(TAG, "onCreate");
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mView = new Sample3View(this);
-        setContentView(mView);
+
+        if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
+        {
+               Log.e(TAG, "Cannot connect to OpenCV Manager");
+               finish();
+        }
     }
 }

diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java
index ebbc518..ac67321 100644 (file)
--- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java
+++ b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3View.java
@@ -26,9 +26,7 @@ class Sample3View extends SampleViewBase {
                        mBitmap.recycle();
                        mBitmap = null;
                }
-               mRGBA = null;
-               
-               
+               mRGBA = null;   
        }
 
     @Override
@@ -43,8 +41,4 @@ class Sample3View extends SampleViewBase {
     }
 
     public native void FindFeatures(int width, int height, byte yuv[], int[] rgba);
-
-    static {
-        System.loadLibrary("native_sample");
-    }
 }

diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
index 9bd36dc..fd11f4e 100644 (file)
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
+++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
@@ -1,5 +1,9 @@
 package org.opencv.samples.tutorial4;
 
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -18,6 +22,42 @@ public class Sample4Mixed extends Activity {
     private MenuItem            mItemPreviewFeatures;
     private Sample4View         mView;    
 
+    private BaseLoaderCallback  mOpenCVCallBack = new BaseLoaderCallback(this) {
+       @Override
+       public void onManagerConnected(int status) {
+               switch (status) {
+                               case LoaderCallbackInterface.SUCCESS:
+                               {
+                                       Log.i(TAG, "OpenCV loaded successfully");
+                                       
+                                       // Load native library after(!) OpenCV initialization
+                                       System.loadLibrary("mixed_sample");
+                                       
+                                       // Create and set View
+                                       mView = new Sample4View(mAppContext);
+                                       setContentView(mView);
+                                       
+                                       // Check native OpenCV camera
+                                       if( !mView.openCamera() ) {
+                                               AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
+                                               ad.setCancelable(false); // This blocks the 'BACK' button
+                                               ad.setMessage("Fatal error: can't open camera!");
+                                               ad.setButton("OK", new DialogInterface.OnClickListener() {
+                                                   public void onClick(DialogInterface dialog, int which) {
+                                                       dialog.dismiss();
+                                                       finish();
+                                                   }
+                                               });
+                                               ad.show();
+                                       }
+                               } break;
+                               default:
+                               {
+                                       super.onManagerConnected(status);
+                               } break;
+                       }
+       }
+       };
 
     public Sample4Mixed() {
         Log.i(TAG, "Instantiated new " + this.getClass());
@@ -27,14 +67,15 @@ public class Sample4Mixed extends Activity {
        protected void onPause() {
         Log.i(TAG, "onPause");
                super.onPause();
-               mView.releaseCamera();
+               if (null != mView)
+                       mView.releaseCamera();
        }
 
        @Override
        protected void onResume() {
         Log.i(TAG, "onResume");
                super.onResume();
-               if( !mView.openCamera() ) {
+               if((null != mView) && !mView.openCamera() ) {
                        AlertDialog ad = new AlertDialog.Builder(this).create();  
                        ad.setCancelable(false); // This blocks the 'BACK' button  
                        ad.setMessage("Fatal error: can't open camera!");  
@@ -53,9 +94,15 @@ public class Sample4Mixed extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.i(TAG, "onCreate");
+        
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        mView = new Sample4View(this);
-        setContentView(mView);
+        
+        Log.i(TAG, "Trying to load OpenCV library");
+        if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
+        {
+               Log.e(TAG, "Cannot connect to OpenCV Manager");
+               finish();
+        }
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {

diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
index 3b11433..e4856f1 100644 (file)
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
+++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
@@ -104,11 +104,6 @@ class Sample4View extends SampleViewBase {
 
     public native void FindFeatures(long matAddrGr, long matAddrRgba);
 
-    static {
-       System.loadLibrary("opencv_java");
-        System.loadLibrary("mixed_sample");
-    }
-
     public void setViewMode(int viewMode) {
                mViewMode = viewMode;
     }