Skip to content

[pull] master from yuliskov:master #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 25, 2025
Merged

[pull] master from yuliskov:master #641

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67adfcc
crash fixes
yuliskov May 25, 2025
4f637c3
video card: state sync fix
yuliskov May 25, 2025
08cd19a
video card: delay remove; sleep timer another fix
yuliskov May 25, 2025
69cfaf9
upd
yuliskov May 25, 2025
c8d52e2
crash fixes
yuliskov May 25, 2025
bc138d0
bump to 27.87
yuliskov May 25, 2025
636f084
previous release fixes
yuliskov May 25, 2025
e39f473
bump to 27.88
yuliskov May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
crash fixes
  • Loading branch information
@yuliskov
yuliskov committed May 25, 2025
commit 67adfcc97a6ba8240e83f0b6ac2fdab4d6a40286
2 changes: 1 addition & 1 deletion common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ private void initSubtitleStyles() {
mSubtitleStyles.add(new SubtitleStyle(R.string.subtitle_yellow_semi_transparent, R.color.yellow, R.color.semi_transparent, CaptionStyleCompat.EDGE_TYPE_OUTLINE));
mSubtitleStyles.add(new SubtitleStyle(R.string.subtitle_yellow_black, R.color.yellow, R.color.black, CaptionStyleCompat.EDGE_TYPE_OUTLINE));

if (Build.VERSION.SDK_INT >= 19) {
if (VERSION.SDK_INT >= 19) {
mSubtitleStyles.add(new SubtitleStyle(R.string.subtitle_system));
}
}
Expand Down
6 changes: 4 additions & 2 deletions leanback-1.0.0/src/main/java/androidx/leanback/widget/GridLayoutManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2427,8 +2427,9 @@ public int scrollHorizontallyBy(int dx, Recycler recycler, RecyclerView.State st
// MOD: fix RecycleView crash on Ugoos
try {
result = scrollDirectionPrimary(dx);
} catch (NullPointerException e) {
} catch (NullPointerException | IllegalArgumentException e) {
// Attempt to invoke virtual method 'android.view.ViewGroup$LayoutParams android.view.View.getLayoutParams()' on a null object reference
// IllegalArgumentException: VideoCardPresenter$1 is not a direct child of androidx.leanback.widget.HorizontalGridView
e.printStackTrace();
result = 0;
}
Expand All @@ -2453,8 +2454,9 @@ public int scrollVerticallyBy(int dy, Recycler recycler, RecyclerView.State stat
// MOD: fix RecycleView crash on Eltex (Android 9)
try {
result = scrollDirectionPrimary(dy);
} catch (NullPointerException e) {
} catch (NullPointerException | IllegalArgumentException e) {
// Attempt to invoke virtual method 'android.view.ViewGroup$LayoutParams android.view.View.getLayoutParams()' on a null object reference
// IllegalArgumentException: VideoCardPresenter$1 is not a direct child of androidx.leanback.widget.HorizontalGridView
e.printStackTrace();
result = 0;
}
Expand Down