screensaver fix; upd SharedModules

yuliskov · yuliskov · commit 5ec40a277f9e · 2026-03-19T00:46:35.000+02:00
diff --git a/MediaServiceCore b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 44e278d9d8140acea73b9a8f2d4ccb2b7b63d7e1
+Subproject commit d660903ac66a755aaa9f10a5988b71268b992be5
diff --git a/SharedModules b/SharedModules
@@ -1 +1 @@
-Subproject commit c51aef3ecb141ff41fd78be870c33c58210e5ea0
+Subproject commit ed419f70ef9680ca4f248975cd59af62bc6e8b9e
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/ScreensaverManager.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/ScreensaverManager.java
@@ -176,8 +176,8 @@ private void undimScreen() {
     }
 
     private void showHide(boolean show) {
-        showHideDimming(show);
         showHideScreensaver(show);
+        showHideDimming(show);
     }
 
     private void showHideDimming(boolean show) {
@@ -221,6 +221,10 @@ private void showHideDimming(boolean show) {
     }
 
     private void showHideScreensaver(boolean show) {
+        if (sLockInstance) {
+            return;
+        }
+
         Activity activity = mActivity.get();
 
         if (activity == null) {
diff --git a/smarttubetv/build.gradle b/smarttubetv/build.gradle
@@ -57,8 +57,8 @@ android {
         applicationId "app.smarttube"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 2309
-        versionName "31.19"
+        versionCode 2310
+        versionName "31.20"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
 

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,8 @@ private void undimScreen() {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`private void showHide(boolean show) {`
`179`		`- showHideDimming(show);`
`180`	`179`	`showHideScreensaver(show);`
	`180`	`+ showHideDimming(show);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`private void showHideDimming(boolean show) {`
`@@ -221,6 +221,10 @@ private void showHideDimming(boolean show) {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`private void showHideScreensaver(boolean show) {`
	`224`	`+ if (sLockInstance) {`
	`225`	`+ return;`
	`226`	`+ }`
	`227`	`+`
`224`	`228`	`Activity activity = mActivity.get();`
`225`	`229`
`226`	`230`	`if (activity == null) {`