Local auto backup: cancel and show warning on Android 11+; upd SharedModules

yuliskov · yuliskov · commit 8f61312c5346 · 2026-03-18T04:06:24.000+02:00
diff --git a/MediaServiceCore b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 837f11a049d22cf994cc988a549ba81476932b33
+Subproject commit bcc002fc3efbaeac0df64c01185d108f6c015c4d
diff --git a/SharedModules b/SharedModules
@@ -1 +1 @@
-Subproject commit 4ddb9101baef698b7fd3d49ae55916d2ef470d6f
+Subproject commit c51aef3ecb141ff41fd78be870c33c58210e5ea0
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/SuggestionsController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/SuggestionsController.java
@@ -173,7 +173,7 @@ private void continueGroup(VideoGroup group, boolean showLoading) {
     }
 
     private void continueGroup(VideoGroup group, OnVideoGroup callback, boolean showLoading) {
-        if (group == null) {
+        if (getPlayer() == null || group == null) {
             Log.e(TAG, "Can't continue group. The group is null.");
             return;
         }
@@ -208,6 +208,11 @@ private void continueGroup(VideoGroup group, OnVideoGroup callback, boolean show
                             if (getPlayer() != null) {
                                 getPlayer().showProgressBar(false);
                             }
+                        },
+                        () -> {
+                            if (getPlayer() != null) {
+                                getPlayer().showProgressBar(false);
+                            }
                         }
                 );
 
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoLoaderController.java
@@ -318,7 +318,7 @@ private void waitMetadataSync(Video current, boolean showLoadingMsg) {
         } else if (!current.isSynced) { // Maybe there's nothing left. E.g. when casting from phone
             // Wait in a loop while suggestions have been loaded...
             if (showLoadingMsg) {
-                MessageHelpers.showMessageThrottled(getContext(), R.string.wait_data_loading);
+                MessageHelpers.showMessage(getContext(), R.string.wait_data_loading);
             }
             // Short videos next fix (suggestions aren't loaded yet)
             boolean isEnded = getPlayer() != null && Math.abs(getPlayer().getDurationMs() - getPlayer().getPositionMs()) < 100;
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/BackupSettingsPresenter.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/BackupSettingsPresenter.java
@@ -65,15 +65,12 @@ private void createAndShowDialog() {
         AppDialogPresenter settingsPresenter = AppDialogPresenter.instance(getContext());
 
         appendLocalBackupCategory(settingsPresenter);
-
-        appendDriveBackupCategory(settingsPresenter);
-
+        appendGDriveBackupCategory(settingsPresenter);
         appendSubscriptionsBackupButton(settingsPresenter);
-
         settingsPresenter.showDialog(getContext().getString(R.string.app_backup_restore), this::unhold);
     }
 
-    private void appendDriveBackupCategory(AppDialogPresenter settingsPresenter) {
+    private void appendGDriveBackupCategory(AppDialogPresenter settingsPresenter) {
         settingsPresenter.appendSingleButton(UiOptionItem.from("Google Drive", optionItem -> {
             AppDialogPresenter settingsPresenter2 = AppDialogPresenter.instance(getContext());
             appendGDriveBackupSettings(settingsPresenter2);
@@ -93,7 +90,7 @@ private void appendGDriveBackupSettings(AppDialogPresenter settingsPresenter) {
         settingsPresenter.appendSingleButton(UiOptionItem.from(getContext().getString(R.string.app_backup), optionItem -> mGDriveBackupManager.backup()));
     }
 
-    private void appendLocalDriveAutoBackupOption(List<OptionItem> options) {
+    private void appendLocalAutoBackupOption(List<OptionItem> options) {
         options.add(
                 UiOptionItem.from(
                         getContext().getString(R.string.auto_backup_category), option -> {
@@ -169,14 +166,13 @@ private void appendGDriveMiscButtons(AppDialogPresenter settingsPresenter) {
     private void appendLocalBackupCategory(AppDialogPresenter settingsPresenter) {
         List<OptionItem> options = new ArrayList<>();
 
-        appendBackupRestoreOptions(options);
-
-        appendLocalDriveAutoBackupOption(options);
+        appendLocalBackupRestoreOptions(options);
+        appendLocalAutoBackupOption(options);
 
         settingsPresenter.appendStringsCategory(getContext().getString(R.string.local_backup), options);
     }
 
-    private void appendBackupRestoreOptions(List<OptionItem> options) {
+    private void appendLocalBackupRestoreOptions(List<OptionItem> options) {
         BackupAndRestoreManager backupManager = new BackupAndRestoreManager(getContext());
 
         String backupPath = backupManager.getBackupRootPath();
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/LocalDriveBackupWorker.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/LocalDriveBackupWorker.java
@@ -10,9 +10,11 @@
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
-import com.liskovsoft.sharedutils.helpers.AppInfoHelpers;
+import com.liskovsoft.sharedutils.helpers.MessageHelpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
+import com.liskovsoft.smartyoutubetv2.common.R;
 import com.liskovsoft.smartyoutubetv2.common.prefs.GeneralData;
+import com.liskovsoft.smartyoutubetv2.common.utils.Utils;
 
 import java.util.concurrent.TimeUnit;
 
@@ -34,10 +36,9 @@ public LocalDriveBackupWorker(@NonNull Context context, @NonNull WorkerParameter
     }
 
     public static void schedule(Context context) {
-        //if (AppInfoHelpers.getTargetSdkVersion(context) > 29) {
-        //    // Android 11+: only backup through the file manager (no shared dir)
-        //    return;
-        //}
+        if (Utils.isSharedDirRestricted(context)) {
+            return;
+        }
 
         if (VERSION.SDK_INT >= 23 && GeneralData.instance(context).getLocalDriveBackupFreqDays() > 0) {
             WorkManager workManager = WorkManager.getInstance(context);
@@ -56,6 +57,11 @@ public static void schedule(Context context) {
     }
 
     public static void forceSchedule(Context context) {
+        if (Utils.isSharedDirRestricted(context)) {
+            MessageHelpers.showLongMessage(context, R.string.local_backup_not_supported);
+            return;
+        }
+
         new BackupAndRestoreManager(context).checkPermAndBackup();
         schedule(context);
     }
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/Utils.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/Utils.java
@@ -60,6 +60,7 @@
 import androidx.work.WorkManager;
 
 import com.jakewharton.processphoenix.ProcessPhoenix;
+import com.liskovsoft.sharedutils.helpers.AppInfoHelpers;
 import com.liskovsoft.sharedutils.helpers.DeviceHelpers;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.helpers.MessageHelpers;
@@ -1268,15 +1269,18 @@ public void onClick(@NonNull View widget) {
         return builder;
     }
 
+    public static boolean isSharedDirRestricted(Context context) {
+        // Android 11+: only backup through the file manager (no shared dir)
+        return AppInfoHelpers.getRealSdkVersion(context) > 29;
+    }
+
     private static void persistData(Context context) {
         VideoStateService.instance(context).persistNow();
         PlayerData.instance(context).persistNow();
         PlayerTweaksData.instance(context).persistNow();
         MainUIData.instance(context).persistNow();
         GeneralData.instance(context).persistNow();
         MediaServiceData mediaServiceData = MediaServiceData.instance();
-        if (mediaServiceData != null) {
-            mediaServiceData.persistNow();
-        }
+        mediaServiceData.persistNow();
     }
 }
diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml
@@ -723,6 +723,7 @@
     <string name="player_time_stretching_desc">Сохраняет естественное звучание голоса при изменении скорости. Может значительно снизить производительность на некоторых устройствах.</string>
     <string name="queue_respects_playback_mode">Очередь учитывает режим воспроизведения</string>
     <string name="ignore_short_segments">Игнорировать короткие сегменты</string>
+    <string name="local_backup_not_supported">Автобэкап на Android TV 11+ не поддерживается из-за ограничений системы. Используйте GDrive.</string>
     <plurals name="hours">
         <item quantity="one">%s час</item>
         <item quantity="few">%s часа</item>
diff --git a/common/src/main/res/values-tr/strings.xml b/common/src/main/res/values-tr/strings.xml
@@ -733,6 +733,7 @@
     <string name="player_time_stretching_desc">Hız değiştirildiğinde sesi doğal tutar. Bazı cihazlarda performansı önemli ölçüde düşürebilir.</string>
     <string name="queue_respects_playback_mode">Kuyruk oynatma modunu dikkate alır</string>
     <string name="ignore_short_segments">Kısa segmentleri yok say</string>
+    <string name="local_backup_not_supported">Android TV 11+’da otomatik yedekleme sistem kısıtlamaları nedeniyle desteklenmez. Bunun yerine GDrive kullanın.</string>
     <plurals name="hours">
         <item quantity="one">%s saat</item>
         <item quantity="other">%s saat</item>
diff --git a/common/src/main/res/values-uk/strings.xml b/common/src/main/res/values-uk/strings.xml
@@ -721,6 +721,7 @@
     <string name="player_time_stretching_desc">Зберігає природний голос при зміні швидкості. Може суттєво знизити продуктивність на деяких пристроях.</string>
     <string name="queue_respects_playback_mode">Черга враховує режим відтворення</string>
     <string name="ignore_short_segments">Ігнорувати короткі сегменти</string>
+    <string name="local_backup_not_supported">Автобекап на Android TV 11+ не підтримується через обмеження системи. Використовуйте GDrive.</string>
     <plurals name="hours">
         <item quantity="one">%s година</item>
         <item quantity="few">%s години</item>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -735,6 +735,7 @@
     <string name="ignore_short_segments">Ignore short segments</string>
     <string name="install_bridge">Install ATV/Amazon bridge</string>
     <string name="fix_empty_subs_and_channels">Fix empty Subscriptions and Channels</string>
+    <string name="local_backup_not_supported">Auto backup on Android TV 11+ is not supported due to system restrictions. Use GDrive instead.</string>
     <plurals name="hours">
         <item quantity="one">%s hour</item>
         <item quantity="other">%s hours</item>
diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/common/keyhandler/DoubleBackManager.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/common/keyhandler/DoubleBackManager.java
@@ -115,7 +115,7 @@ private void checkBackPressed(KeyEvent event) {
     private void showMsg() {
         mIsMsgShown = false;
         if (mRepeatCount == (DEFAULT_REPEAT_COUNT - 1)) {
-            MessageHelpers.showMessageThrottled(mContext, R.string.msg_press_again_to_exit);
+            MessageHelpers.showMessage(mContext, R.string.msg_press_again_to_exit);
             mIsMsgShown = true;
             mMsgShownTimeMs = System.currentTimeMillis();
         }
diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/common/keyhandler/DoubleBackManager2.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/common/keyhandler/DoubleBackManager2.java
@@ -36,7 +36,7 @@ public void enableDoubleBackExit(Runnable onDoubleBack) {
 
     private void showMsg() {
         if (mRepeatCount == (DEFAULT_REPEAT_COUNT - 1)) {
-            MessageHelpers.showMessageThrottled(mContext, R.string.msg_press_again_to_exit);
+            MessageHelpers.showMessage(mContext, R.string.msg_press_again_to_exit);
             mMsgShownTimeMs = System.currentTimeMillis();
         }
     }
diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/dialogs/AppPreferenceManager.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/dialogs/AppPreferenceManager.java
@@ -214,7 +214,7 @@ private void initMultiSelectListPreference(OptionCategory category, MultiSelectL
                             if (requiredItems != null) {
                                 for (OptionItem requiredItem : requiredItems) {
                                     if (!requiredItem.isSelected()) {
-                                        MessageHelpers.showMessageThrottled(mContext, mContext.getString(R.string.require_checked, requiredItem.getTitle()));
+                                        MessageHelpers.showMessage(mContext, mContext.getString(R.string.require_checked, requiredItem.getTitle()));
                                     }
                                 }
                             }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ private void continueGroup(VideoGroup group, boolean showLoading) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`private void continueGroup(VideoGroup group, OnVideoGroup callback, boolean showLoading) {`
`176`		`- if (group == null) {`
	`176`	`+ if (getPlayer() == null \|\| group == null) {`
`177`	`177`	`Log.e(TAG, "Can't continue group. The group is null.");`
`178`	`178`	`return;`
`179`	`179`	`}`
`@@ -208,6 +208,11 @@ private void continueGroup(VideoGroup group, OnVideoGroup callback, boolean show`
`208`	`208`	`if (getPlayer() != null) {`
`209`	`209`	`getPlayer().showProgressBar(false);`
`210`	`210`	`}`
	`211`	`+ },`
	`212`	`+ () -> {`
	`213`	`+ if (getPlayer() != null) {`
	`214`	`+ getPlayer().showProgressBar(false);`
	`215`	`+ }`
`211`	`216`	`}`
`212`	`217`	`);`
`213`	`218`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ private void waitMetadataSync(Video current, boolean showLoadingMsg) {`
`318`	`318`	`} else if (!current.isSynced) { // Maybe there's nothing left. E.g. when casting from phone`
`319`	`319`	`// Wait in a loop while suggestions have been loaded...`
`320`	`320`	`if (showLoadingMsg) {`
`321`		`- MessageHelpers.showMessageThrottled(getContext(), R.string.wait_data_loading);`
	`321`	`+ MessageHelpers.showMessage(getContext(), R.string.wait_data_loading);`
`322`	`322`	`}`
`323`	`323`	`// Short videos next fix (suggestions aren't loaded yet)`
`324`	`324`	`boolean isEnded = getPlayer() != null && Math.abs(getPlayer().getDurationMs() - getPlayer().getPositionMs()) < 100;`