case ImageRegion.PIXELIZE:
	    {
	    	ImageRegion currentRegion = i.next();
	    	
<<<<<<< HEAD
	    	//REWORK THIS CODE
	    	// If the currentRegion is to be obscured:
            // Using the interface
            ObscureMethod om;
            int obscureMethod = 1;
            
            // Load the appropriate class/method based on obscureMethod variable/constants
            if (obscureMethod == 1) {
            	//om = new BlurObscure(obscuredBmp);
            	om = new PixelizeObscure(obscuredBmp);
            	//om = new AnonObscure(this, obscuredBmp, obscuredPaint);
            }
            else if (obscureMethod == 2)
            {
            	long signKey = 1;
    	    	long encryptKeys[] = {1};
    	    	om = new EncryptObscureMethod(this, obscuredBmp, signKey, encryptKeys);    	    		
            }
            else {
            	om = new PaintSquareObscure();		            	
            }
	    	// WORKS
	    	//obscuredCanvas.drawRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredPaint);
	    	
	    	// This should be determined by the currentRegion.whatever  
	     		
	    		//new PaintSquareObscure();
             Rect rect = currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight());
	    	om.obscureRect(rect, obscuredCanvas);
	    }
    	return obscuredBmp;
    }
    
    // Queries the contentResolver to pull out the path for the actual file.
    public String pullPathFromUri(Uri originalImageUri) {
        String originalImageFilePath = null;
        String[] columnsToSelect = { MediaStore.Images.Media.DATA };
        Cursor imageCursor = getContentResolver().query( originalImageUri, columnsToSelect, null, null, null );
        if ( imageCursor != null && imageCursor.getCount() == 1 ) {
                imageCursor.moveToFirst();
                originalImageFilePath = imageCursor.getString(imageCursor.getColumnIndex(MediaStore.Images.Media.DATA));
        }

        return originalImageFilePath;
    }
 
    private void saveImage() {
       	String src_filename = pullPathFromUri(imageUri);
       	
    	// Uri is savedImageUri which is global
       	if (savedImageUri == null) {
       		ContentValues cv = new ContentValues();
       		savedImageUri = getContentResolver().insert(
       				Media.EXTERNAL_CONTENT_URI, cv);
    	}	
       	String dest_filename = pullPathFromUri(savedImageUri);//mdh.getFileNameFromUri(savedImageUri);
		Log.v(LOGTAG,"src_filename : " + src_filename );
		Log.v(LOGTAG,"dest_filename: " + dest_filename );
    	
		try {
		    // Build up a string of semi-colon separated regions l,r,t,b in image coords.
    		String regions = "";//"10,400,500,1000;400,800,300,700";
					Log.v(LOGTAG,"obscureType: PIXELIZE");
    	// Create the Uri - This can't be "private"
    	   	Iterator i = imageRegions.iterator();
    	    while (i.hasNext()) {
    	    	ImageRegion currentRegion = i.next();
    	    	regions = regions + String.format("%.0f,%.0f,%.0f,%.0f;",
    	    				currentRegion.startX, currentRegion.endX,
    	    				currentRegion.startY, currentRegion.endY);
    	    }
   		Log.v(LOGTAG,"saveImage" + src_filename );
       		JpegRedaction redactor = new JpegRedaction();
    		redactor.redactit(src_filename, dest_filename, regions);
			
        	imageSaved = true;
        	Toast t = Toast.makeText(this,"Saved JPEG!", Toast.LENGTH_SHORT); 
    		t.show();
		} catch (Exception e) { //FileNotFoundException e) {
=======
	    	// Would like this to not be dependent on knowing the relationship between 
	    	// the classes and the constants in ImageRegion.  Would like there to be a 
	    	// method within ImageRegion that creates the ObscureMethod object and passes
	    	// it back.  Right now though, all of the ObscureMethods take in different
	    	// arguments which makes it painful.
	    	// Select the ObscureMethod as contained in the ImageRegion
	    	ObscureMethod om;
			switch (currentRegion.obscureType) {
				case ImageRegion.BLUR:
					Log.v(LOGTAG,"obscureType: BLUR");
					om = new CrowdBlurObscure(obscuredBmp);
				break;
				
				case ImageRegion.ANON:
					Log.v(LOGTAG,"obscureType: ANON");
					om = new AnonObscure(this.getApplicationContext(), obscuredBmp, obscuredPaint);
					break;
					
				case ImageRegion.SOLID:
					Log.v(LOGTAG,"obscureType: SOLID");
					om = new PaintSquareObscure();
					break;
					om = new PixelizeObscure(obscuredBmp);
					break;
					
				default:
					Log.v(LOGTAG,"obscureType: NONE/BLUR");
					om = new BlurObscure(obscuredBmp);
					break;
			}
			
			// Get the Rect for the region and do the obscure
            Rect rect = currentRegion.getAScaledRect(obscuredBmp.getWidth(),obscuredBmp.getHeight());
            Log.v(LOGTAG,"unscaled rect: left:" + rect.left + " right:" + rect.right 
            		+ " top:" + rect.top + " bottom:" + rect.bottom);
            			
	    	om.obscureRect(rect, obscuredCanvas);
		}

	    return obscuredBmp;
    }
    
    /*
     * Save a temporary image for sharing only
     */
    private boolean saveTmpImage() {
    	
    	String storageState = Environment.getExternalStorageState();
        if (!Environment.MEDIA_MOUNTED.equals(storageState)) {
        	Toast t = Toast.makeText(this,"External storage not available", Toast.LENGTH_SHORT); 
    		t.show();
    		return false;
    	}
    	
    	//Why does this not show?
    	ProgressDialog progressDialog = ProgressDialog.show(this, "", "Exporting for share...", true, true);    	
    	
    	// Create the bitmap that will be saved
    	// Perhaps this should be smaller than screen size??
    	int w = imageBitmap.getWidth();
    	int h = imageBitmap.getHeight();
    	/* This isn't necessary
    	if (imageBitmap.getWidth() > SHARE_SIZE_MAX_WIDTH_HEIGHT || imageBitmap.getHeight() > SHARE_SIZE_MAX_WIDTH_HEIGHT) {
    		// Size it down proportionally
    		float ratio = 1;
    		if (imageBitmap.getWidth() > imageBitmap.getHeight()) {
    			ratio = (float)SHARE_SIZE_MAX_WIDTH_HEIGHT/(float)imageBitmap.getWidth();
    		} else {
    			ratio = (float)SHARE_SIZE_MAX_WIDTH_HEIGHT/(float)imageBitmap.getHeight();
    		}

			w = (int) (ratio * imageBitmap.getWidth());
			h = (int) (ratio * imageBitmap.getHeight());
    	}
    	*/
    	Bitmap obscuredBmp = createObscuredBitmap(w,h);
    	
    	File tmpFileDirectory = new File(Environment.getExternalStorageDirectory().getPath() + TMP_FILE_DIRECTORY);
    	File tmpFile = new File(tmpFileDirectory,TMP_FILE_NAME);
    	Log.v(LOGTAG, tmpFile.getPath());
    	
		try {
	    	if (!tmpFileDirectory.exists()) {
	    		tmpFileDirectory.mkdirs();
	    	}
	    	tmpImageUri = Uri.fromFile(tmpFile);
	    	
			OutputStream imageFileOS;

			int quality = 75;
			imageFileOS = getContentResolver().openOutputStream(tmpImageUri);
			obscuredBmp.compress(CompressFormat.JPEG, quality, imageFileOS);

			progressDialog.cancel();
			return true;
		} catch (FileNotFoundException e) {
			progressDialog.cancel();
>>>>>>> 88da26e70d5bbab5d880081d1496a8c5f4ed5a15
			e.printStackTrace();
			return false;
		}

    	
	    {
	    	ImageRegion currentRegion = i.next();
	    	
	    	// Would like this to not be dependent on knowing the relationship between 
	    	// the classes and the constants in ImageRegion.  Would like there to be a 
	    	// method within ImageRegion that creates the ObscureMethod object and passes
	    	// it back.  Right now though, all of the ObscureMethods take in different
	    	// arguments which makes it painful.
	    	// Select the ObscureMethod as contained in the ImageRegion
	    	ObscureMethod om;
			switch (currentRegion.obscureType) {
				case ImageRegion.BLUR:
					Log.v(LOGTAG,"obscureType: BLUR");
					om = new CrowdBlurObscure(obscuredBmp);
				break;
				
				case ImageRegion.ANON:
					Log.v(LOGTAG,"obscureType: ANON");
					om = new AnonObscure(this.getApplicationContext(), obscuredBmp, obscuredPaint);
					break;
					
				case ImageRegion.SOLID:
					Log.v(LOGTAG,"obscureType: SOLID");
					om = new PaintSquareObscure();
					break;
					
				case ImageRegion.PIXELIZE:
					Log.v(LOGTAG,"obscureType: PIXELIZE");
					om = new PixelizeObscure(obscuredBmp);
					break;
					
				default:
					Log.v(LOGTAG,"obscureType: NONE/BLUR");
					om = new BlurObscure(obscuredBmp);
					break;
			}
			
			// Get the Rect for the region and do the obscure
            Rect rect = currentRegion.getAScaledRect(obscuredBmp.getWidth(),obscuredBmp.getHeight());
    private boolean saveTmpImage() {
            Log.v(LOGTAG,"unscaled rect: left:" + rect.left + " right:" + rect.right 
            		+ " top:" + rect.top + " bottom:" + rect.bottom);
            			
	    	om.obscureRect(rect, obscuredCanvas);
		}

	    return obscuredBmp;
    }
    
    /*
     * Save a temporary image for sharing only
     */
    	String storageState = Environment.getExternalStorageState();
        if (!Environment.MEDIA_MOUNTED.equals(storageState)) {
        	Toast t = Toast.makeText(this,"External storage not available", Toast.LENGTH_SHORT); 
    		t.show();
    		return false;
    	}
    	
    	//Why does this not show?
    	ProgressDialog progressDialog = ProgressDialog.show(this, "", "Exporting for share...", true, true);    	
    	
    	// Create the bitmap that will be saved
    	// Perhaps this should be smaller than screen size??
    	int w = imageBitmap.getWidth();
    	int h = imageBitmap.getHeight();
    	/* This isn't necessary
    	if (imageBitmap.getWidth() > SHARE_SIZE_MAX_WIDTH_HEIGHT || imageBitmap.getHeight() > SHARE_SIZE_MAX_WIDTH_HEIGHT) {
    		// Size it down proportionally
    		float ratio = 1;
    		if (imageBitmap.getWidth() > imageBitmap.getHeight()) {
    			ratio = (float)SHARE_SIZE_MAX_WIDTH_HEIGHT/(float)imageBitmap.getWidth();
    		} else {
    			ratio = (float)SHARE_SIZE_MAX_WIDTH_HEIGHT/(float)imageBitmap.getHeight();
    		}

			w = (int) (ratio * imageBitmap.getWidth());
			h = (int) (ratio * imageBitmap.getHeight());
    	}
    	*/
    	Bitmap obscuredBmp = createObscuredBitmap(w,h);
    	
    	// Create the Uri - This can't be "private"
    	File tmpFileDirectory = new File(Environment.getExternalStorageDirectory().getPath() + TMP_FILE_DIRECTORY);
    	File tmpFile = new File(tmpFileDirectory,TMP_FILE_NAME);
    	Log.v(LOGTAG, tmpFile.getPath());
    	
		try {
	    	if (!tmpFileDirectory.exists()) {
	    		tmpFileDirectory.mkdirs();
	    	}
	    	tmpImageUri = Uri.fromFile(tmpFile);
	    	
			OutputStream imageFileOS;

			int quality = 75;
			imageFileOS = getContentResolver().openOutputStream(tmpImageUri);
			obscuredBmp.compress(CompressFormat.JPEG, quality, imageFileOS);

			progressDialog.cancel();
			return true;
		} catch (FileNotFoundException e) {
			progressDialog.cancel();
			e.printStackTrace();
			return false;
		}