| Chunk |
|---|
| Conflicting content |
|---|
uiFragment.getDownloadActivity().getEntriesToDownload().put(basemap, downloadEntry);
AccessibleToast.makeText(uiFragment.getDownloadActivity(), R.string.basemap_was_selected_to_download,
Toast.LENGTH_LONG).show();
<<<<<<< HEAD
if(uiFragment.findViewById(R.id.DownloadButton) != null) {
uiFragment.findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
}
=======
uiFragment.getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
>>>>>>> 2e48b77ee4ef1388d2414f4b9cb199c07c8f915b
}
}
if (indexFiles.isIncreasedMapVersion()) { |
| Solution content |
|---|
uiFragment.getDownloadActivity().getEntriesToDownload().put(basemap, downloadEntry);
AccessibleToast.makeText(uiFragment.getDownloadActivity(), R.string.basemap_was_selected_to_download,
Toast.LENGTH_LONG).show();
uiFragment.getDownloadActivity().findViewById(R.id.DownloadButton).setVisibility(View.VISIBLE);
}
}
if (indexFiles.isIncreasedMapVersion()) { |
| File |
|---|
| DownloadIndexesThread.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |