up main files

fgl27 · Oct 25, 2024 · 5949635 · 5949635
1 parent a673774
commit 5949635
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 22 deletions.
diff --git a/apk/Changelog.md b/apk/Changelog.md
@@ -9,7 +9,7 @@ The App is divided in two part, **Apk** and **Web** you can check it version in
 
 The app has a building update check function, so whenever there is a update a red text will show up bellow the main pages clock, also a short warning will pop on the screen let you know if is a **Apk** or **Web** update.
 
-WebVersion September / October 21
+WebVersion September / October
 ==============
 
 * Fix missing information on player top info for some scenarios
@@ -18,12 +18,13 @@ WebVersion September / October 21
 * Fix current game in player content not always showing current game
 * Fix scenario where not enough content load on the screen even when it is available preventing scrolling to get more content
 * Fix old deleted vod not being deleted from live history
+* Fix old deleted Lives not being deleted from live history
+* Fix Game content not showing the latest content when the app did a auto refresh in background, very  hare but after the app was running for a long time there was a chance the app did refresh in background but shows old none refreshed content
+* Fix showing blocked content randomly, after navigating to a blocked content and exit the app in a very random scenario this can happens
 * Improve numeric VODs jump to % function
 * Improve media keys Live/VODs jump to 5/30 seconds function
 * General etc improvements
 
-
-
 WebVersion September 09
 ==============
 

diff --git a/app/general/version.js b/app/general/version.js
@@ -27,14 +27,17 @@ var version = {
     WebTag: 679, //Always update (+1 to current value) Main_version_web after update Main_minversion or a major update of the web part of the app
     changelog: [
         {
-            title: 'WebVersion September / October 21',
+            title: 'WebVersion September / October',
             changes: [
                 'Fix missing information on player top info for some scenarios',
                 'Fix missing information on channel content screens',
                 'Fix not be able to open the game for some scenarios in the thumbnail options',
                 'Fix current game in player content not always showing current game',
                 'Fix scenario where not enough content load on the screen even when it is available preventing scrolling to get more content',
                 'Fix old deleted vod not being deleted from live history',
+                'Fix old deleted Lives not being deleted from live history',
+                'Fix Game content not showing the latest content when the app did a auto refresh in background, very  hare but after the app was running for a long time there was a chance the app did refresh in background but shows old none refreshed content',
+                'Fix showing blocked content randomly, after navigating to a blocked content and exit the app in a very random scenario this can happens',
                 'Improve numeric VODs jump to % function',
                 'Improve media keys Live/VODs jump to 5/30 seconds function',
                 'General etc improvements'

diff --git a/release/githubio/js/main.js b/release/githubio/js/main.js
diff --git a/release/githubio/js/main_uncompressed.js b/release/githubio/js/main_uncompressed.js
@@ -4725,14 +4725,17 @@
         WebVersion: 'October 21 2024',
         WebTag: 679, //Always update (+1 to current value) Main_version_web after update Main_minversion or a major update of the web part of the app
         changelog: [{
-                title: 'WebVersion September / October 21',
+                title: 'WebVersion September / October',
                 changes: [
                     'Fix missing information on player top info for some scenarios',
                     'Fix missing information on channel content screens',
                     'Fix not be able to open the game for some scenarios in the thumbnail options',
                     'Fix current game in player content not always showing current game',
                     'Fix scenario where not enough content load on the screen even when it is available preventing scrolling to get more content',
                     'Fix old deleted vod not being deleted from live history',
+                    'Fix old deleted Lives not being deleted from live history',
+                    'Fix Game content not showing the latest content when the app did a auto refresh in background, very  hare but after the app was running for a long time there was a chance the app did refresh in background but shows old none refreshed content',
+                    'Fix showing blocked content randomly, after navigating to a blocked content and exit the app in a very random scenario this can happens',
                     'Improve numeric VODs jump to % function',
                     'Improve media keys Live/VODs jump to 5/30 seconds function',
                     'General etc improvements'
@@ -28920,10 +28923,6 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
             ) {
                 ScreenObj[key].restoreBackup();
             } else {
-                if (ScreenObj[key].hasBackupData) {
-                    ScreenObj[key].eraseBackupData(Main_values.Main_gameSelected_id);
-                }
-
                 Screens_loadDataRequest(key);
             }
         }
@@ -32882,6 +32881,10 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
                     this.BackupData.Lang[game] = null;
                     this.BackupData.lastScreenRefresh[game] = 0;
                 }
+
+                if (this.ScreenBackup) {
+                    this.ScreenBackup[game] = null;
+                }
             },
             CheckBackupData: function(game) {
                 return (
@@ -32897,7 +32900,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
                 );
             },
             restoreBackup: function() {
-                var game = Main_values.Main_gameSelected_id;
+                var game = this.gameSelected_Id;
 
                 this.data = JSON.parse(JSON.stringify(this.BackupData.data[game]));
                 this.offset = this.data.length;
@@ -32915,6 +32918,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
                 }
 
                 this.loadingData = false;
+                Screens_SetLastRefresh(this.screen);
             },
             BackupScreen: function(game) {
                 if (!this.ScreenBackup) {
@@ -32925,7 +32929,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
                 }
 
                 if (!this.data || !this.data.length) {
-                    this.ScreenBackup[game].style = null;
+                    this.ScreenBackup[game] = null;
                     return;
                 }
 
@@ -33095,7 +33099,9 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
             AnimateThumb: ScreensObj_AnimateThumbId,
             addCell: function(cell) {
                 var channelId = this.isQuery && cell.creator ? cell.creator.id : cell.user_id;
-                var skipBlockedCheck = this.screen === Main_AGameVod && this.BeforeAgame === Main_Blocked;
+
+                //skip check if game is blocked as we are on the blocked game section
+                var skipBlockedCheck = this.screen === Main_AGameVod && Screens_getGameIsBlocked(this.gameSelected_Id);
 
                 var isNotBlocked = Screens_isNotBlocked(
                     skipBlockedCheck ? null : channelId,
@@ -33165,7 +33171,9 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
             },
             addCellTemp: function(cell) {
                 var id_cell = this.useHelix ? cell.user_id : cell.channel._id;
-                var skipBlockedCheck = this.screen === Main_aGame && this.BeforeAgame === Main_Blocked;
+
+                //skip check if game is blocked as we are on the blocked game section
+                var skipBlockedCheck = this.screen === Main_aGame && Screens_getGameIsBlocked(this.gameSelected_Id);
 
                 var isNotBlocked = Screens_isNotBlocked(
                     skipBlockedCheck ? null : cell.user_id,
@@ -33294,12 +33302,15 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
                 }
 
                 this.OpenClip();
+                ScreensObj_gameCheckAndBackup(this.screen);
             },
             Cells: [],
             addCell: function(cell) {
                 var idValue = this.useHelix || this.isQuery ? cell.id : cell.tracking_id;
                 var channelId = this.isQuery && cell.broadcaster ? cell.broadcaster.id : cell.broadcaster_id;
-                var skipBlockedCheck = this.screen === Main_AGameClip && this.BeforeAgame === Main_Blocked;
+
+                //skip check if game is blocked as we are on the blocked game section
+                var skipBlockedCheck = this.screen === Main_AGameClip && Screens_getGameIsBlocked(this.gameSelected_Id);
 
                 var isNotBlocked = Screens_isNotBlocked(
                     skipBlockedCheck ? null : channelId,
@@ -33874,6 +33885,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
 
         ScreenObj[key] = Screens_assign({
                 useHelix: true,
+                isGameScreen: true,
                 periodMaxPos: 4,
                 HeadersArray: Main_base_array_header,
                 object: 'data',
@@ -33913,7 +33925,10 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
                             Screens_StartLoad(this.screen);
                             Main_setItem(this.highlightSTR, this.highlight ? 'true' : 'false');
                         } else Screens_PeriodStart(this.screen);
-                    } else this.OpenVodStart();
+                    } else {
+                        this.OpenVodStart();
+                    }
+                    ScreensObj_gameCheckAndBackup(this.screen);
                 },
                 SwitchesIcons: ['movie-play', 'history'],
                 addSwitches: function() {
@@ -34256,6 +34271,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
 
         ScreenObj[key] = Screens_assign({
                 useHelix: true,
+                isGameScreen: true,
                 HeadersArray: Main_base_array_header,
                 ids: Screens_ScreenIds('AGame', key),
                 ScreenName: 'AGame',
@@ -34339,6 +34355,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
             }
 
             ScreenObj[this.screen].IsOpen = 0;
+            ScreensObj_gameCheckAndBackup(this.screen);
         };
     }
 
@@ -34530,6 +34547,7 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
 
         ScreenObj[key] = Screens_assign({
                 useHelix: true,
+                isGameScreen: true,
                 ids: Screens_ScreenIds('AGameClip', key),
                 ScreenName: 'AGameClip',
                 table: 'stream_table_a_game_clip',
@@ -35475,10 +35493,6 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
             !Main_A_equals_B_No_Case(ScreenObj[key].gameSelected_Id, Main_values.Main_gameSelected_id)
         ) {
             ScreenObj[key].status = false;
-
-            if (ScreenObj[key].Cells && ScreenObj[key].Cells.length && ScreenObj[key].gameSelected_Id) {
-                ScreenObj[key].BackupScreen(ScreenObj[key].gameSelected_Id);
-            }
         }
 
         ScreenObj[key].gameSelected_Id = Main_values.Main_gameSelected_id;
@@ -35501,7 +35515,16 @@ https://video-weaver.sao03.hls.ttvnw.net/v1/playlist/C.m3u8 09:36:20.90
         Main_EventAgame(Main_values.Main_gameSelected);
     }
 
+    function ScreensObj_gameCheckAndBackup(key) {
+        if (ScreenObj[key].isGameScreen && ScreenObj[key].Cells && ScreenObj[key].Cells.length && ScreenObj[key].gameSelected_Id) {
+            ScreenObj[key].BackupScreen(ScreenObj[key].gameSelected_Id);
+        }
+    }
+
     function ScreensObj_TopLableAgameExit(key) {
+        ScreenObj[key].BeforeAgame = null;
+        ScreensObj_gameCheckAndBackup(key);
+
         ScreenObj[key].gameSelected_Id = Main_values.Main_gameSelected_id;
         Main_IconLoad('label_thumb', 'icon-options', STR_THUMB_OPTIONS_TOP);
     }

diff --git a/release/githubio/version/version.json b/release/githubio/version/version.json
@@ -1 +1 @@
-{"VersionBase":"3.0","publishVersionCode":367,"ApkUrl":"https://github.com/fgl27/SmartTwitchTV/releases/download/367/SmartTV_twitch_3_0_367.apk","WebVersion":"October 21 2024","WebTag":679,"changelog":[{"title":"WebVersion September / October 21","changes":["Fix missing information on player top info for some scenarios","Fix missing information on channel content screens","Fix not be able to open the game for some scenarios in the thumbnail options","Fix current game in player content not always showing current game","Fix scenario where not enough content load on the screen even when it is available preventing scrolling to get more content","Fix old deleted vod not being deleted from live history","Improve numeric VODs jump to % function","Improve media keys Live/VODs jump to 5/30 seconds function","General etc improvements"]},{"title":"WebVersion September 09","changes":["Fix animation lag in the Clip section, Twitch was sending images that were too big causing lags","General performance improvements"]},{"title":"WebVersion August 17","changes":["Update the emotes selection screen to improve performance, no magic can improve the performance here more than what is, simply some devices are capable of playing 8k but they can't handle multiple animated images, also some emotes servers are terribly optimized, for example, 7TV"]},{"title":"Version August 2024 Apk Version 3.0.367","changes":["Update Codec capability & Blocked codecs settings section to support devices that have the same name for multiple codecs","Android 10 and up now can see with codecs are hardware or software","Due to changes above the codec section was reseted if you make changes to it please redo yours changes","General visual improvements","Other General improvements"]}]}
+{"VersionBase":"3.0","publishVersionCode":367,"ApkUrl":"https://github.com/fgl27/SmartTwitchTV/releases/download/367/SmartTV_twitch_3_0_367.apk","WebVersion":"October 21 2024","WebTag":679,"changelog":[{"title":"WebVersion September / October","changes":["Fix missing information on player top info for some scenarios","Fix missing information on channel content screens","Fix not be able to open the game for some scenarios in the thumbnail options","Fix current game in player content not always showing current game","Fix scenario where not enough content load on the screen even when it is available preventing scrolling to get more content","Fix old deleted vod not being deleted from live history","Fix old deleted Lives not being deleted from live history","Fix Game content not showing the latest content when the app did a auto refresh in background, very  hare but after the app was running for a long time there was a chance the app did refresh in background but shows old none refreshed content","Fix showing blocked content randomly, after navigating to a blocked content and exit the app in a very random scenario this can happens","Improve numeric VODs jump to % function","Improve media keys Live/VODs jump to 5/30 seconds function","General etc improvements"]},{"title":"WebVersion September 09","changes":["Fix animation lag in the Clip section, Twitch was sending images that were too big causing lags","General performance improvements"]},{"title":"WebVersion August 17","changes":["Update the emotes selection screen to improve performance, no magic can improve the performance here more than what is, simply some devices are capable of playing 8k but they can't handle multiple animated images, also some emotes servers are terribly optimized, for example, 7TV"]},{"title":"Version August 2024 Apk Version 3.0.367","changes":["Update Codec capability & Blocked codecs settings section to support devices that have the same name for multiple codecs","Android 10 and up now can see with codecs are hardware or software","Due to changes above the codec section was reseted if you make changes to it please redo yours changes","General visual improvements","Other General improvements"]}]}