| Chunk |
|---|
| Conflicting content |
|---|
} catch (Exception e) {
}
if (uri != null) {
<<<<<<< HEAD
final boolean useBigNotification =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
final Intent downloadIntent = useBigNotification
? new Intent(FBReader.this, BookDownloaderService.class)
: new Intent(FBReader.this, MissingBookActivity.class);
=======
final Intent downloadIntent = new Intent(myActivity, MissingBookActivity.class);
>>>>>>> f1d53cdd22e9bb38b630fed95c9a4912dbb27535
downloadIntent
.setData(uri)
.putExtra(BookDownloaderService.Key.FROM_SYNC, true) |
| Solution content |
|---|
} catch (Exception e) {
}
if (uri != null) {
final boolean useBigNotification =
Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
final Intent downloadIntent = useBigNotification
? new Intent(myActivity, BookDownloaderService.class)
: new Intent(myActivity, MissingBookActivity.class);
downloadIntent
.setData(uri)
.putExtra(BookDownloaderService.Key.FROM_SYNC, true) |
| File |
|---|
| FBReader.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
.putExtra(BookDownloaderService.Key.BOOK_MIME, info.Mimetype)
.putExtra(BookDownloaderService.Key.BOOK_KIND, UrlInfo.Type.Book)
.putExtra(BookDownloaderService.Key.BOOK_TITLE, info.Title);
<<<<<<< HEAD
if (useBigNotification) {
builder.setStyle(new NotificationCompat.BigTextStyle().bigText(errorMessage));
final ZLResource buttonResource =
ZLResource.resource("dialog").getResource("button");
final PendingIntent pi =
PendingIntent.getService(FBReader.this, 0, downloadIntent, 0);
builder.addAction(
android.R.drawable.stat_sys_download_done,
buttonResource.getResource("download").getValue(),
pi
);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
builder.setFullScreenIntent(pi, true);
}
} else {
builder.setContentIntent(PendingIntent.getActivity(FBReader.this, 0, downloadIntent, 0));
}
=======
builder.setContentIntent(PendingIntent.getActivity(myActivity, 0, downloadIntent, 0));
>>>>>>> f1d53cdd22e9bb38b630fed95c9a4912dbb27535
} else {
builder.setContentIntent(PendingIntent.getActivity(myActivity, 0, new Intent(), 0));
} |
| Solution content |
|---|
.putExtra(BookDownloaderService.Key.BOOK_MIME, info.Mimetype)
.putExtra(BookDownloaderService.Key.BOOK_KIND, UrlInfo.Type.Book)
.putExtra(BookDownloaderService.Key.BOOK_TITLE, info.Title);
if (useBigNotification) {
builder.setStyle(new NotificationCompat.BigTextStyle().bigText(errorMessage));
final ZLResource buttonResource =
ZLResource.resource("dialog").getResource("button");
final PendingIntent pi =
PendingIntent.getService(myActivity, 0, downloadIntent, 0);
builder.addAction(
android.R.drawable.stat_sys_download_done,
buttonResource.getResource("download").getValue(),
pi
);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
builder.setFullScreenIntent(pi, true);
}
} else {
builder.setContentIntent(PendingIntent.getActivity(myActivity, 0, downloadIntent, 0));
}
} else {
builder.setContentIntent(PendingIntent.getActivity(myActivity, 0, new Intent(), 0));
} |
| File |
|---|
| FBReader.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Method invocation |