Projects >> tinfoil-sms >>fa36ca50b95368d5e6366e1a57086494be394922

Chunk
Conflicting content 
    @Override
    protected void onActivityResult(final int requestCode, final int resultCode, final Intent data)
    {
<<<<<<< HEAD
        super.onActivityResult(requestCode, resultCode, data);

        boolean update = false;
        String number = null;
        int position = 0;

        if (requestCode == resultCode)
        {
            update = data.getBooleanExtra(EditNumber.UPDATE, true);
            number = data.getStringExtra(EditNumber.NEW);
            position = data.getIntExtra(AddContact.POSITION, 0);

            if (update && number != null)
            {
                if (position == AddContact.NEW_NUMBER_CODE)
                {
                    this.update(number);
                }
                else
                {
                    this.contactEdit.setNumber(position, number);
                    this.update(null);
                }
            }
        }
=======
    	super.onActivityResult(requestCode, resultCode, data);
    	
    	boolean update = false;
    	String number = null;
    	int position = 0;
    	boolean addNumber = false;
    	
    	if(requestCode == resultCode && resultCode == AddContact.REQUEST_CODE)
    	{
    		update = data.getBooleanExtra(EditNumber.UPDATE, true);
    		number = data.getStringExtra(EditNumber.NUMBER);
    		position = data.getIntExtra(AddContact.POSITION, 0);
    		addNumber = data.getBooleanExtra(EditNumber.ADD, true);
    		
	    	if(update && number != null)
	    	{    	
	    		if(addNumber)
	    		{
	    			if(position == AddContact.NEW_NUMBER_CODE)
	    			{
	    				update(number);
	    			}
	    			else
	    			{
	    				contactEdit.setNumber(position, number);
	    				update(null);
	    			}
	    		}
	    	}
    	}
>>>>>>> f590525d8f3731bfc268b184628198d996749273
    }
}
Solution content 
	    			{
    {
    	super.onActivityResult(requestCode, resultCode, data);
    	
    	boolean update = false;
    	String number = null;
    	int position = 0;
    	boolean addNumber = false;
    	
    	if(requestCode == resultCode && resultCode == AddContact.REQUEST_CODE)
    	{
    		update = data.getBooleanExtra(EditNumber.UPDATE, true);
    		number = data.getStringExtra(EditNumber.NUMBER);
    		position = data.getIntExtra(AddContact.POSITION, 0);
    		addNumber = data.getBooleanExtra(EditNumber.ADD, true);
    		
	    	if(update && number != null)
	    	{    	
	    		if(addNumber)
	    		{
	    			if(position == AddContact.NEW_NUMBER_CODE)
	    				update(number);
	    			}
	    			else
	    			{
	    				contactEdit.setNumber(position, number);
	    				update(null);
	    			}
	    		}
	    	}
    	}
    }
}
File
AddContact.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
import android.widget.Button;
import android.widget.EditText;

<<<<<<< HEAD
import com.tinfoil.sms.R;
import com.tinfoil.sms.dataStructures.Number;
import com.tinfoil.sms.dataStructures.TrustedContact;
import com.tinfoil.sms.database.DBAccessor;
import com.tinfoil.sms.utility.MessageService;

public class EditNumber extends Activity {

    public static final String UPDATE = "update";
    public static final String NEW = "new_number";

    private EditText phoneNumber;
    private EditText sharedInfo1;
    private EditText sharedInfo2;
    private EditText bookPath;
    private EditText bookInverse;
    private Button save;
    private TrustedContact tc;
    private String originalNumber;
    private static int position;

    @Override
=======
/**
 * An activity used to edit a single number from a given contact. 
 * 
 * This activity returns a AddContact.RESULT_CODE if changes have
 * been made and the list needs to be update, else returns default
 * result code.
 * The Extras are included are:
 * EditNumber.UPDATE, whether the number has been updated or not
 * EditNumber.NUMBER, the number that has been edited
 * AddContact.POSITION, the position of the given number in the
 * contact's numbers array list, -1 if it is a new number
 * EditNumber.ADD, whether the number is to update or deleted
 * 
 * 
 */
public class EditNumber extends Activity{
    
	public static final String UPDATE = "update";
	public static final String NUMBER = "number";
	public static final String ADD = "add";
	
	private EditText phoneNumber;
	private EditText sharedInfo1;
	private EditText sharedInfo2;
	private EditText bookPath;
	private EditText bookInverse;
	private Button save;
	private TrustedContact tc;
	private String originalNumber;
	private static int position;
	
	@Override
>>>>>>> f590525d8f3731bfc268b184628198d996749273
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        this.setContentView(R.layout.edit_number);
Solution content 
import android.widget.Button;
import android.widget.EditText;

/**
 * An activity used to edit a single number from a given contact. 
 * 
 * This activity returns a AddContact.RESULT_CODE if changes have
 * been made and the list needs to be update, else returns default
 * result code.
 * The Extras are included are:
 * EditNumber.UPDATE, whether the number has been updated or not
 * EditNumber.NUMBER, the number that has been edited
 * AddContact.POSITION, the position of the given number in the
 * contact's numbers array list, -1 if it is a new number
 * EditNumber.ADD, whether the number is to update or deleted
 * 
 * 
 */
public class EditNumber extends Activity{
    
	public static final String UPDATE = "update";
	public static final String NUMBER = "number";
	public static final String ADD = "add";
	
	private EditText phoneNumber;
	private EditText sharedInfo1;
	private EditText sharedInfo2;
	private EditText bookPath;
	private EditText bookInverse;
	private Button save;
	private TrustedContact tc;
	private String originalNumber;
	private static int position;
	
	@Override
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        this.setContentView(R.layout.edit_number);
File
EditNumber.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Class signature
Comment
Import
Chunk
Conflicting content 
            this.bookInverse.setText(DBAccessor.DEFAULT_BOOK_INVERSE_PATH);
        }
<<<<<<< HEAD

        this.save.setOnClickListener(new OnClickListener() {

            public void onClick(final View v) {

                if (EditNumber.this.phoneNumber.getText().toString() != null &&
                        EditNumber.this.phoneNumber.getText().toString().length() > 0)
                {
                    final Number tempNumber = EditNumber.this.tc.getNumber(EditNumber.this.originalNumber);
                    tempNumber.setNumber(EditNumber.this.phoneNumber.getText().toString());
                    tempNumber.setSharedInfo1(EditNumber.this.sharedInfo1.getText().toString());
                    tempNumber.setSharedInfo2(EditNumber.this.sharedInfo2.getText().toString());
                    tempNumber.setBookPath(EditNumber.this.bookPath.getText().toString());
                    tempNumber.setBookInversePath(EditNumber.this.bookInverse.getText().toString());

                    MessageService.dba.updateNumberRow(tempNumber, EditNumber.this.originalNumber, 0);

                    final Intent data = new Intent();

                    if (tempNumber.getNumber().equalsIgnoreCase(EditNumber.this.originalNumber))
                    {
                        data.putExtra(EditNumber.UPDATE, false);
                    }
                    else
                    {
                        data.putExtra(EditNumber.UPDATE, true);
                    }

                    data.putExtra(EditNumber.NEW, tempNumber.getNumber());
                    data.putExtra(AddContact.POSITION, position);

                    EditNumber.this.setResult(AddContact.REQUEST_CODE, data);

                    EditNumber.this.finish();
                }
            }
=======
        
        save.setOnClickListener(new OnClickListener(){

			public void onClick(View v) {
				
				if(phoneNumber.getText().toString() != null &&
						phoneNumber.getText().toString().length() > 0)
				{
					Number tempNumber = tc.getNumber(originalNumber);
					tempNumber.setNumber(phoneNumber.getText().toString());
					tempNumber.setSharedInfo1(sharedInfo1.getText().toString());
					tempNumber.setSharedInfo2(sharedInfo2.getText().toString());
					tempNumber.setBookPath(bookPath.getText().toString());
					tempNumber.setBookInversePath(bookInverse.getText().toString());
					
					MessageService.dba.updateNumberRow(tempNumber, originalNumber, 0);
					
					Intent data = new Intent();
					
					if(tempNumber.getNumber().equalsIgnoreCase(originalNumber))
					{					
						data.putExtra(EditNumber.UPDATE, false);					
					}
					else
					{
						data.putExtra(EditNumber.UPDATE, true);
					}
					
					data.putExtra(EditNumber.NUMBER, tempNumber.getNumber());
					data.putExtra(AddContact.POSITION, position);
					data.putExtra(EditNumber.ADD, true);
					
					EditNumber.this.setResult(AddContact.REQUEST_CODE, data);
	
					EditNumber.this.finish();
				}
			}
>>>>>>> f590525d8f3731bfc268b184628198d996749273
        });
    }
Solution content 
            this.bookInverse.setText(DBAccessor.DEFAULT_BOOK_INVERSE_PATH);
        }
        
        this.save.setOnClickListener(new OnClickListener() {

            public void onClick(View v) {

                if (EditNumber.this.phoneNumber.getText().toString() != null &&
                        EditNumber.this.phoneNumber.getText().toString().length() > 0)
                {
                    Number tempNumber = EditNumber.this.tc.getNumber(EditNumber.this.originalNumber);
                    tempNumber.setNumber(EditNumber.this.phoneNumber.getText().toString());
                    tempNumber.setSharedInfo1(EditNumber.this.sharedInfo1.getText().toString());
                    tempNumber.setSharedInfo2(EditNumber.this.sharedInfo2.getText().toString());
                    tempNumber.setBookPath(EditNumber.this.bookPath.getText().toString());
                    tempNumber.setBookInversePath(EditNumber.this.bookInverse.getText().toString());

                    MessageService.dba.updateNumberRow(tempNumber, EditNumber.this.originalNumber, 0);

                    Intent data = new Intent();

                    if (tempNumber.getNumber().equalsIgnoreCase(EditNumber.this.originalNumber))
                    {
                        data.putExtra(EditNumber.UPDATE, false);
                    }
                    else
                    {
                        data.putExtra(EditNumber.UPDATE, true);
                    }

                    data.putExtra(EditNumber.NEW, tempNumber.getNumber());
                    data.putExtra(AddContact.POSITION, position);
                    data.putExtra(EditNumber.ADD, true);
					
					EditNumber.this.setResult(AddContact.REQUEST_CODE, data);
	
					EditNumber.this.finish();
				}
			}
        });
    }
File
EditNumber.java
Developer's decision
Manual
Kind of conflict
Method invocation