refactoring sample

Author: syakimchik

Samples/Advanced/DocumentReader-Kotlin/app/src/main/java/com/regula/documentreader/CustomRfidActivity.kt

@@ -10,6 +10,7 @@ import android.content.IntentFilter
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -90,7 +91,11 @@ class CustomRfidActivity : AppCompatActivity() {
      */
     private fun setupForegroundDispatch(activity: Activity, adapter: NfcAdapter) {
         val intent = Intent(activity.applicationContext, activity.javaClass)
-        val pendingIntent = PendingIntent.getActivity(activity.applicationContext, 0, intent, FLAG_MUTABLE)
+        var flag = 0
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flag = FLAG_MUTABLE
+        }
+        val pendingIntent = PendingIntent.getActivity(activity.applicationContext, 0, intent, flag)
         val filters = arrayOfNulls<IntentFilter>(1)
 
         // Notice that this is the same filter as in our manifest.

Samples/Basic/DocumentReader-sample/app/src/main/java/com/regula/documentreader/custom/CameraActivity.java

@@ -6,7 +6,6 @@
 import android.content.pm.PackageManager;
 import android.graphics.ImageFormat;
 import android.hardware.Camera;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Surface;
@@ -45,10 +44,7 @@ public class CameraActivity extends AppCompatActivity implements Camera.PreviewC
     private Camera.Parameters mParams;
     private CameraPreview mPreview;
     private RelativeLayout previewParent;
-    private boolean isPreviewReady;
-    private Camera.Size previewSize;
     private int cameraOrientation;
-    private int previewFormat;
     private boolean recognitionFinished = true;
     private boolean isPauseRecognize = false;
 
@@ -112,28 +108,30 @@ public void onPreviewFrame(byte[] data, final Camera camera) {
                     synchronized (lock) {
                         isPauseRecognize = true;
                     }
-                    if (documentReaderResults.morePagesAvailable == 1) { //more pages are available for this document
-                        Toast.makeText(CameraActivity.this, "Page ready, flip", Toast.LENGTH_LONG).show();
-
-                        //letting API know, that all frames will be from different page of the same document, merge same field types
-                        DocumentReader.Instance().startNewPage();
-//                            mPreview.startCameraPreview();
-                    } else { //no more pages available
-                        AlertDialog.Builder builder = new AlertDialog.Builder(CameraActivity.this);
-                        builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialogInterface, int i) {
-                                DocumentReader.Instance().startNewSession();
-                                dialogInterface.dismiss();
-                                synchronized (lock) {
-                                    isPauseRecognize = false;
+                    if (documentReaderResults != null) {
+                        if (documentReaderResults.morePagesAvailable == 1) { //more pages are available for this document
+                            Toast.makeText(CameraActivity.this, "Page ready, flip", Toast.LENGTH_LONG).show();
+
+                            //letting API know, that all frames will be from different page of the same document, merge same field types
+                            DocumentReader.Instance().startNewPage();
+    //                            mPreview.startCameraPreview();
+                        } else { //no more pages available
+                            AlertDialog.Builder builder = new AlertDialog.Builder(CameraActivity.this);
+                            builder.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    DocumentReader.Instance().startNewSession();
+                                    dialogInterface.dismiss();
+                                    synchronized (lock) {
+                                        isPauseRecognize = false;
+                                    }
                                 }
-                            }
-                        });
-                        builder.setTitle("Processing finished");
-                        //getting text field value from results
-                        builder.setMessage(documentReaderResults.getTextFieldValueByType(eVisualFieldType.FT_SURNAME_AND_GIVEN_NAMES));
-                        builder.show();
+                            });
+                            builder.setTitle("Processing finished");
+                            //getting text field value from results
+                            builder.setMessage(documentReaderResults.getTextFieldValueByType(eVisualFieldType.FT_SURNAME_AND_GIVEN_NAMES));
+                            builder.show();
+                        }
                     }
                     break;
                 case DocReaderAction.ERROR: //something went wrong
@@ -233,15 +231,12 @@ class CameraPreview extends SurfaceView implements SurfaceHolder.Callback {
         // List of supported picture sizes
         private List<Camera.Size> mSupportedPictureSizes;
 
-        // View holding this camera.
-        private View mCameraView;
-
 
         public CameraPreview(Activity context, Camera camera, Camera.PreviewCallback previewCallback, View cameraView) {
             super(context);
 
             // Capture the context
-            mCameraView = cameraView;
+            // View holding this camera.
             mContext = context;
             setCamera(camera);
             this.callback = previewCallback;
@@ -314,10 +309,6 @@ public void surfaceDestroyed(SurfaceHolder holder) {
 
             if (mCamera != null){
                 mCamera.stopPreview();
-
-                synchronized (lock){
-                    isPreviewReady=false;
-                }
             }
         }
 
@@ -375,9 +366,7 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
                     previewParent.setLayoutParams(params);
 
                     synchronized (lock){
-                        previewSize = mPreviewSize;
                         cameraOrientation = getCorrectCameraOrientation(info);
-                        previewFormat = ImageFormat.NV21;
                     }
                 }
 
@@ -387,10 +376,6 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
                 mCamera.setPreviewDisplay(holder);
                 mCamera.setPreviewCallback(callback);
 
-                synchronized (lock){
-                    isPreviewReady = true;
-                }
-
                 mCamera.startPreview();
             } catch (Exception e){
                 e.printStackTrace();
@@ -530,9 +515,7 @@ protected void hideNavBarAndStatusBar() {
                 | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
                 | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
         );
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            decorView.setSystemUiVisibility(decorView.getSystemUiVisibility()
-                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-        }
+        decorView.setSystemUiVisibility(decorView.getSystemUiVisibility()
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
     }
 }