diff --git a/dashboard-ui/cordova/android/iap.js b/dashboard-ui/cordova/android/iap.js index 42e3b39e7e..31e45722c4 100644 --- a/dashboard-ui/cordova/android/iap.js +++ b/dashboard-ui/cordova/android/iap.js @@ -149,26 +149,29 @@ var cacheValue = appStorage.getItem(cacheKey); if (cacheValue) { - var deferred = DeferredBuilder.Deferred(); - deferred.resolveWith(null, [cacheValue == 'true']); - return deferred.promise(); + return new Promise(function (resolve, reject) { + + resolve(cacheValue == 'true'); + }); } else { - return HttpClient.send({ - type: 'GET', - url: 'https://mb3admin.com/admin/service/statistics/appAccess?application=AndroidV1&deviceId=' + deviceId + return fetch('https://mb3admin.com/admin/service/statistics/appAccess?application=AndroidV1&deviceId=' + deviceId, { + method: 'GET' - }).then(function () { + }).then(function (response) { - appStorage.setItem(cacheKey, 'true'); - return true; + if (response.status == 404) { + appStorage.setItem(cacheKey, 'false'); + } else if (response.status < 400) { + appStorage.setItem(cacheKey, 'true'); + return true; + } + + return false; }, function (e) { - if (e.status == 404) { - appStorage.setItem(cacheKey, 'false'); - } return false; }); } diff --git a/dashboard-ui/cordova/android/immersive.js b/dashboard-ui/cordova/android/immersive.js deleted file mode 100644 index 5fd62e6dc3..0000000000 --- a/dashboard-ui/cordova/android/immersive.js +++ /dev/null @@ -1,59 +0,0 @@ -(function () { - - function onSuccess() { - Logger.log('Immersive mode succeeded'); - } - - function onError() { - Logger.log('Immersive mode failed'); - } - - //// Is this plugin supported? - //AndroidFullScreen.isSupported(); - - //// Is immersive mode supported? - //AndroidFullScreen.isImmersiveModeSupported(onSuccess, onError); - - //// The width of the screen in immersive mode - //AndroidFullScreen.immersiveWidth(trace, onError); - - //// The height of the screen in immersive mode - //AndroidFullScreen.immersiveHeight(trace, onError); - - //// Hide system UI until user interacts - //AndroidFullScreen.leanMode(onSuccess, onError); - - //// Show system UI - //AndroidFullScreen.showSystemUI(onSuccess, onError); - - //// Extend your app underneath the system UI (Android 4.4+ only) - //AndroidFullScreen.showUnderSystemUI(onSuccess, onError); - - //// Hide system UI and keep it hidden (Android 4.4+ only) - //AndroidFullScreen.immersiveMode(onSuccess, onError); - - function updateFromSetting(leaveFullScreen) { - - if (AppSettings.enableFullScreen()) { - AndroidFullScreen.immersiveMode(onSuccess, onError); - } - else if (leaveFullScreen) { - AndroidFullScreen.showSystemUI(onSuccess, onError); - } - } - - Dashboard.ready(function () { - - Logger.log('binding fullscreen to MediaController'); - - updateFromSetting(false); - - $(AppSettings).on('settingupdated', function (e, key) { - - if (key == 'enableFullScreen') { - updateFromSetting(true); - } - }); - }); - -})(); \ No newline at end of file diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html index b7d39f5d67..e71d65cfb4 100644 --- a/dashboard-ui/mypreferencesdisplay.html +++ b/dashboard-ui/mypreferencesdisplay.html @@ -90,14 +90,6 @@
${LabelEnableBackdropsHelp}
-
-
-
-
- ${LabelEnableFullScreen} -
-
- diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js index 60381f9f15..e000846714 100644 --- a/dashboard-ui/scripts/mypreferencesdisplay.js +++ b/dashboard-ui/scripts/mypreferencesdisplay.js @@ -11,8 +11,6 @@ $('#selectLanguage', page).val(AppSettings.displayLanguage()); - page.querySelector('.chkEnableFullScreen').checked = AppSettings.enableFullScreen(); - Dashboard.hideLoadingMsg(); } @@ -22,7 +20,6 @@ user.Configuration.DisplayUnairedEpisodes = page.querySelector('.chkDisplayUnairedEpisodes').checked; user.Configuration.GroupMoviesIntoBoxSets = page.querySelector('.chkGroupMoviesIntoCollections').checked; - AppSettings.enableFullScreen(page.querySelector('.chkEnableFullScreen').checked); AppSettings.displayLanguage(page.querySelector('#selectLanguage').value); appStorage.setItem('enableThemeSongs-' + user.Id, $('#selectThemeSong', page).val()); @@ -80,12 +77,6 @@ $('.fldEnableBackdrops', page).show(); - if (AppInfo.supportsFullScreen) { - $('.fldFullscreen', page).show(); - } else { - $('.fldFullscreen', page).hide(); - } - if (AppInfo.supportsUserDisplayLanguageSetting) { $('.languageSection', page).show(); } else { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b87a78162b..51769395dd 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1716,7 +1716,6 @@ var AppInfo = {}; AppInfo.hasPhysicalVolumeButtons = isCordova || isMobile; AppInfo.enableBackButton = isIOS && (window.navigator.standalone || AppInfo.isNativeApp); - AppInfo.supportsFullScreen = isCordova && isAndroid; AppInfo.supportsSyncPathSetting = isCordova && isAndroid; AppInfo.supportsUserDisplayLanguageSetting = Dashboard.isConnectMode() && !isCordova; @@ -2210,7 +2209,7 @@ var AppInfo = {}; require(['cordova/connectsdk', 'scripts/registrationservices', 'cordova/back']); if (browserInfo.android) { - require(['cordova/android/androidcredentials', 'cordova/android/immersive', 'cordova/android/mediasession']); + require(['cordova/android/androidcredentials', 'cordova/android/mediasession']); } else { require(['cordova/volume']); }