Fix unsubscribe to delete old videos

SkyTubeTeam · Aug 18, 2024 · 10fead2 · 10fead2
1 parent 1dd9565
commit 10fead2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 51 deletions.
diff --git a/app/src/main/java/free/rm/skytube/businessobjects/YouTube/POJOs/YouTubeChannel.java b/app/src/main/java/free/rm/skytube/businessobjects/YouTube/POJOs/YouTubeChannel.java
@@ -286,39 +286,6 @@ private Single<Boolean> removeDeniedChannel(boolean displayToastMessage) {
 				});
 	}
 
-	public static Disposable subscribeChannel(final Context context, final ChannelId channelId) {
-		if (channelId != null) {
-			return DatabaseTasks.getChannelInfo(context, channelId, false)
-					.observeOn(Schedulers.io())
-					.map(persistentChannel ->
-						new Pair<>(persistentChannel, SubscriptionsDb.getSubscriptionsDb().subscribe(persistentChannel, Collections.emptyList()))
-					)
-					.observeOn(AndroidSchedulers.mainThread())
-					.subscribe(youTubeChannelWithResult -> {
-						switch(youTubeChannelWithResult.second) {
-							case SUCCESS: {
-								youTubeChannelWithResult.first.channel.setUserSubscribed(true);
-								EventBus.getInstance().notifyMainTabChanged(EventBus.SettingChange.SUBSCRIPTION_LIST_CHANGED);
-								SkyTubeApp.getSettings().setRefreshSubsFeedFromCache(true);
-								Toast.makeText(context, R.string.channel_subscribed, Toast.LENGTH_LONG).show();
-								break;
-							}
-							case NOT_MODIFIED: {
-								Toast.makeText(context, R.string.channel_already_subscribed, Toast.LENGTH_LONG).show();
-								break;
-							}
-							default: {
-								Toast.makeText(context, R.string.channel_subscribe_failed, Toast.LENGTH_LONG).show();
-								break;
-							}
-						}
-					});
-		} else {
-			Toast.makeText(context, "Channel is not specified", Toast.LENGTH_LONG).show();
-			return Disposable.empty();
-		}
-	}
-
 	public String getChannelUrl() {
 		return getChannelId().toURL();
 	}

diff --git a/app/src/main/java/free/rm/skytube/businessobjects/YouTube/YouTubeTasks.java b/app/src/main/java/free/rm/skytube/businessobjects/YouTube/YouTubeTasks.java
@@ -89,15 +89,6 @@ public static Single<Integer> refreshAllSubscriptions(Context context, @Nullable
                 });
     }
 
-    public static Single<Integer> refreshSubscribedChannel(ChannelId channelId, @Nullable Consumer<Integer> newVideosFound) {
-        if (SkyTubeApp.getSettings().isUseNewPipe() || !YouTubeAPIKey.get().isUserApiKeySet()) {
-            return YouTubeTasks.getBulkSubscriptionVideos(Collections.singletonList(channelId), newVideosFound);
-        } else {
-            return YouTubeTasks.getChannelVideos(channelId, null, false, newVideosFound)
-                    .map(items -> items.size());
-        }
-    }
-
     private static Single<Integer> refreshSubscriptions(@NonNull List<ChannelId> channelIds, @Nullable Consumer<Integer> newVideosFound) {
         if (SkyTubeApp.getSettings().isUseNewPipe() || !YouTubeAPIKey.get().isUserApiKeySet()) {
             return YouTubeTasks.getBulkSubscriptionVideos(channelIds, newVideosFound);

diff --git a/app/src/main/java/free/rm/skytube/businessobjects/YouTube/newpipe/NewPipeService.java b/app/src/main/java/free/rm/skytube/businessobjects/YouTube/newpipe/NewPipeService.java
@@ -322,7 +322,6 @@ public PersistentChannel getChannelDetails(ChannelId channelId, PersistentChanne
         Logger.i(this, "Fetching channel details for " + channelId);
         VideoPagerWithChannel pager = getChannelPager(channelId.getRawId());
         // get the channel, and add all the videos from the first page
-        YouTubeChannel channel = pager.getChannel();
         try {
             return pager.getNextPageAsVideosAndUpdateChannel(persistentChannel);
         } catch (NewPipeException e) {

diff --git a/app/src/main/java/free/rm/skytube/businessobjects/db/DatabaseTasks.java b/app/src/main/java/free/rm/skytube/businessobjects/db/DatabaseTasks.java
@@ -166,7 +166,12 @@ public static Single<Pair<PersistentChannel, DatabaseResult>> subscribeToChannel
         return Single.fromCallable(() -> {
             PersistentChannel channel = DatabaseTasks.getChannelOrRefresh(context, channelId, true);
             SubscriptionsDb db = SubscriptionsDb.getSubscriptionsDb();
-            DatabaseResult result = subscribeToChannel ? db.subscribe(channel, Collections.emptyList()) : db.unsubscribe(channel);
+            final DatabaseResult result;
+            if (subscribeToChannel) {
+                result = db.subscribe(channel, channel.channel().getYouTubeVideos());
+            } else {
+                result = db.unsubscribe(channel);
+            }
             return Pair.create(channel, result);
         })
                 .subscribeOn(Schedulers.io())

diff --git a/app/src/main/java/free/rm/skytube/businessobjects/db/SubscriptionsDb.java b/app/src/main/java/free/rm/skytube/businessobjects/db/SubscriptionsDb.java
@@ -344,11 +344,11 @@ private DatabaseResult saveSubscription(ChannelId channelId) {
 	 */
 	public DatabaseResult unsubscribe(PersistentChannel channel) {
 		SkyTubeApp.nonUiThread();
-
+        Logger.i(this, "unsubscribing subs_id= %s, channel_id = %s, channel_pk = %s", channel.subscriptionPk(), channel.channel().getChannelId(), channel.channelPk());
         // delete any feed videos pertaining to this channel
         getWritableDatabase().delete(SubscriptionsVideosTable.TABLE_NAME_V2,
                 SubscriptionsVideosTable.COL_SUBS_ID.name() + " = ?",
-                toArray(channel.channelPk()));
+                toArray(channel.subscriptionPk()));
 
         // remove this channel from the subscriptions DB
         int rowsDeleted = getWritableDatabase().delete(SubscriptionsTable.TABLE_NAME,

diff --git a/app/src/main/java/free/rm/skytube/gui/businessobjects/views/ChannelActionHandler.java b/app/src/main/java/free/rm/skytube/gui/businessobjects/views/ChannelActionHandler.java
@@ -41,7 +41,7 @@ public ChannelActionHandler(CompositeDisposable compositeDisposable) {
     public boolean handleChannelActions(Context context, YouTubeChannel channel, int itemId) {
         switch (itemId) {
             case R.id.subscribe_channel:
-                compositeDisposable.add(YouTubeChannel.subscribeChannel(context, channel.getChannelId()));
+                compositeDisposable.add(DatabaseTasks.subscribeToChannel(true, null, context, channel.getChannelId(), true).subscribe());
                 return true;
             case R.id.unsubscribe_channel:
                 compositeDisposable.add(DatabaseTasks.subscribeToChannel(false,

diff --git a/app/src/main/java/free/rm/skytube/gui/businessobjects/views/SubscribeButton.java b/app/src/main/java/free/rm/skytube/gui/businessobjects/views/SubscribeButton.java
@@ -59,10 +59,6 @@ public void onClick(View view) {
 			externalClickListener.onClick(SubscribeButton.this);
 		}
 		if(channel != null) {
-			// Only fetch videos for this channel if fetchChannelVideosOnSubscribe is true AND the channel is not subscribed to yet.
-			if (!isUserSubscribed) {
-				compositeDisposable.add(YouTubeTasks.refreshSubscribedChannel(channel.getChannelId(), null).subscribe());
-			}
 			compositeDisposable.add(DatabaseTasks.subscribeToChannel(!isUserSubscribed,
 					this, getContext(), channel.getChannelId(), true).subscribe());
 		}