From 15a53d299d2aa29cdda3a5b6b1c1101a9628a1d0 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Fri, 3 Apr 2020 15:48:38 +0200 Subject: [PATCH] Revert some more changes --- .../newpipe/info_list/holder/ChannelInfoItemHolder.java | 3 +-- .../subscription/services/BaseImportExportService.java | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java index 5942fa45e..28d447337 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java @@ -46,8 +46,7 @@ public class ChannelInfoItemHolder extends ChannelMiniInfoItemHolder { if (!(infoItem instanceof ChannelInfoItem)) { return; } - final ChannelInfoItem item; - item = (ChannelInfoItem) infoItem; + final ChannelInfoItem item = (ChannelInfoItem) infoItem; itemChannelDescriptionView.setText(item.getDescription()); } diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java index 16cd70cf2..28bacaadd 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java @@ -179,10 +179,6 @@ public abstract class BaseImportExportService extends Service { notificationManager.notify(getNotificationId(), notificationBuilder.build()); } - /*////////////////////////////////////////////////////////////////////////// - // Toast - //////////////////////////////////////////////////////////////////////////*/ - protected NotificationCompat.Builder createNotification() { return new NotificationCompat.Builder(this, getString(R.string.notification_channel_id)) .setOngoing(true) @@ -192,6 +188,10 @@ public abstract class BaseImportExportService extends Service { .setContentTitle(getString(getTitle())); } + /*////////////////////////////////////////////////////////////////////////// + // Toast + //////////////////////////////////////////////////////////////////////////*/ + protected void showToast(@StringRes final int message) { showToast(getString(message)); }