| Chunk |
|---|
| Conflicting content |
|---|
}
HISTORY_PROJECTION_FAVICON_INDEX);
if (data != null) {
favicon = BitmapFactory.decodeByteArray(
data, 0, data.length);
case R.id.share_link_context_menu_id:
sharePage(BrowserActivity.this, title, url, null,
null);
<<<<<<< HEAD
=======
if (c.moveToFirst()) {
// The site has been visited before, so grab the
// info from the database.
Bitmap favicon = null;
Bitmap thumbnail = null;
String linkTitle = c.getString(Browser.
HISTORY_PROJECTION_TITLE_INDEX);
byte[] data = c.getBlob(Browser.
data = c.getBlob(Browser.
HISTORY_PROJECTION_THUMBNAIL_INDEX);
if (data != null) {
thumbnail = BitmapFactory.decodeByteArray(
data, 0, data.length);
}
sharePage(BrowserActivity.this,
linkTitle, url, favicon, thumbnail);
} else {
Browser.sendString(BrowserActivity.this, url,
getString(
R.string.choosertitle_sharevia));
}
// close the cursor after its used
if (c != null) {
c.close();
}
>>>>>>> 0d0e70129c821da7ef6cae09bca7078d2fce1992
break;
case R.id.copy_link_context_menu_id:
copy(url); |
| Solution content |
|---|
case R.id.share_link_context_menu_id:
sharePage(BrowserActivity.this, title, url, null,
null);
break;
case R.id.copy_link_context_menu_id:
copy(url); |
| File |
|---|
| BrowserActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |