README.md

@@ -1,4 +1,4 @@
-# SmartTube (old name SmartTubeNext)
+# SmartTube (previously SmartTubeNext)
 
 <img width="100" src="https://github.com/yuliskov/SmartTube/blob/master/smarttubetv/src/ststable/res/mipmap-nodpi/app_icon.png" alt="logo"/>
 
@@ -158,15 +158,19 @@ To enable global voice search, an additional app must be installed alongside Sma
 
 If you want to support my developments you are welcome to buy me a cup of coffee :)
 
-> [**Patreon (Visa, Mastercard, PayPal)**](https://www.patreon.com/smarttube)  
-> **PayPal**: firsth<!-- abc@def -->ash@gmai<!-- @abc.com -->l.com  
+- [**Patreon (Visa, Mastercard, PayPal)**](https://www.patreon.com/smarttube)  
+- **PayPal**: firsth<!-- abc@def -->ash@gmai<!-- @abc.com -->l.com  
 <!-- > [**Buy me a coffee**](https://www.buymeacoffee.com/stube) -->  
-> **BTC**: 1JAT5VVWarVBkpVbNDn8UA8HXNdrukuBSx  
-> **LTC**: ltc1qgc24eq9jl9cq78qnd5jpqhemkajg9vudwyd8pw  
-> **ETH**: 0xe455E21a085ae195a097cd4F456051A9916A5064  
-> **ETC**: 0x209eCd33Fa61fA92167595eB3Aea92EE1905c815  
-> **XMR**: 48QsMjqfkeW54vkgKyRnjodtYxdmLk6HXfTWPSZoaFPEDpoHDwFUciGCe1QC9VAeGrgGw4PKNAksX9RW7myFqYJQDN5cHGT    
-> **USDT (ERC20)**: 0xe455e21a085ae195a097cd4f456051a9916a5064  
+- **BTC**: 1JAT5VVWarVBkpVbNDn8UA8HXNdrukuBSx  
+- **LTC**: ltc1qgc24eq9jl9cq78qnd5jpqhemkajg9vudwyd8pw  
+- **ETH**: 0xe455E21a085ae195a097cd4F456051A9916A5064  
+- **ETC**: 0x209eCd33Fa61fA92167595eB3Aea92EE1905c815  
+- **TRX**: TJNPY794aSGZf3WGHTna2VCWm2G5Yua7E8  
+- **USDT (TRC20)**: TJNPY794aSGZf3WGHTna2VCWm2G5Yua7E8  
+- **USDT (BEP20)**: 0x64B28da787BE6ac5889D276A5638d4f077840eC5  
+- **USDT (ERC20)**: 0xe455e21a085ae195a097cd4f456051a9916a5064   
+- **TON**: UQAc9zgnnzwS8yb5wxAu5CB0RddmjPBjWI-n46oQ7XfCQrgI  
+- **XMR**: 48QsMjqfkeW54vkgKyRnjodtYxdmLk6HXfTWPSZoaFPEDpoHDwFUciGCe1QC9VAeGrgGw4PKNAksX9RW7myFqYJQDN5cHGT    
 
 
 ## Support
@@ -175,10 +179,10 @@ If you want to support my developments you are welcome to buy me a cup of coffee
 
 You can report in our Telegram group or via [issue tracker on Github](https://github.com/yuliskov/SmartTube/issues) (account required).
 
-> **Telegram group (international)**: [@SmartTubeEN](http://t.me/SmartTubeEN)  
-> **Discord group (international)**: [SmartTube Official](https://discord.gg/Wt8HDDej5z)  
-> **Telegram group (RU/UA)**: [@SmartTubeUA](http://t.me/SmartTubeUA)  
-> **Email**: firsth<!-- abc@def -->ash@gmai<!-- @abc.com -->l.com
+- **Telegram group (international)**: [@SmartTubeEN](http://t.me/SmartTubeEN)  
+- **Discord group (international)**: [SmartTube Official](https://discord.gg/Wt8HDDej5z)  
+- **Telegram group (RU/UA)**: [@SmartTubeUA](http://t.me/SmartTubeUA)  
+- **Email**: firsth<!-- abc@def -->ash@gmai<!-- @abc.com -->l.com
 
 The international group is in **English only**. But don't worry if your English is not perfect, we have a friendly international community.
 

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/SampleMediaItem.java

@@ -1,7 +1,7 @@
 package com.liskovsoft.smartyoutubetv2.common.app.models.data;
 
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItem;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemMetadata;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItem;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemMetadata;
 
 public final class SampleMediaItem implements MediaItem {
     private int mId;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/Video.java

@@ -6,15 +6,16 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.liskovsoft.mediaserviceinterfaces.yt.data.ChannelGroup;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.ChapterItem;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.DislikeData;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaGroup;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItem;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemFormatInfo;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemMetadata;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.NotificationState;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.PlaylistInfo;
+import com.liskovsoft.mediaserviceinterfaces.data.ItemGroup;
+import com.liskovsoft.mediaserviceinterfaces.data.ChapterItem;
+import com.liskovsoft.mediaserviceinterfaces.data.DislikeData;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaGroup;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItem;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemFormatInfo;
+import com.liskovsoft.mediaserviceinterfaces.data.ItemGroup.Item;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemMetadata;
+import com.liskovsoft.mediaserviceinterfaces.data.NotificationState;
+import com.liskovsoft.mediaserviceinterfaces.data.PlaylistInfo;
 import com.liskovsoft.sharedutils.helpers.DateHelper;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.helpers.MessageHelpers;
@@ -38,7 +39,7 @@ public final class Video {
     private static final float RESTORE_POSITION_PERCENTS = 10; // min value for immediately closed videos
     public int id;
     public String title;
-    public String altTitle;
+    public String deArrowTitle;
     public String secondTitle;
     private String metadataTitle;
     private String metadataSecondTitle;
@@ -78,7 +79,7 @@ public final class Video {
     public boolean isSynced;
     public final long timestamp = System.currentTimeMillis();
     public int sectionId = -1;
-    public int channelGroupId = -1;
+    public String channelGroupId;
     public long startTimeMs;
     public long pendingPosMs;
     public boolean fromQueue;
@@ -208,15 +209,15 @@ public static Video from(ChapterItem chapter) {
         return video;
     }
 
-    public static Video from(ChannelGroup group) {
+    public static Video from(ItemGroup group) {
         Video video = new Video();
         video.title = group.getTitle();
         video.cardImageUrl = group.getIconUrl();
         video.channelGroupId = group.getId();
         return video;
     }
 
-    public static Video from(ChannelGroup.Channel channel) {
+    public static Video from(Item channel) {
         Video video = new Video();
         video.title = channel.getTitle();
         video.cardImageUrl = channel.getIconUrl();
@@ -286,10 +287,18 @@ public int getId() {
     }
 
     public String getTitle() {
-        return altTitle != null ? altTitle : metadataTitle != null ? metadataTitle : title;
+        return deArrowTitle != null ? deArrowTitle : title;
     }
 
     public String getSecondTitle() {
+        return secondTitle;
+    }
+
+    public String getPlayerTitle() {
+        return deArrowTitle != null ? deArrowTitle : metadataTitle != null ? metadataTitle : title;
+    }
+
+    public String getPlayerSubtitle() {
         // Don't sync future translation because of not precise info
         return metadataSecondTitle != null && !isUpcoming ? metadataSecondTitle : secondTitle;
     }
@@ -447,7 +456,12 @@ public static Video fromString(String spec) {
         result.metadataSecondTitle = Helpers.parseStr(split[18]);
         result.badge = Helpers.parseStr(split[19]);
         result.isLive = Helpers.parseBoolean(split[20]);
-        result.channelGroupId = Helpers.parseInt(split[21]);
+        result.channelGroupId = Helpers.parseStr(split[21]);
+
+        // Reset old type (int)
+        if (Helpers.equals(result.channelGroupId, "-1")) {
+            result.channelGroupId = null;
+        }
 
         return result;
     }
@@ -633,6 +647,10 @@ public boolean belongsToShorts() {
         return belongsToGroup(MediaGroup.TYPE_SHORTS);
     }
 
+    public boolean belongsToShortsGroup() {
+        return isShorts && (belongsToShorts() || belongsToHome());
+    }
+
     public boolean belongsToSearch() {
         return belongsToGroup(MediaGroup.TYPE_SEARCH);
     }

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/VideoGroup.java

@@ -1,8 +1,8 @@
 package com.liskovsoft.smartyoutubetv2.common.app.models.data;
 
-import com.liskovsoft.mediaserviceinterfaces.yt.data.ChapterItem;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaGroup;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItem;
+import com.liskovsoft.mediaserviceinterfaces.data.ChapterItem;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaGroup;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItem;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.service.VideoStateService;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/errors/CategoryEmptyError.java

@@ -33,6 +33,6 @@ public String getMessage() {
 
     @Override
     public String getActionText() {
-        return mError != null && Helpers.startsWith(mError.getMessage(), "AuthErrorResponse") ? mContext.getString(R.string.action_signin) : null;
+        return mError != null && Helpers.startsWith(mError.getMessage(), "AuthError") ? mContext.getString(R.string.action_signin) : null;
     }
 }

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/BasePlayerController.java

@@ -5,7 +5,7 @@
 
 import androidx.annotation.Nullable;
 
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemMetadata;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemMetadata;
 import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.manager.PlayerManager;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.listener.PlayerEventListener;
@@ -157,6 +157,11 @@ public void onSeekEnd() {
         // NOP
     }
 
+    @Override
+    public void onSeekPositionChanged(long positionMs) {
+        // NOP
+    }
+
     @Override
     public void onSpeedChanged(float speed) {
         // NOP

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/ChatController.java

@@ -1,8 +1,8 @@
 package com.liskovsoft.smartyoutubetv2.common.app.models.playback.controllers;
 
-import com.liskovsoft.mediaserviceinterfaces.yt.LiveChatService;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.ChatItem;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemMetadata;
+import com.liskovsoft.mediaserviceinterfaces.LiveChatService;
+import com.liskovsoft.mediaserviceinterfaces.data.ChatItem;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemMetadata;
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.sharedutils.rx.RxHelper;
 import com.liskovsoft.smartyoutubetv2.common.R;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/CommentsController.java

@@ -3,10 +3,10 @@
 import android.content.Context;
 import android.util.Pair;
 
-import com.liskovsoft.mediaserviceinterfaces.yt.CommentsService;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.CommentGroup;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.CommentItem;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemMetadata;
+import com.liskovsoft.mediaserviceinterfaces.CommentsService;
+import com.liskovsoft.mediaserviceinterfaces.data.CommentGroup;
+import com.liskovsoft.mediaserviceinterfaces.data.CommentItem;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemMetadata;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.helpers.MessageHelpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
@@ -162,7 +162,7 @@ private void showDialog(CommentsReceiver receiver, String title) {
         AppDialogPresenter appDialogPresenter = AppDialogPresenter.instance(getContext());
 
         appDialogPresenter.appendCommentsCategory(title, UiOptionItem.from(title, receiver));
-        appDialogPresenter.enableTransparent(true);
+        //appDialogPresenter.enableTransparent(true);
         appDialogPresenter.showDialog();
     }
 }

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/ContentBlockController.java

@@ -2,10 +2,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
-import com.liskovsoft.mediaserviceinterfaces.yt.MediaItemService;
-import com.liskovsoft.mediaserviceinterfaces.yt.ServiceManager;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.MediaItemMetadata;
-import com.liskovsoft.mediaserviceinterfaces.yt.data.SponsorSegment;
+import com.liskovsoft.mediaserviceinterfaces.MediaItemService;
+import com.liskovsoft.mediaserviceinterfaces.ServiceManager;
+import com.liskovsoft.mediaserviceinterfaces.data.MediaItemMetadata;
+import com.liskovsoft.mediaserviceinterfaces.data.SponsorSegment;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.helpers.MessageHelpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
@@ -126,7 +126,7 @@ public void onEngineReleased() {
     @Override
     public void onButtonClicked(int buttonId, int buttonState) {
         if (buttonId == R.id.action_content_block) {
-            List<SponsorSegment> foundSegments = findMatchedSegments(getPlayer().getPositionMs(), mOriginalSegments);
+            List<SponsorSegment> foundSegments = findMatchedSegments(getPlayer().getPositionMs(), mOriginalSegments, true);
 
             if (foundSegments != null) {
                 SponsorSegment lastSegment = foundSegments.get(foundSegments.size() - 1);
@@ -139,7 +139,11 @@ public void onButtonClicked(int buttonId, int buttonState) {
     @Override
     public void onButtonLongClicked(int buttonId, int buttonState) {
         if (buttonId == R.id.action_content_block) {
-            ContentBlockSettingsPresenter.instance(getContext()).show(() -> onVideoLoaded(getPlayer().getVideo()));
+            ContentBlockSettingsPresenter.instance(getContext()).show(() -> {
+                if (getPlayer() != null) {
+                    onVideoLoaded(getPlayer().getVideo());
+                }
+            });
         }
     }
 
@@ -216,7 +220,7 @@ private void skipSegment(long interval) {
 
         long positionMs = getPlayer().getPositionMs();
 
-        List<SponsorSegment> foundSegments = findMatchedSegments(positionMs, mActiveSegments);
+        List<SponsorSegment> foundSegments = findMatchedSegments(positionMs, mActiveSegments, false);
 
         applyActions(foundSegments);
 
@@ -226,11 +230,17 @@ private void skipSegment(long interval) {
         }
     }
 
-    private boolean isPositionInsideSegment(long positionMs, SponsorSegment segment) {
+    private boolean isPositionInsideSegment(long positionMs, SponsorSegment segment, boolean fullMatch) {
         // NOTE: in case of using Player.setSeekParameters (inaccurate seeking) increase sponsor segment window
         // int seekShift = 1_000;
         // return positionMs >= (segment.getStartMs() - seekShift) && positionMs <= (segment.getEndMs() + seekShift);
-        return positionMs >= segment.getStartMs() && positionMs <= Math.min(segment.getStartMs() + 1_000, segment.getEndMs());
+
+        if (fullMatch) {
+            return positionMs >= segment.getStartMs() && positionMs <= segment.getEndMs();
+        } else {
+            long windowSizeMs = (long) (2_000 * getPlayer().getSpeed());
+            return positionMs >= segment.getStartMs() && positionMs <= Math.min(segment.getStartMs() + windowSizeMs, segment.getEndMs());
+        }
     }
 
     private void simpleSkip(long skipPosMs) {
@@ -320,7 +330,10 @@ private void setPositionMs(long positionMs) {
         getPlayer().setPositionMs(Math.min(positionMs, durationMs));
     }
 
-    private List<SponsorSegment> findMatchedSegments(long positionMs, List<SponsorSegment> segments) {
+    /**
+     * @param fullMatch Match only the beginning or the full segment length
+     */
+    private List<SponsorSegment> findMatchedSegments(long positionMs, List<SponsorSegment> segments, boolean fullMatch) {
         if (segments == null) {
             return null;
         }
@@ -332,7 +345,7 @@ private List<SponsorSegment> findMatchedSegments(long positionMs, List<SponsorSe
             boolean isSkipAction = action == ContentBlockData.ACTION_SKIP_ONLY ||
                     action == ContentBlockData.ACTION_SKIP_WITH_TOAST;
             if (foundSegment == null) {
-                if (isPositionInsideSegment(positionMs, segment)) {
+                if (isPositionInsideSegment(positionMs, segment, fullMatch)) {
                     foundSegment = new ArrayList<>();
                     foundSegment.add(segment);
 
@@ -343,7 +356,7 @@ private List<SponsorSegment> findMatchedSegments(long positionMs, List<SponsorSe
                 }
             } else {
                 SponsorSegment lastSegment = foundSegment.get(foundSegment.size() - 1);
-                if (isSkipAction && isPositionInsideSegment(lastSegment.getEndMs() + 3_000, segment)) {
+                if (isSkipAction && isPositionInsideSegment(lastSegment.getEndMs() + 3_000, segment, fullMatch)) {
                     foundSegment.add(segment);
                 }
             }