| Chunk |
|---|
| Conflicting content |
|---|
SEND_PROJECTION, null, null, "date ASC"); // date ASC so we send out in
// same order the user tried
// to send messages.
<<<<<<< HEAD
=======
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
if (c != null) {
try {
if (c.moveToFirst()) { |
| Solution content |
|---|
if (c != null) {
try {
if (c.moveToFirst()) {
SEND_PROJECTION, null, null, "date ASC"); // date ASC so we send out in
// same order the user tried
// to send messages. |
| File |
|---|
| SmsReceiverService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
} catch (MmsException e) {
Log.e(TAG, "sendFirstQueuedMessage: failed to send message " + msgUri
+ ", caught ", e);
<<<<<<< HEAD
success = false;
=======
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
} finally {
// Since sendMessage adds a new message to the outbox rather than
// moving the old one, the old one must be deleted here |
| Solution content |
|---|
} catch (MmsException e) {
+ ", caught ", e);
success = false;
} finally {
Log.e(TAG, "sendFirstQueuedMessage: failed to send message " + msgUri
// Since sendMessage adds a new message to the outbox rather than
// moving the old one, the old one must be deleted here |
| File |
|---|
| SmsReceiverService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
Uri uri = intent.getData();
if (mResultCode == Activity.RESULT_OK) {
<<<<<<< HEAD
=======
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
Log.v(TAG, "handleSmsSent sending uri: " + uri);
}
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
if (!Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_SENT)) {
Log.e(TAG, "handleSmsSent: failed to move message " + uri + " to sent folder");
} |
| Solution content |
|---|
Uri uri = intent.getData();
if (mResultCode == Activity.RESULT_OK) {
if (!Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_SENT)) {
Log.e(TAG, "handleSmsSent: failed to move message " + uri + " to sent folder");
} |
| File |
|---|
| SmsReceiverService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
// queued up messages.
// when the status of the connection/radio changes, we can try to send the
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
Log.v(TAG, "handleSmsSent: no service, queuing message w/ uri: " + uri);
}
<<<<<<< HEAD
// We got an error with no service or no radio. Register for state changes so
registerForServiceStateChanges();
// We couldn't send the message, put in the queue to retry later.
=======
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_QUEUED);
mToastHandler.sendEmptyMessage(1);
} else { |
| Solution content |
|---|
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
Log.v(TAG, "handleSmsSent: no service, queuing message w/ uri: " + uri);
}
// We got an error with no service or no radio. Register for state changes so
// when the status of the connection/radio changes, we can try to send the
// queued up messages.
registerForServiceStateChanges();
// We couldn't send the message, put in the queue to retry later.
Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_QUEUED);
mToastHandler.sendEmptyMessage(1);
} else { |
| File |
|---|
| SmsReceiverService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
context.startActivity(smsDialogIntent);
}
<<<<<<< HEAD
private void registerForServiceStateChanges() {
Context context = getApplicationContext();
unRegisterForServiceStateChanges();
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
Log.v(TAG, "registerForServiceStateChanges");
}
context.registerReceiver(SmsReceiver.getInstance(), intentFilter);
}
private void unRegisterForServiceStateChanges() {
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
Log.v(TAG, "unRegisterForServiceStateChanges");
}
try {
Context context = getApplicationContext();
context.unregisterReceiver(SmsReceiver.getInstance());
} catch (IllegalArgumentException e) {
// Allow un-matched register-unregister calls
}
}
=======
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
}
|
| Solution content |
|---|
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
context.startActivity(smsDialogIntent);
}
private void registerForServiceStateChanges() {
Context context = getApplicationContext();
unRegisterForServiceStateChanges();
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
Log.v(TAG, "registerForServiceStateChanges");
}
context.registerReceiver(SmsReceiver.getInstance(), intentFilter);
}
private void unRegisterForServiceStateChanges() {
if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
Log.v(TAG, "unRegisterForServiceStateChanges");
}
try {
Context context = getApplicationContext();
context.unregisterReceiver(SmsReceiver.getInstance());
} catch (IllegalArgumentException e) {
// Allow un-matched register-unregister calls
}
}
}
|
| File |
|---|
| SmsReceiverService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
}
mWorkingMessage.setWorkingRecipients(mRecipientsEditor.getNumbers());
<<<<<<< HEAD
mWorkingMessage.setHasEmail(mRecipientsEditor.containsEmail(), true);
=======
mWorkingMessage.setHasEmail(mRecipientsEditor.containsEmail());
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
checkForTooManyRecipients();
|
| Solution content |
|---|
}
mWorkingMessage.setWorkingRecipients(mRecipientsEditor.getNumbers());
mWorkingMessage.setHasEmail(mRecipientsEditor.containsEmail(), true);
checkForTooManyRecipients();
|
| File |
|---|
| ComposeMessageActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
log(" new conversation=" + conversation + ", mConversation=" + mConversation);
}
<<<<<<< HEAD
long convThreadId = conversation == null ? 0 : conversation.getThreadId();
if (sameThread || (convThreadId != 0 && convThreadId == mConversation.getThreadId())) {
=======
if (sameThread || conversation.getThreadId() == mConversation.getThreadId()) {
>>>>>>> ec95105b4e85666aa050816c343af3ae78921bbd
if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
log("onNewIntent: same conversation");
} |
| Solution content |
|---|
log(" new conversation=" + conversation + ", mConversation=" + mConversation);
}
long convThreadId = conversation == null ? 0 : conversation.getThreadId();
if (sameThread || (convThreadId != 0 && convThreadId == mConversation.getThreadId())) {
if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
log("onNewIntent: same conversation");
} |
| File |
|---|
| ComposeMessageActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |