Projects >> ObscuraCam >>49090e8f229f719bf4151174cd756aeea4671c48

Chunk
Conflicting content
	    	// WORKS
	    	//obscuredCanvas.drawRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredPaint);
	    	
<<<<<<< HEAD
	    	if (currentRegion.whattodo == ImageRegion.OBSCURE) {
	    		// This should be determined by the currentRegion.whatever  
	    		ObscureMethod om = new PaintSquareObscure();
	    		om.obscureRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredCanvas);
	    	}

	    	// ObscureMethod could be the base class for an encrypt class as well?
	    	
	    	// If the currentRegion is to be encrypted:
	    	//obscuredCanvas.drawRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredPaint);
=======
	    	// This should be determined by the currentRegion.whatever  
	     		
	    		//new PaintSquareObscure();
	    	om.obscureRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredCanvas);
>>>>>>> 53e603e5f364e31fd03c049f7031ffb82420bedb
	    	
	    }
	    
Solution content
	    	// WORKS
	    	//obscuredCanvas.drawRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredPaint);
	    	
	    	// This should be determined by the currentRegion.whatever  
	     		
	    		//new PaintSquareObscure();
	    	om.obscureRect(currentRegion.getScaledRect(imageBitmap.getWidth(), imageBitmap.getHeight()), obscuredCanvas);

	    }
	    
File
ImageEditor.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation