Android : Crop Images issues with Capture Image using Android

I am using Camera Function to Capture Images 2 times from different buttons. After Captured Image, It goes to Crop Option where user can crop the Image. It is also working fine.



But, now issue is that when user capture second image then App redirects to Crop image and show first image only rather than second capture image. I am also deleting image after It has been set to ImageView. Don't know what is the wrong ?



Please Help me to solve this issue.



My Code :

Bitmap bm_PhotoProof = null;
    Bitmap bm_AddressProof = null;

    private static final String TEMP_PHOTO_FILE = "tmp_ihis.jpg";
    private static final int REQ_CODE_PICK_IMAGE_PHOTOPROOF = 0;
    private static final int REQ_CODE_PICK_IMAGE_ADDRESSPROOF = 1;
imgPhotoProof.setOnClickListener(new OnClickListener() {

            @Override
            public void onClick(View arg0) {
                // TODO Auto-generated method stub

                Intent cameraIntent = new Intent(
                        android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
                cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, getTempUri());
                cameraIntent.putExtra("outputFormat",
                        Bitmap.CompressFormat.JPEG.toString());
                startActivityForResult(cameraIntent,
                        REQ_CODE_PICK_IMAGE_PHOTOPROOF);
            }
        });

        imgAddressProof.setOnClickListener(new OnClickListener() {

            @Override
            public void onClick(View arg0) {
                // TODO Auto-generated method stub

                Intent cameraIntent = new Intent(
                        android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
                cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, getTempUri());
                cameraIntent.putExtra("outputFormat",
                        Bitmap.CompressFormat.JPEG.toString());
                startActivityForResult(cameraIntent,
                        REQ_CODE_PICK_IMAGE_ADDRESSPROOF);
            }
        });
private Uri getTempUri() {
        return Uri.fromFile(getTempFile());
    }

    private File getTempFile() {

        File f = new File(Environment.getExternalStorageDirectory(),
                TEMP_PHOTO_FILE);
        try {
            f.createNewFile();
        } catch (IOException e) {
            Log.e("getTempFile()->", e.getMessage().toString());
        }

        return f;
    }

    public void cropCapturedImage(Uri picUri, String Type) {

        Intent cropIntent = new Intent("com.android.camera.action.CROP");
        cropIntent.setDataAndType(picUri, "image/*");
        cropIntent.putExtra("crop", "true");
        cropIntent.putExtra("aspectX", 0);
        cropIntent.putExtra("aspectY", 0);
        cropIntent.putExtra("outputX", 256);
        cropIntent.putExtra("outputY", 256);
        cropIntent.putExtra("return-data", true);

        if (Type.equals("Photo")) {
            startActivityForResult(cropIntent, 5);
        } else {
            startActivityForResult(cropIntent, 6);
        }
    }

    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
        super.onActivityResult(requestCode, resultCode, data);

        if (resultCode == Activity.RESULT_OK) {
            if (requestCode == REQ_CODE_PICK_IMAGE_PHOTOPROOF) {

                File tempFile = getTempFile();
                cropCapturedImage(Uri.fromFile(tempFile), "Photo");

            } else if (requestCode == REQ_CODE_PICK_IMAGE_ADDRESSPROOF) {

                File tempFile = getTempFile();
                cropCapturedImage(Uri.fromFile(tempFile), "Address");
            }

            if (resultCode != Activity.RESULT_CANCELED) {
                if (requestCode == 5) {

                    if (data != null) {
                        Bundle extras = data.getExtras();
                        bm_PhotoProof = extras.getParcelable("data");
                    }

                    imgPhotoProof_Pic.setImageBitmap(bm_PhotoProof);

                    File tempFile = getTempFile();
                    if (tempFile.exists()) {
                        tempFile.delete();
                    }
                }
                if (requestCode == 6) {

                    if (data != null) {
                        Bundle extras = data.getExtras();
                        bm_AddressProof = extras.getParcelable("data");
                    }

                    imgAddressProof_Pic.setImageBitmap(bm_AddressProof);

                    File tempFile = getTempFile();
                    if (tempFile.exists()) {
                        tempFile.delete();
                    }
                }
            }
        }
    }