| Chunk |
|---|
| Conflicting content |
|---|
"display_coordinates", "true");
}
<<<<<<< HEAD
OAuth.signOAuth("api.twitter.com", "/1.1/statuses/update.json", "POST", false, parameters, Settings.getTokenPublic(), Settings.getTokenSecret(), Settings.getKeyConsumerPublic(), Settings.getKeyConsumerSecret());
final HttpResponse httpResponse = Network.postRequest("http://api.twitter.com/1.1/statuses/update.json", parameters);
if (httpResponse != null) {
if (httpResponse.getStatusLine().getStatusCode() == 200) {
Log.i("Tweet posted");
} else {
Log.e("Tweet could not be posted. Reason: " + httpResponse.toString());
}
=======
OAuth.signOAuth("api.twitter.com", "/1.1/statuses/update.json", "POST", false, parameters, Settings.getTokenPublic(), Settings.getTokenSecret());
final HttpResponse httpResponse = Network.postRequest("http://api.twitter.com/1.1/statuses/update.json", parameters);
if (httpResponse != null && httpResponse.getStatusLine().getStatusCode() == 200) {
Log.i("Tweet posted");
>>>>>>> a7f4987c8e1887b045c701fd8a622652d3848fec
} else {
Log.e("Tweet could not be posted. Reason: httpResponse Object is null");
} |
| Solution content |
|---|
"display_coordinates", "true");
}
OAuth.signOAuth("api.twitter.com", "/1.1/statuses/update.json", "POST", false, parameters, Settings.getTokenPublic(), Settings.getTokenSecret(), Settings.getKeyConsumerPublic(), Settings.getKeyConsumerSecret());
final HttpResponse httpResponse = Network.postRequest("http://api.twitter.com/1.1/statuses/update.json", parameters);
if (httpResponse != null) {
if (httpResponse.getStatusLine().getStatusCode() == 200) {
Log.i("Tweet posted");
} else {
Log.e("Tweet could not be posted. Reason: " + httpResponse.toString());
}
} else {
Log.e("Tweet could not be posted. Reason: httpResponse Object is null");
} |
| File |
|---|
| Twitter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |