From a5b9fe4c352bf7345e52d646a8b24795c1a02ba5 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Tue, 20 Jul 2021 13:20:51 +0300 Subject: [PATCH] Refactor FeedLoadService to use it within the notification worker --- app/build.gradle | 4 +- .../settings/DebugSettingsFragment.java | 9 + app/src/main/java/org/schabi/newpipe/App.java | 19 +- .../java/org/schabi/newpipe/MainActivity.java | 2 +- .../newpipe/database/stream/dao/StreamDAO.kt | 2 +- .../list/channel/ChannelFragment.java | 8 +- .../newpipe/local/feed/FeedDatabaseManager.kt | 4 + .../feed/notifications/NotificationHelper.kt | 135 +++++++ .../feed/notifications/NotificationIcon.kt | 48 +++ .../feed}/notifications/NotificationWorker.kt | 43 ++- .../feed}/notifications/ScheduleOptions.kt | 2 +- .../local/feed/service/FeedLoadManager.kt | 217 ++++++++++++ .../local/feed/service/FeedLoadService.kt | 329 +++--------------- .../local/feed/service/FeedLoadState.kt | 7 + .../local/feed/service/FeedResultsHolder.kt | 19 + .../local/feed/service/FeedUpdateInfo.kt | 34 ++ .../newpipe/notifications/ChannelUpdates.kt | 46 --- .../notifications/NotificationHelper.java | 137 -------- .../notifications/NotificationIcon.java | 60 ---- .../notifications/SubscriptionUpdates.kt | 53 --- .../settings/NotificationsSettingsFragment.kt | 8 +- .../drawable-anydpi-v24/ic_stat_newpipe.xml | 14 - .../res/drawable-hdpi/ic_stat_newpipe.png | Bin 413 -> 0 bytes .../res/drawable-mdpi/ic_stat_newpipe.png | Bin 294 -> 0 bytes .../res/drawable-xhdpi/ic_stat_newpipe.png | Bin 522 -> 0 bytes .../res/drawable-xxhdpi/ic_stat_newpipe.png | Bin 731 -> 0 bytes app/src/main/res/values/settings_keys.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/debug_settings.xml | 5 + 29 files changed, 576 insertions(+), 631 deletions(-) create mode 100644 app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt create mode 100644 app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationIcon.kt rename app/src/main/java/org/schabi/newpipe/{ => local/feed}/notifications/NotificationWorker.kt (64%) rename app/src/main/java/org/schabi/newpipe/{ => local/feed}/notifications/ScheduleOptions.kt (96%) create mode 100644 app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt create mode 100644 app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadState.kt create mode 100644 app/src/main/java/org/schabi/newpipe/local/feed/service/FeedResultsHolder.kt create mode 100644 app/src/main/java/org/schabi/newpipe/local/feed/service/FeedUpdateInfo.kt delete mode 100644 app/src/main/java/org/schabi/newpipe/notifications/ChannelUpdates.kt delete mode 100644 app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java delete mode 100644 app/src/main/java/org/schabi/newpipe/notifications/NotificationIcon.java delete mode 100644 app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.kt delete mode 100644 app/src/main/res/drawable-anydpi-v24/ic_stat_newpipe.xml delete mode 100644 app/src/main/res/drawable-hdpi/ic_stat_newpipe.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_stat_newpipe.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_newpipe.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_stat_newpipe.png diff --git a/app/build.gradle b/app/build.gradle index 61a0cdc2b..a9a4e7001 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -214,8 +214,8 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.webkit:webkit:1.4.0' implementation 'com.google.android.material:material:1.2.1' - implementation "androidx.work:work-runtime:${workVersion}" - implementation "androidx.work:work-rxjava2:${workVersion}" + implementation "androidx.work:work-runtime-ktx:${workVersion}" + implementation "androidx.work:work-rxjava3:${workVersion}" /** Third-party libraries **/ // Instance state boilerplate elimination diff --git a/app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java b/app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java index 55b2c7708..31c8dd40c 100644 --- a/app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java +++ b/app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java @@ -6,6 +6,7 @@ import androidx.preference.Preference; import org.schabi.newpipe.R; import org.schabi.newpipe.util.PicassoHelper; +import org.schabi.newpipe.local.feed.notifications.NotificationWorker; import leakcanary.LeakCanary; @@ -20,10 +21,13 @@ public class DebugSettingsFragment extends BasePreferenceFragment { = findPreference(getString(R.string.show_image_indicators_key)); final Preference crashTheAppPreference = findPreference(getString(R.string.crash_the_app_key)); + final Preference checkNewStreamsPreference + = findPreference(getString(R.string.check_new_streams_key)); assert showMemoryLeaksPreference != null; assert showImageIndicatorsPreference != null; assert crashTheAppPreference != null; + assert checkNewStreamsPreference != null; showMemoryLeaksPreference.setOnPreferenceClickListener(preference -> { startActivity(LeakCanary.INSTANCE.newLeakDisplayActivityIntent()); @@ -38,5 +42,10 @@ public class DebugSettingsFragment extends BasePreferenceFragment { crashTheAppPreference.setOnPreferenceClickListener(preference -> { throw new RuntimeException(); }); + + checkNewStreamsPreference.setOnPreferenceClickListener(preference -> { + NotificationWorker.runNow(preference.getContext()); + return true; + }); } } diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 67b7b2527..3c2866c94 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -1,7 +1,5 @@ package org.schabi.newpipe; -import android.app.NotificationChannel; -import android.app.NotificationManager; import android.content.Context; import android.content.SharedPreferences; import android.util.Log; @@ -250,18 +248,15 @@ public class App extends MultiDexApplication { .setDescription(getString(R.string.hash_channel_description)) .build(); - final NotificationChannel newStreamsChannel = new NotificationChannel( - getString(R.string.streams_notification_channel_id), - getString(R.string.streams_notification_channel_name), - NotificationManager.IMPORTANCE_DEFAULT - ); - newStreamsChannel.setDescription( - getString(R.string.streams_notification_channel_description) - ); - newStreamsChannel.enableVibration(false); + final NotificationChannelCompat newStreamsChannel = new NotificationChannelCompat + .Builder(getString(R.string.streams_notification_channel_id), + NotificationManagerCompat.IMPORTANCE_DEFAULT) + .setName(getString(R.string.streams_notification_channel_name)) + .setDescription(getString(R.string.streams_notification_channel_description)) + .build(); final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); - notificationManager.createNotificationChannels( + notificationManager.createNotificationChannelsCompat( Arrays.asList(mainChannel, appUpdateChannel, hashChannel, newStreamsChannel) ); } diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 7770d25dc..89964acbc 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -69,7 +69,7 @@ import org.schabi.newpipe.fragments.BackPressable; import org.schabi.newpipe.fragments.MainFragment; import org.schabi.newpipe.fragments.detail.VideoDetailFragment; import org.schabi.newpipe.fragments.list.search.SearchFragment; -import org.schabi.newpipe.notifications.NotificationWorker; +import org.schabi.newpipe.local.feed.notifications.NotificationWorker; import org.schabi.newpipe.player.Player; import org.schabi.newpipe.player.event.OnKeyDownListener; import org.schabi.newpipe.player.helper.PlayerHolder; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt index fbb46134d..a22fd2bb9 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt +++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.kt @@ -40,7 +40,7 @@ abstract class StreamDAO : BasicDAO { internal abstract fun silentInsertAllInternal(streams: List): List @Query("SELECT COUNT(*) != 0 FROM streams WHERE url = :url AND service_id = :serviceId") - internal abstract fun exists(serviceId: Long, url: String?): Boolean + internal abstract fun exists(serviceId: Int, url: String): Boolean @Query( """ diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index 754036dfd..941035b07 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -44,7 +44,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.fragments.list.BaseListInfoFragment; import org.schabi.newpipe.ktx.AnimationType; import org.schabi.newpipe.local.subscription.SubscriptionManager; -import org.schabi.newpipe.notifications.NotificationHelper; +import org.schabi.newpipe.local.feed.notifications.NotificationHelper; import org.schabi.newpipe.player.playqueue.ChannelPlayQueue; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.util.ExtractorHelper; @@ -252,13 +252,13 @@ public class ChannelFragment extends BaseListInfoFragment .map(List::isEmpty) .distinctUntilChanged() .observeOn(AndroidSchedulers.mainThread()) - .subscribe((Boolean isEmpty) -> updateSubscribeButton(!isEmpty), onError)); + .subscribe(isEmpty -> updateSubscribeButton(!isEmpty), onError)); disposables.add(observable .map(List::isEmpty) - .filter(x -> NotificationHelper.isNewStreamsNotificationsEnabled(requireContext())) .distinctUntilChanged() - .skip(1) + .skip(1) // channel has just been opened + .filter(x -> NotificationHelper.isNewStreamsNotificationsEnabled(requireContext())) .observeOn(AndroidSchedulers.mainThread()) .subscribe(isEmpty -> { if (!isEmpty) { diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt index ff7c2848e..c4a9f6af9 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedDatabaseManager.kt @@ -72,6 +72,10 @@ class FeedDatabaseManager(context: Context) { fun markAsOutdated(subscriptionId: Long) = feedTable .setLastUpdatedForSubscription(FeedLastUpdatedEntity(subscriptionId, null)) + fun isStreamExist(stream: StreamInfoItem): Boolean { + return streamTable.exists(stream.serviceId, stream.url) + } + fun upsertAll( subscriptionId: Long, items: List, diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt new file mode 100644 index 000000000..ec5cb790f --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationHelper.kt @@ -0,0 +1,135 @@ +package org.schabi.newpipe.local.feed.notifications + +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.graphics.BitmapFactory +import android.net.Uri +import android.os.Build +import android.provider.Settings +import androidx.core.app.NotificationCompat +import androidx.core.app.NotificationManagerCompat +import androidx.core.content.ContextCompat +import androidx.preference.PreferenceManager +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.core.Single +import io.reactivex.rxjava3.schedulers.Schedulers +import org.schabi.newpipe.R +import org.schabi.newpipe.extractor.stream.StreamInfoItem +import org.schabi.newpipe.local.feed.service.FeedUpdateInfo +import org.schabi.newpipe.util.NavigationHelper + +class NotificationHelper(val context: Context) { + + private val manager = context.getSystemService( + Context.NOTIFICATION_SERVICE + ) as NotificationManager + + fun notify(data: FeedUpdateInfo): Completable { + val newStreams: List = data.newStreams + val summary = context.resources.getQuantityString( + R.plurals.new_streams, newStreams.size, newStreams.size + ) + val builder = NotificationCompat.Builder( + context, + context.getString(R.string.streams_notification_channel_id) + ) + .setContentTitle( + context.getString( + R.string.notification_title_pattern, + data.name, + summary + ) + ) + .setContentText( + data.listInfo.relatedItems.joinToString( + context.getString(R.string.enumeration_comma) + ) { x -> x.name } + ) + .setNumber(newStreams.size) + .setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE) + .setPriority(NotificationCompat.PRIORITY_DEFAULT) + .setSmallIcon(R.drawable.ic_newpipe_triangle_white) + .setLargeIcon( + BitmapFactory.decodeResource( + context.resources, + R.drawable.ic_newpipe_triangle_white + ) + ) + .setColor(ContextCompat.getColor(context, R.color.ic_launcher_background)) + .setColorized(true) + .setAutoCancel(true) + .setCategory(NotificationCompat.CATEGORY_SOCIAL) + val style = NotificationCompat.InboxStyle() + for (stream in newStreams) { + style.addLine(stream.name) + } + style.setSummaryText(summary) + style.setBigContentTitle(data.name) + builder.setStyle(style) + builder.setContentIntent( + PendingIntent.getActivity( + context, + data.pseudoId, + NavigationHelper.getChannelIntent(context, data.listInfo.serviceId, data.listInfo.url) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + 0 + ) + ) + return Single.create(NotificationIcon(context, data.avatarUrl)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .doOnSuccess { icon -> + builder.setLargeIcon(icon) + } + .ignoreElement() + .onErrorComplete() + .doOnComplete { manager.notify(data.pseudoId, builder.build()) } + } + + companion object { + /** + * Check whether notifications are not disabled by user via system settings. + * + * @param context Context + * @return true if notifications are allowed, false otherwise + */ + fun isNotificationsEnabledNative(context: Context): Boolean { + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channelId = context.getString(R.string.streams_notification_channel_id) + val manager = context.getSystemService( + Context.NOTIFICATION_SERVICE + ) as NotificationManager + val channel = manager.getNotificationChannel(channelId) + channel != null && channel.importance != NotificationManager.IMPORTANCE_NONE + } else { + NotificationManagerCompat.from(context).areNotificationsEnabled() + } + } + + @JvmStatic + fun isNewStreamsNotificationsEnabled(context: Context): Boolean { + return ( + PreferenceManager.getDefaultSharedPreferences(context) + .getBoolean(context.getString(R.string.enable_streams_notifications), false) && + isNotificationsEnabledNative(context) + ) + } + + fun openNativeSettingsScreen(context: Context) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channelId = context.getString(R.string.streams_notification_channel_id) + val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS) + .putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName) + .putExtra(Settings.EXTRA_CHANNEL_ID, channelId) + context.startActivity(intent) + } else { + val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) + intent.data = Uri.parse("package:" + context.packageName) + context.startActivity(intent) + } + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationIcon.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationIcon.kt new file mode 100644 index 000000000..eea39dfd3 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationIcon.kt @@ -0,0 +1,48 @@ +package org.schabi.newpipe.local.feed.notifications + +import android.app.ActivityManager +import android.content.Context +import android.graphics.Bitmap +import android.view.View +import com.nostra13.universalimageloader.core.ImageLoader +import com.nostra13.universalimageloader.core.assist.FailReason +import com.nostra13.universalimageloader.core.assist.ImageSize +import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener +import io.reactivex.rxjava3.core.SingleEmitter +import io.reactivex.rxjava3.core.SingleOnSubscribe + +internal class NotificationIcon( + context: Context, + private val url: String +) : SingleOnSubscribe { + + private val size = getIconSize(context) + + override fun subscribe(emitter: SingleEmitter) { + ImageLoader.getInstance().loadImage( + url, + ImageSize(size, size), + object : SimpleImageLoadingListener() { + override fun onLoadingFailed(imageUri: String?, view: View?, failReason: FailReason) { + emitter.onError(failReason.cause) + } + + override fun onLoadingComplete(imageUri: String?, view: View?, loadedImage: Bitmap) { + emitter.onSuccess(loadedImage) + } + } + ) + } + + private companion object { + + fun getIconSize(context: Context): Int { + val activityManager = context.getSystemService( + Context.ACTIVITY_SERVICE + ) as ActivityManager? + val size1 = activityManager?.launcherLargeIconSize ?: 0 + val size2 = context.resources.getDimensionPixelSize(android.R.dimen.app_icon_size) + return maxOf(size2, size1) + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/notifications/NotificationWorker.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt similarity index 64% rename from app/src/main/java/org/schabi/newpipe/notifications/NotificationWorker.kt rename to app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt index 24dbc82e0..896735983 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/NotificationWorker.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/NotificationWorker.kt @@ -1,4 +1,4 @@ -package org.schabi.newpipe.notifications +package org.schabi.newpipe.local.feed.notifications import android.content.Context import androidx.preference.PreferenceManager @@ -6,14 +6,16 @@ import androidx.work.BackoffPolicy import androidx.work.Constraints import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.NetworkType +import androidx.work.OneTimeWorkRequestBuilder import androidx.work.PeriodicWorkRequest -import androidx.work.RxWorker import androidx.work.WorkManager import androidx.work.WorkerParameters -import io.reactivex.BackpressureStrategy -import io.reactivex.Flowable -import io.reactivex.Single +import androidx.work.rxjava3.RxWorker +import io.reactivex.rxjava3.core.Observable +import io.reactivex.rxjava3.core.Single import org.schabi.newpipe.R +import org.schabi.newpipe.database.subscription.NotificationMode +import org.schabi.newpipe.local.feed.service.FeedLoadManager import java.util.concurrent.TimeUnit class NotificationWorker( @@ -24,20 +26,27 @@ class NotificationWorker( private val notificationHelper by lazy { NotificationHelper(appContext) } + private val feedLoadManager = FeedLoadManager(appContext) - override fun createWork() = if (isEnabled(applicationContext)) { - Flowable.create( - SubscriptionUpdates(applicationContext), - BackpressureStrategy.BUFFER - ).doOnNext { notificationHelper.notify(it) } - .toList() - .map { Result.success() } + override fun createWork(): Single = if (isEnabled(applicationContext)) { + feedLoadManager.startLoading() + .map { feed -> + feed.mapNotNull { x -> + x.value?.takeIf { + it.notificationMode == NotificationMode.ENABLED_DEFAULT && + it.newStreamsCount > 0 + } + } + } + .flatMapObservable { Observable.fromIterable(it) } + .flatMapCompletable { x -> notificationHelper.notify(x) } + .toSingleDefault(Result.success()) .onErrorReturnItem(Result.failure()) } else Single.just(Result.success()) companion object { - private const val TAG = "notifications" + private const val TAG = "streams_notifications" private fun isEnabled(context: Context): Boolean { return PreferenceManager.getDefaultSharedPreferences(context) @@ -78,5 +87,13 @@ class NotificationWorker( @JvmStatic fun schedule(context: Context) = schedule(context, ScheduleOptions.from(context)) + + @JvmStatic + fun runNow(context: Context) { + val request = OneTimeWorkRequestBuilder() + .addTag(TAG) + .build() + WorkManager.getInstance(context).enqueue(request) + } } } diff --git a/app/src/main/java/org/schabi/newpipe/notifications/ScheduleOptions.kt b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/ScheduleOptions.kt similarity index 96% rename from app/src/main/java/org/schabi/newpipe/notifications/ScheduleOptions.kt rename to app/src/main/java/org/schabi/newpipe/local/feed/notifications/ScheduleOptions.kt index b0617b303..30e8d5515 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/ScheduleOptions.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/notifications/ScheduleOptions.kt @@ -1,4 +1,4 @@ -package org.schabi.newpipe.notifications +package org.schabi.newpipe.local.feed.notifications import android.content.Context import androidx.preference.PreferenceManager diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt new file mode 100644 index 000000000..79c4b747b --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadManager.kt @@ -0,0 +1,217 @@ +package org.schabi.newpipe.local.feed.service + +import android.content.Context +import androidx.preference.PreferenceManager +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.core.Flowable +import io.reactivex.rxjava3.core.Notification +import io.reactivex.rxjava3.core.Single +import io.reactivex.rxjava3.functions.Consumer +import io.reactivex.rxjava3.processors.PublishProcessor +import io.reactivex.rxjava3.schedulers.Schedulers +import org.schabi.newpipe.R +import org.schabi.newpipe.database.feed.model.FeedGroupEntity +import org.schabi.newpipe.extractor.ListInfo +import org.schabi.newpipe.extractor.stream.StreamInfoItem +import org.schabi.newpipe.local.feed.FeedDatabaseManager +import org.schabi.newpipe.local.subscription.SubscriptionManager +import org.schabi.newpipe.util.ExtractorHelper +import java.time.OffsetDateTime +import java.time.ZoneOffset +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicInteger + +class FeedLoadManager(private val context: Context) { + + private val subscriptionManager = SubscriptionManager(context) + private val feedDatabaseManager = FeedDatabaseManager(context) + + private val notificationUpdater = PublishProcessor.create() + private val currentProgress = AtomicInteger(-1) + private val maxProgress = AtomicInteger(-1) + private val cancelSignal = AtomicBoolean() + private val feedResultsHolder = FeedResultsHolder() + + val notification: Flowable = notificationUpdater.map { description -> + FeedLoadState(description, maxProgress.get(), currentProgress.get()) + } + + fun startLoading( + groupId: Long = FeedGroupEntity.GROUP_ALL_ID + ): Single>> { + val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val useFeedExtractor = defaultSharedPreferences.getBoolean( + context.getString(R.string.feed_use_dedicated_fetch_method_key), + false + ) + val thresholdOutdatedSeconds = defaultSharedPreferences.getString( + context.getString(R.string.feed_update_threshold_key), + context.getString(R.string.feed_update_threshold_default_value) + )!!.toInt() + + val outdatedThreshold = OffsetDateTime.now(ZoneOffset.UTC).minusSeconds(thresholdOutdatedSeconds.toLong()) + + val subscriptions = when (groupId) { + FeedGroupEntity.GROUP_ALL_ID -> feedDatabaseManager.outdatedSubscriptions(outdatedThreshold) + else -> feedDatabaseManager.outdatedSubscriptionsForGroup(groupId, outdatedThreshold) + } + + return subscriptions + .take(1) + + .doOnNext { + currentProgress.set(0) + maxProgress.set(it.size) + } + .filter { it.isNotEmpty() } + + .observeOn(AndroidSchedulers.mainThread()) + .doOnNext { + notificationUpdater.onNext("") + broadcastProgress() + } + + .observeOn(Schedulers.io()) + .flatMap { Flowable.fromIterable(it) } + .takeWhile { !cancelSignal.get() } + + .parallel(PARALLEL_EXTRACTIONS, PARALLEL_EXTRACTIONS * 2) + .runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2) + .filter { !cancelSignal.get() } + + .map { subscriptionEntity -> + var error: Throwable? = null + try { + val listInfo = if (useFeedExtractor) { + ExtractorHelper + .getFeedInfoFallbackToChannelInfo(subscriptionEntity.serviceId, subscriptionEntity.url) + .onErrorReturn { + error = it // store error, otherwise wrapped into RuntimeException + throw it + } + .blockingGet() + } else { + ExtractorHelper + .getChannelInfo(subscriptionEntity.serviceId, subscriptionEntity.url, true) + .onErrorReturn { + error = it // store error, otherwise wrapped into RuntimeException + throw it + } + .blockingGet() + } as ListInfo + + return@map Notification.createOnNext(FeedUpdateInfo(subscriptionEntity, listInfo)) + } catch (e: Throwable) { + if (error == null) { + // do this to prevent blockingGet() from wrapping into RuntimeException + error = e + } + + val request = "${subscriptionEntity.serviceId}:${subscriptionEntity.url}" + val wrapper = FeedLoadService.RequestException(subscriptionEntity.uid, request, error!!) + return@map Notification.createOnError(wrapper) + } + } + .sequential() + + .observeOn(AndroidSchedulers.mainThread()) + .doOnNext(NotificationConsumer()) + + .observeOn(Schedulers.io()) + .buffer(BUFFER_COUNT_BEFORE_INSERT) + .doOnNext(DatabaseConsumer()) + + .subscribeOn(Schedulers.io()) + .toList() + .flatMap { x -> postProcessFeed().toSingleDefault(x.flatten()) } + } + + fun cancel() { + cancelSignal.set(true) + } + + private fun broadcastProgress() { + FeedEventManager.postEvent(FeedEventManager.Event.ProgressEvent(currentProgress.get(), maxProgress.get())) + } + + private fun postProcessFeed() = Completable.fromRunnable { + FeedEventManager.postEvent(FeedEventManager.Event.ProgressEvent(R.string.feed_processing_message)) + feedDatabaseManager.removeOrphansOrOlderStreams() + + FeedEventManager.postEvent(FeedEventManager.Event.SuccessResultEvent(feedResultsHolder.itemsErrors)) + }.doOnSubscribe { + currentProgress.set(-1) + maxProgress.set(-1) + + notificationUpdater.onNext(context.getString(R.string.feed_processing_message)) + FeedEventManager.postEvent(FeedEventManager.Event.ProgressEvent(R.string.feed_processing_message)) + }.subscribeOn(Schedulers.io()) + + private inner class NotificationConsumer : Consumer> { + override fun accept(item: Notification) { + currentProgress.incrementAndGet() + notificationUpdater.onNext(item.value?.name.orEmpty()) + + broadcastProgress() + } + } + + private inner class DatabaseConsumer : Consumer>> { + + override fun accept(list: List>) { + feedDatabaseManager.database().runInTransaction { + for (notification in list) { + when { + notification.isOnNext -> { + val subscriptionId = notification.value.uid + val info = notification.value.listInfo + + notification.value.newStreamsCount = countNewStreams(info.relatedItems) + feedDatabaseManager.upsertAll(subscriptionId, info.relatedItems) + subscriptionManager.updateFromInfo(subscriptionId, info) + + if (info.errors.isNotEmpty()) { + feedResultsHolder.addErrors(FeedLoadService.RequestException.wrapList(subscriptionId, info)) + feedDatabaseManager.markAsOutdated(subscriptionId) + } + } + notification.isOnError -> { + val error = notification.error + feedResultsHolder.addError(error) + + if (error is FeedLoadService.RequestException) { + feedDatabaseManager.markAsOutdated(error.subscriptionId) + } + } + } + } + } + } + + private fun countNewStreams(list: List): Int { + var count = 0 + for (item in list) { + if (feedDatabaseManager.isStreamExist(item)) { + return count + } else { + count++ + } + } + return 0 + } + } + + private companion object { + + /** + * How many extractions will be running in parallel. + */ + const val PARALLEL_EXTRACTIONS = 6 + + /** + * Number of items to buffer to mass-insert in the database. + */ + const val BUFFER_COUNT_BEFORE_INSERT = 20 + } +} diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt index 98ff5914d..ea181d3d9 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadService.kt @@ -31,36 +31,19 @@ import android.util.Log import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.core.app.ServiceCompat -import androidx.preference.PreferenceManager import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Flowable -import io.reactivex.rxjava3.core.Notification -import io.reactivex.rxjava3.core.Single -import io.reactivex.rxjava3.disposables.CompositeDisposable -import io.reactivex.rxjava3.functions.Consumer +import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.functions.Function -import io.reactivex.rxjava3.processors.PublishProcessor -import io.reactivex.rxjava3.schedulers.Schedulers -import org.reactivestreams.Subscriber -import org.reactivestreams.Subscription import org.schabi.newpipe.App import org.schabi.newpipe.MainActivity.DEBUG import org.schabi.newpipe.R import org.schabi.newpipe.database.feed.model.FeedGroupEntity import org.schabi.newpipe.extractor.ListInfo import org.schabi.newpipe.extractor.stream.StreamInfoItem -import org.schabi.newpipe.local.feed.FeedDatabaseManager import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ErrorResultEvent -import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.ProgressEvent -import org.schabi.newpipe.local.feed.service.FeedEventManager.Event.SuccessResultEvent import org.schabi.newpipe.local.feed.service.FeedEventManager.postEvent -import org.schabi.newpipe.local.subscription.SubscriptionManager -import org.schabi.newpipe.util.ExtractorHelper -import java.time.OffsetDateTime -import java.time.ZoneOffset import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger class FeedLoadService : Service() { companion object { @@ -73,27 +56,13 @@ class FeedLoadService : Service() { */ private const val NOTIFICATION_SAMPLING_PERIOD = 1500 - /** - * How many extractions will be running in parallel. - */ - private const val PARALLEL_EXTRACTIONS = 6 - - /** - * Number of items to buffer to mass-insert in the database. - */ - private const val BUFFER_COUNT_BEFORE_INSERT = 20 - const val EXTRA_GROUP_ID: String = "FeedLoadService.EXTRA_GROUP_ID" } - private var loadingSubscription: Subscription? = null - private lateinit var subscriptionManager: SubscriptionManager + private var loadingDisposable: Disposable? = null + private var notificationDisposable: Disposable? = null - private lateinit var feedDatabaseManager: FeedDatabaseManager - private lateinit var feedResultsHolder: ResultsHolder - - private var disposables = CompositeDisposable() - private var notificationUpdater = PublishProcessor.create() + private lateinit var feedLoadManager: FeedLoadManager // ///////////////////////////////////////////////////////////////////////// // Lifecycle @@ -101,8 +70,7 @@ class FeedLoadService : Service() { override fun onCreate() { super.onCreate() - subscriptionManager = SubscriptionManager(this) - feedDatabaseManager = FeedDatabaseManager(this) + feedLoadManager = FeedLoadManager(this) } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { @@ -114,40 +82,45 @@ class FeedLoadService : Service() { ) } - if (intent == null || loadingSubscription != null) { + if (intent == null || loadingDisposable != null) { return START_NOT_STICKY } setupNotification() setupBroadcastReceiver() - val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this) val groupId = intent.getLongExtra(EXTRA_GROUP_ID, FeedGroupEntity.GROUP_ALL_ID) - val useFeedExtractor = defaultSharedPreferences - .getBoolean(getString(R.string.feed_use_dedicated_fetch_method_key), false) - - val thresholdOutdatedSecondsString = defaultSharedPreferences - .getString(getString(R.string.feed_update_threshold_key), getString(R.string.feed_update_threshold_default_value)) - val thresholdOutdatedSeconds = thresholdOutdatedSecondsString!!.toInt() - - startLoading(groupId, useFeedExtractor, thresholdOutdatedSeconds) - + loadingDisposable = feedLoadManager.startLoading(groupId) + .observeOn(AndroidSchedulers.mainThread()) + .doOnSubscribe { + startForeground(NOTIFICATION_ID, notificationBuilder.build()) + } + .subscribe { _, error -> + // There seems to be a bug in the kotlin plugin as it tells you when + // building that this can't be null: + // "Condition 'error != null' is always 'true'" + // However it can indeed be null + // The suppression may be removed in further versions + @Suppress("SENSELESS_COMPARISON") + if (error != null) { + Log.e(TAG, "Error while storing result", error) + handleError(error) + return@subscribe + } + stopService() + } return START_NOT_STICKY } private fun disposeAll() { unregisterReceiver(broadcastReceiver) - - loadingSubscription?.cancel() - loadingSubscription = null - - disposables.dispose() + loadingDisposable?.dispose() + notificationDisposable?.dispose() } private fun stopService() { disposeAll() ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE) - notificationManager.cancel(NOTIFICATION_ID) stopSelf() } @@ -171,190 +144,6 @@ class FeedLoadService : Service() { } } - private fun startLoading(groupId: Long = FeedGroupEntity.GROUP_ALL_ID, useFeedExtractor: Boolean, thresholdOutdatedSeconds: Int) { - feedResultsHolder = ResultsHolder() - - val outdatedThreshold = OffsetDateTime.now(ZoneOffset.UTC).minusSeconds(thresholdOutdatedSeconds.toLong()) - - val subscriptions = when (groupId) { - FeedGroupEntity.GROUP_ALL_ID -> feedDatabaseManager.outdatedSubscriptions(outdatedThreshold) - else -> feedDatabaseManager.outdatedSubscriptionsForGroup(groupId, outdatedThreshold) - } - - subscriptions - .take(1) - - .doOnNext { - currentProgress.set(0) - maxProgress.set(it.size) - } - .filter { it.isNotEmpty() } - - .observeOn(AndroidSchedulers.mainThread()) - .doOnNext { - startForeground(NOTIFICATION_ID, notificationBuilder.build()) - updateNotificationProgress(null) - broadcastProgress() - } - - .observeOn(Schedulers.io()) - .flatMap { Flowable.fromIterable(it) } - .takeWhile { !cancelSignal.get() } - - .parallel(PARALLEL_EXTRACTIONS, PARALLEL_EXTRACTIONS * 2) - .runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2) - .filter { !cancelSignal.get() } - - .map { subscriptionEntity -> - var error: Throwable? = null - try { - val listInfo = if (useFeedExtractor) { - ExtractorHelper - .getFeedInfoFallbackToChannelInfo(subscriptionEntity.serviceId, subscriptionEntity.url) - .onErrorReturn { - error = it // store error, otherwise wrapped into RuntimeException - throw it - } - .blockingGet() - } else { - ExtractorHelper - .getChannelInfo(subscriptionEntity.serviceId, subscriptionEntity.url, true) - .onErrorReturn { - error = it // store error, otherwise wrapped into RuntimeException - throw it - } - .blockingGet() - } as ListInfo - - return@map Notification.createOnNext(Pair(subscriptionEntity.uid, listInfo)) - } catch (e: Throwable) { - if (error == null) { - // do this to prevent blockingGet() from wrapping into RuntimeException - error = e - } - - val request = "${subscriptionEntity.serviceId}:${subscriptionEntity.url}" - val wrapper = RequestException(subscriptionEntity.uid, request, error!!) - return@map Notification.createOnError>>(wrapper) - } - } - .sequential() - - .observeOn(AndroidSchedulers.mainThread()) - .doOnNext(notificationsConsumer) - - .observeOn(Schedulers.io()) - .buffer(BUFFER_COUNT_BEFORE_INSERT) - .doOnNext(databaseConsumer) - - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(resultSubscriber) - } - - private fun broadcastProgress() { - postEvent(ProgressEvent(currentProgress.get(), maxProgress.get())) - } - - private val resultSubscriber - get() = object : Subscriber>>>> { - - override fun onSubscribe(s: Subscription) { - loadingSubscription = s - s.request(java.lang.Long.MAX_VALUE) - } - - override fun onNext(notification: List>>>) { - if (DEBUG) Log.v(TAG, "onNext() → $notification") - } - - override fun onError(error: Throwable) { - handleError(error) - } - - override fun onComplete() { - if (maxProgress.get() == 0) { - postEvent(FeedEventManager.Event.IdleEvent) - stopService() - - return - } - - currentProgress.set(-1) - maxProgress.set(-1) - - notificationUpdater.onNext(getString(R.string.feed_processing_message)) - postEvent(ProgressEvent(R.string.feed_processing_message)) - - disposables.add( - Single - .fromCallable { - feedResultsHolder.ready() - - postEvent(ProgressEvent(R.string.feed_processing_message)) - feedDatabaseManager.removeOrphansOrOlderStreams() - - postEvent(SuccessResultEvent(feedResultsHolder.itemsErrors)) - true - } - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { _, throwable -> - // There seems to be a bug in the kotlin plugin as it tells you when - // building that this can't be null: - // "Condition 'throwable != null' is always 'true'" - // However it can indeed be null - // The suppression may be removed in further versions - @Suppress("SENSELESS_COMPARISON") - if (throwable != null) { - Log.e(TAG, "Error while storing result", throwable) - handleError(throwable) - return@subscribe - } - stopService() - } - ) - } - } - - private val databaseConsumer: Consumer>>>> - get() = Consumer { - feedDatabaseManager.database().runInTransaction { - for (notification in it) { - - if (notification.isOnNext) { - val subscriptionId = notification.value!!.first - val info = notification.value!!.second - - feedDatabaseManager.upsertAll(subscriptionId, info.relatedItems) - subscriptionManager.updateFromInfo(subscriptionId, info) - - if (info.errors.isNotEmpty()) { - feedResultsHolder.addErrors(RequestException.wrapList(subscriptionId, info)) - feedDatabaseManager.markAsOutdated(subscriptionId) - } - } else if (notification.isOnError) { - val error = notification.error!! - feedResultsHolder.addError(error) - - if (error is RequestException) { - feedDatabaseManager.markAsOutdated(error.subscriptionId) - } - } - } - } - } - - private val notificationsConsumer: Consumer>>> - get() = Consumer { onItemCompleted(it.value?.second?.name) } - - private fun onItemCompleted(updateDescription: String?) { - currentProgress.incrementAndGet() - notificationUpdater.onNext(updateDescription ?: "") - - broadcastProgress() - } - // ///////////////////////////////////////////////////////////////////////// // Notification // ///////////////////////////////////////////////////////////////////////// @@ -362,9 +151,6 @@ class FeedLoadService : Service() { private lateinit var notificationManager: NotificationManagerCompat private lateinit var notificationBuilder: NotificationCompat.Builder - private var currentProgress = AtomicInteger(-1) - private var maxProgress = AtomicInteger(-1) - private fun createNotification(): NotificationCompat.Builder { val cancelActionIntent = PendingIntent.getBroadcast( this, @@ -384,33 +170,36 @@ class FeedLoadService : Service() { notificationManager = NotificationManagerCompat.from(this) notificationBuilder = createNotification() - val throttleAfterFirstEmission = Function { flow: Flowable -> + val throttleAfterFirstEmission = Function { flow: Flowable -> flow.take(1).concatWith(flow.skip(1).throttleLatest(NOTIFICATION_SAMPLING_PERIOD.toLong(), TimeUnit.MILLISECONDS)) } - disposables.add( - notificationUpdater - .publish(throttleAfterFirstEmission) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::updateNotificationProgress) - ) + notificationDisposable = feedLoadManager.notification + .publish(throttleAfterFirstEmission) + .observeOn(AndroidSchedulers.mainThread()) + .doOnTerminate { notificationManager.cancel(NOTIFICATION_ID) } + .subscribe(this::updateNotificationProgress) } - private fun updateNotificationProgress(updateDescription: String?) { - notificationBuilder.setProgress(maxProgress.get(), currentProgress.get(), maxProgress.get() == -1) + private fun updateNotificationProgress(state: FeedLoadState) { + notificationBuilder.setProgress(state.maxProgress, state.currentProgress, state.maxProgress == -1) - if (maxProgress.get() == -1) { + if (state.maxProgress == -1) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) notificationBuilder.setContentInfo(null) - if (!updateDescription.isNullOrEmpty()) notificationBuilder.setContentText(updateDescription) - notificationBuilder.setContentText(updateDescription) + if (state.updateDescription.isNotEmpty()) notificationBuilder.setContentText(state.updateDescription) + notificationBuilder.setContentText(state.updateDescription) } else { - val progressText = this.currentProgress.toString() + "/" + maxProgress + val progressText = state.currentProgress.toString() + "/" + state.maxProgress if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - if (!updateDescription.isNullOrEmpty()) notificationBuilder.setContentText("$updateDescription ($progressText)") + if (state.updateDescription.isNotEmpty()) { + notificationBuilder.setContentText("${state.updateDescription} ($progressText)") + } } else { notificationBuilder.setContentInfo(progressText) - if (!updateDescription.isNullOrEmpty()) notificationBuilder.setContentText(updateDescription) + if (state.updateDescription.isNotEmpty()) { + notificationBuilder.setContentText(state.updateDescription) + } } } @@ -422,13 +211,12 @@ class FeedLoadService : Service() { // ///////////////////////////////////////////////////////////////////////// private lateinit var broadcastReceiver: BroadcastReceiver - private val cancelSignal = AtomicBoolean() private fun setupBroadcastReceiver() { broadcastReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { if (intent?.action == ACTION_CANCEL) { - cancelSignal.set(true) + feedLoadManager.cancel() } } } @@ -443,29 +231,4 @@ class FeedLoadService : Service() { postEvent(ErrorResultEvent(error)) stopService() } - - // ///////////////////////////////////////////////////////////////////////// - // Results Holder - // ///////////////////////////////////////////////////////////////////////// - - class ResultsHolder { - /** - * List of errors that may have happen during loading. - */ - internal lateinit var itemsErrors: List - - private val itemsErrorsHolder: MutableList = ArrayList() - - fun addError(error: Throwable) { - itemsErrorsHolder.add(error) - } - - fun addErrors(errors: List) { - itemsErrorsHolder.addAll(errors) - } - - fun ready() { - itemsErrors = itemsErrorsHolder.toList() - } - } } diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadState.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadState.kt new file mode 100644 index 000000000..703f593ad --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedLoadState.kt @@ -0,0 +1,7 @@ +package org.schabi.newpipe.local.feed.service + +data class FeedLoadState( + val updateDescription: String, + val maxProgress: Int, + val currentProgress: Int, +) diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedResultsHolder.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedResultsHolder.kt new file mode 100644 index 000000000..729f2c009 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedResultsHolder.kt @@ -0,0 +1,19 @@ +package org.schabi.newpipe.local.feed.service + +class FeedResultsHolder { + /** + * List of errors that may have happen during loading. + */ + val itemsErrors: List + get() = itemsErrorsHolder + + private val itemsErrorsHolder: MutableList = ArrayList() + + fun addError(error: Throwable) { + itemsErrorsHolder.add(error) + } + + fun addErrors(errors: List) { + itemsErrorsHolder.addAll(errors) + } +} diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedUpdateInfo.kt b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedUpdateInfo.kt new file mode 100644 index 000000000..a86578e15 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/local/feed/service/FeedUpdateInfo.kt @@ -0,0 +1,34 @@ +package org.schabi.newpipe.local.feed.service + +import org.schabi.newpipe.database.subscription.NotificationMode +import org.schabi.newpipe.database.subscription.SubscriptionEntity +import org.schabi.newpipe.extractor.ListInfo +import org.schabi.newpipe.extractor.stream.StreamInfoItem + +data class FeedUpdateInfo( + val uid: Long, + @NotificationMode + val notificationMode: Int, + val name: String, + val avatarUrl: String, + val listInfo: ListInfo +) { + constructor(subscription: SubscriptionEntity, listInfo: ListInfo) : this( + uid = subscription.uid, + notificationMode = subscription.notificationMode, + name = subscription.name, + avatarUrl = subscription.avatarUrl, + listInfo = listInfo + ) + + /** + * Integer id, can be used as notification id, etc. + */ + val pseudoId: Int + get() = listInfo.url.hashCode() + + var newStreamsCount: Int = 0 + + val newStreams: List + get() = listInfo.relatedItems.take(newStreamsCount) +} diff --git a/app/src/main/java/org/schabi/newpipe/notifications/ChannelUpdates.kt b/app/src/main/java/org/schabi/newpipe/notifications/ChannelUpdates.kt deleted file mode 100644 index 9a3b2cbf3..000000000 --- a/app/src/main/java/org/schabi/newpipe/notifications/ChannelUpdates.kt +++ /dev/null @@ -1,46 +0,0 @@ -package org.schabi.newpipe.notifications - -import android.content.Context -import android.content.Intent -import org.schabi.newpipe.R -import org.schabi.newpipe.extractor.channel.ChannelInfo -import org.schabi.newpipe.extractor.stream.StreamInfoItem -import org.schabi.newpipe.util.NavigationHelper - -data class ChannelUpdates( - val serviceId: Int, - val url: String, - val avatarUrl: String, - val name: String, - val streams: List -) { - - val id = url.hashCode() - - val isNotEmpty: Boolean - get() = streams.isNotEmpty() - - val size = streams.size - - fun getText(context: Context): String { - val separator = context.resources.getString(R.string.enumeration_comma) + " " - return streams.joinToString(separator) { it.name } - } - - fun createOpenChannelIntent(context: Context?): Intent { - return NavigationHelper.getChannelIntent(context, serviceId, url) - .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) - } - - companion object { - fun from(channel: ChannelInfo, streams: List): ChannelUpdates { - return ChannelUpdates( - channel.serviceId, - channel.url, - channel.avatarUrl, - channel.name, - streams - ) - } - } -} diff --git a/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java b/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java deleted file mode 100644 index 6207cd613..000000000 --- a/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.schabi.newpipe.notifications; - -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.graphics.BitmapFactory; -import android.net.Uri; -import android.os.Build; -import android.provider.Settings; - -import androidx.annotation.NonNull; -import androidx.core.app.NotificationCompat; -import androidx.core.app.NotificationManagerCompat; -import androidx.core.content.ContextCompat; -import androidx.preference.PreferenceManager; - -import org.schabi.newpipe.BuildConfig; -import org.schabi.newpipe.R; -import org.schabi.newpipe.extractor.stream.StreamInfoItem; - -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.core.Single; -import io.reactivex.rxjava3.disposables.CompositeDisposable; -import io.reactivex.rxjava3.schedulers.Schedulers; - -public final class NotificationHelper { - - private final Context context; - private final NotificationManager manager; - private final CompositeDisposable disposable; - - public NotificationHelper(final Context context) { - this.context = context; - this.disposable = new CompositeDisposable(); - this.manager = (NotificationManager) context.getSystemService( - Context.NOTIFICATION_SERVICE - ); - } - - public Context getContext() { - return context; - } - - /** - * Check whether notifications are not disabled by user via system settings. - * - * @param context Context - * @return true if notifications are allowed, false otherwise - */ - public static boolean isNotificationsEnabledNative(final Context context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - final String channelId = context.getString(R.string.streams_notification_channel_id); - final NotificationManager manager = (NotificationManager) context - .getSystemService(Context.NOTIFICATION_SERVICE); - if (manager != null) { - final NotificationChannel channel = manager.getNotificationChannel(channelId); - return channel != null - && channel.getImportance() != NotificationManager.IMPORTANCE_NONE; - } else { - return false; - } - } else { - return NotificationManagerCompat.from(context).areNotificationsEnabled(); - } - } - - public static boolean isNewStreamsNotificationsEnabled(@NonNull final Context context) { - return PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean(context.getString(R.string.enable_streams_notifications), false) - && isNotificationsEnabledNative(context); - } - - public static void openNativeSettingsScreen(final Context context) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - final String channelId = context.getString(R.string.streams_notification_channel_id); - final Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS) - .putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName()) - .putExtra(Settings.EXTRA_CHANNEL_ID, channelId); - context.startActivity(intent); - } else { - final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - intent.setData(Uri.parse("package:" + context.getPackageName())); - context.startActivity(intent); - } - } - - public void notify(final ChannelUpdates data) { - final String summary = context.getResources().getQuantityString( - R.plurals.new_streams, data.getSize(), data.getSize() - ); - final NotificationCompat.Builder builder = new NotificationCompat.Builder(context, - context.getString(R.string.streams_notification_channel_id)) - .setContentTitle( - context.getString(R.string.notification_title_pattern, - data.getName(), - summary) - ) - .setContentText(data.getText(context)) - .setNumber(data.getSize()) - .setBadgeIconType(NotificationCompat.BADGE_ICON_LARGE) - .setPriority(NotificationCompat.PRIORITY_DEFAULT) - .setSmallIcon(R.drawable.ic_stat_newpipe) - .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), - R.drawable.ic_newpipe_triangle_white)) - .setColor(ContextCompat.getColor(context, R.color.ic_launcher_background)) - .setColorized(true) - .setAutoCancel(true) - .setCategory(NotificationCompat.CATEGORY_SOCIAL); - final NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle(); - for (final StreamInfoItem stream : data.getStreams()) { - style.addLine(stream.getName()); - } - style.setSummaryText(summary); - style.setBigContentTitle(data.getName()); - builder.setStyle(style); - builder.setContentIntent(PendingIntent.getActivity( - context, - data.getId(), - data.createOpenChannelIntent(context), - 0 - )); - - disposable.add( - Single.create(new NotificationIcon(context, data.getAvatarUrl())) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .doAfterTerminate(() -> manager.notify(data.getId(), builder.build())) - .subscribe(builder::setLargeIcon, throwable -> { - if (BuildConfig.DEBUG) { - throwable.printStackTrace(); - } - }) - ); - } -} diff --git a/app/src/main/java/org/schabi/newpipe/notifications/NotificationIcon.java b/app/src/main/java/org/schabi/newpipe/notifications/NotificationIcon.java deleted file mode 100644 index fc59b55f0..000000000 --- a/app/src/main/java/org/schabi/newpipe/notifications/NotificationIcon.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.schabi.newpipe.notifications; - -import android.app.ActivityManager; -import android.content.Context; -import android.graphics.Bitmap; -import android.view.View; - -import com.nostra13.universalimageloader.core.ImageLoader; -import com.nostra13.universalimageloader.core.assist.FailReason; -import com.nostra13.universalimageloader.core.assist.ImageSize; -import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; - -import io.reactivex.rxjava3.annotations.NonNull; -import io.reactivex.rxjava3.core.SingleEmitter; -import io.reactivex.rxjava3.core.SingleOnSubscribe; - -final class NotificationIcon implements SingleOnSubscribe { - - private final String url; - private final int size; - - NotificationIcon(final Context context, final String url) { - this.url = url; - this.size = getIconSize(context); - } - - @Override - public void subscribe(@NonNull final SingleEmitter emitter) throws Throwable { - ImageLoader.getInstance().loadImage( - url, - new ImageSize(size, size), - new SimpleImageLoadingListener() { - - @Override - public void onLoadingFailed(final String imageUri, - final View view, - final FailReason failReason) { - emitter.onError(failReason.getCause()); - } - - @Override - public void onLoadingComplete(final String imageUri, - final View view, - final Bitmap loadedImage) { - emitter.onSuccess(loadedImage); - } - } - ); - } - - private static int getIconSize(final Context context) { - final ActivityManager activityManager = (ActivityManager) context.getSystemService( - Context.ACTIVITY_SERVICE - ); - final int size2 = activityManager != null ? activityManager.getLauncherLargeIconSize() : 0; - final int size1 = context.getResources() - .getDimensionPixelSize(android.R.dimen.app_icon_size); - return Math.max(size2, size1); - } -} diff --git a/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.kt b/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.kt deleted file mode 100644 index 6f7c3881b..000000000 --- a/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.kt +++ /dev/null @@ -1,53 +0,0 @@ -package org.schabi.newpipe.notifications - -import android.content.Context -import io.reactivex.FlowableEmitter -import io.reactivex.FlowableOnSubscribe -import org.schabi.newpipe.NewPipeDatabase -import org.schabi.newpipe.database.stream.model.StreamEntity -import org.schabi.newpipe.database.subscription.NotificationMode -import org.schabi.newpipe.extractor.stream.StreamInfoItem -import org.schabi.newpipe.local.subscription.SubscriptionManager -import org.schabi.newpipe.util.ExtractorHelper - -class SubscriptionUpdates(context: Context) : FlowableOnSubscribe { - - private val subscriptionManager = SubscriptionManager(context) - private val streamTable = NewPipeDatabase.getInstance(context).streamDAO() - - override fun subscribe(emitter: FlowableEmitter) { - try { - val subscriptions = subscriptionManager.subscriptions().blockingFirst() - for (subscription in subscriptions) { - if (subscription.notificationMode != NotificationMode.DISABLED) { - val channel = ExtractorHelper.getChannelInfo( - subscription.serviceId, - subscription.url, true - ).blockingGet() - val updates = ChannelUpdates.from(channel, filterStreams(channel.relatedItems)) - if (updates.isNotEmpty) { - emitter.onNext(updates) - // prevent duplicated notifications - streamTable.upsertAll(updates.streams.map { StreamEntity(it) }) - } - } - } - emitter.onComplete() - } catch (e: Exception) { - emitter.onError(e) - } - } - - private fun filterStreams(list: List<*>): List { - val streams = ArrayList(list.size) - for (o in list) { - if (o is StreamInfoItem) { - if (streamTable.exists(o.serviceId.toLong(), o.url)) { - break - } - streams.add(o) - } - } - return streams - } -} diff --git a/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.kt b/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.kt index 62a819e64..01a3ca6eb 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.kt @@ -14,10 +14,10 @@ import org.schabi.newpipe.database.subscription.SubscriptionEntity import org.schabi.newpipe.error.ErrorActivity import org.schabi.newpipe.error.ErrorInfo import org.schabi.newpipe.error.UserAction +import org.schabi.newpipe.local.feed.notifications.NotificationHelper +import org.schabi.newpipe.local.feed.notifications.NotificationWorker +import org.schabi.newpipe.local.feed.notifications.ScheduleOptions import org.schabi.newpipe.local.subscription.SubscriptionManager -import org.schabi.newpipe.notifications.NotificationHelper -import org.schabi.newpipe.notifications.NotificationWorker -import org.schabi.newpipe.notifications.ScheduleOptions class NotificationsSettingsFragment : BasePreferenceFragment(), OnSharedPreferenceChangeListener { @@ -47,7 +47,7 @@ class NotificationsSettingsFragment : BasePreferenceFragment(), OnSharedPreferen override fun onResume() { super.onResume() - val enabled = NotificationHelper.isNotificationsEnabledNative(context) + val enabled = NotificationHelper.isNotificationsEnabledNative(requireContext()) preferenceScreen.isEnabled = enabled if (!enabled) { if (notificationWarningSnackbar == null) { diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_newpipe.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_newpipe.xml deleted file mode 100644 index e95f5b4ac..000000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_stat_newpipe.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-hdpi/ic_stat_newpipe.png b/app/src/main/res/drawable-hdpi/ic_stat_newpipe.png deleted file mode 100644 index dc08d67ff89167b42ab133658c4a42d127aca7a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmV;O0b>4%P)QuB#Tw7U`%%oFC2aV032bBx#yy1-$Tux)hO3M%RC0Ua^Em zD?$3XW-RMBuQXQ}vl0~Ar%RtEX?D?LB`CD-u>N3Inm4QExyFkl00000NkvXX Hu0mjfv&*yy diff --git a/app/src/main/res/drawable-mdpi/ic_stat_newpipe.png b/app/src/main/res/drawable-mdpi/ic_stat_newpipe.png deleted file mode 100644 index 4af6c74df80b88fb6208df08da68e02ffbc98f94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 294 zcmV+>0oneEP)igP)*Znnf&%5_L%L)@FOvc!@U8Y?i0hU39R)ID9 zFVA2CM70VyxddIB1)OYyTFnBKH!uqdwF)@71B03coa}=}%>tB9umDQ53OIQHBOphs zfRkg;B2i!-95E%n!4fE!BoH&-4}*KA$P*X?d13_2m?AI--kBm7phJv+Yiu3Z@vuHN zK(!bF*EK!hiYbuO8;{I0dcJPGlT`M=%OGD7>CE&{)kbnXhI+bCDfttAm%|ZsEbepMu+H96xPL(E?&$!iI=(v9wbBXQjrG_ z)*%tXgHhnYiXbWv5eWumNKl&F@56WC1Gm}3J3BV7zXzV%?hHIIGv9pgZV(Vc2qA>5 zkjv#R!way4HS!0#kz3(8tY?vb2Xg#@18^71C?g|n z?NjY7JZ|b9s0@6p@@Op+xj&V zKSYl?(6a13+xaU)jDcRjBY`zy2;^QWFRuAZ<$oIJ4BQ!5X00~u8Hj-xDC7y;$3Uz3 z08a($ojifuCVQ9rK~z9i1zNxVEG!Txxk+UT1JxutsU(CDLI^1ie*xq30c~$9$P@qo N002ovPDHLkV1g)7OiKU& diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 42d2233c8..efb91cbc5 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -188,6 +188,7 @@ disable_media_tunneling_key crash_the_app_key show_image_indicators_key + check_new_streams theme diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 40dcd17c9..d8906200f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -481,6 +481,7 @@ Show image indicators Show Picasso colored ribbons on top of images indicating their source: red for network, blue for disk and green for memory Crash the app + Run check for new streams Import Import from diff --git a/app/src/main/res/xml/debug_settings.xml b/app/src/main/res/xml/debug_settings.xml index 22abebcae..206401c23 100644 --- a/app/src/main/res/xml/debug_settings.xml +++ b/app/src/main/res/xml/debug_settings.xml @@ -49,6 +49,11 @@ android:title="@string/show_image_indicators_title" app:iconSpaceReserved="false" /> + +