update translations

dashboard-ui/css/site.css

@@ -202,6 +202,10 @@ h1 a:hover {
         display: none;
     }
 
+body:not(.enableBackButton) .headerBackButton {
+    display: none;
+}
+
 /**
  * Note: I have omitted any vendor-prefixes for clarity.
  * Adding them is left as an exercise for the reader.

dashboard-ui/scripts/chromecast.js

@@ -350,7 +350,7 @@
         getEndpointInfo().done(function (endpoint) {
 
             if (endpoint.IsLocal || endpoint.IsInNetwork) {
-                ApiClient.getSystemInfo().done(function (info) {
+                ApiClient.getPublicSystemInfo().done(function (info) {
 
                     message.serverAddress = info.LocalAddress;
                     player.sendMessageInternal(message);

dashboard-ui/scripts/episodes.js

@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
+    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
     // The base query options
     var query = {

dashboard-ui/scripts/externalplayer.js

@@ -249,10 +249,12 @@
 
         }, 10000);
 
+        // Need a timeout because we can't show a popup at the same time as the previous one is closing
+        // Bumping it up to 1000 because the post play menu is hiding for some reason on android
         setTimeout(function () {
 
             showPostPlayMenu(currentItem);
-        }, 500);
+        }, 1000);
     }
 
     function onPlaybackProgress(positionTicks) {
@@ -478,7 +480,6 @@
 
         showMenu: showPlayMenu,
         onPlaybackStart: onPlaybackStart,
-        onPlaybackStopped: onPlaybackStopped,
         getExternalPlayers: getExternalPlayers,
         showPlayerSelectionMenu: showPlayerSelectionMenu
     };

dashboard-ui/scripts/librarymenu.js

@@ -4,9 +4,7 @@
 
         var html = '<div class="viewMenuBar ui-bar-b">';
 
-        if (AppInfo.enableBackButton) {
         html += '<button type="button" data-role="none" onclick="history.back();" class="headerButton headerButtonLeft headerBackButton"><div class="fa fa-arrow-left"></div></button>';
-        }
 
         html += '<button type="button" data-role="none" title="Menu" class="headerButton dashboardMenuButton barsMenuButton headerButtonLeft">';
         html += '<div class="barMenuInner fa fa-bars">';

dashboard-ui/scripts/mediaplayer-video.js

@@ -1287,15 +1287,19 @@
 
             }).on("click.mediaplayerevent", function (e) {
 
+                if (!$.browser.mobile) {
                     if (this.paused) {
                         self.unpause();
                     } else {
                         self.pause();
                     }
+                }
 
             }).on("dblclick.mediaplayerevent", function () {
 
+                if (!$.browser.mobile) {
                     self.toggleFullscreen();
+                }
             });
 
             bindEventsForPlayback();

dashboard-ui/scripts/mediaplayer.js

@@ -108,11 +108,13 @@
             return options;
         };
 
-        self.getDeviceProfile = function () {
+        self.getDeviceProfile = function (maxWidth) {
 
-            var qualityOption = self.getVideoQualityOptions().filter(function (q) {
+            if (!maxWidth) {
+                maxWidth = self.getVideoQualityOptions().filter(function (q) {
                     return q.selected;
-            })[0];
+                })[0].maxWidth;
+            }
 
             var bitrateSetting = AppSettings.maxStreamingBitrate();
 
@@ -316,7 +318,7 @@
                 {
                     Condition: 'LessThanEqual',
                     Property: 'Width',
-                    Value: qualityOption.maxWidth
+                    Value: maxWidth
                 }]
             });
 
@@ -333,7 +335,7 @@
                 {
                     Condition: 'LessThanEqual',
                     Property: 'Width',
-                    Value: qualityOption.maxWidth
+                    Value: maxWidth
                 }]
             });
 

dashboard-ui/scripts/moviecollections.js

@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
+    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
     // The base query options
     var query = {

dashboard-ui/scripts/movies.js

@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
+    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
     // The base query options
     var query = {

dashboard-ui/scripts/photos.js

@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
+    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
     // The base query options
     var query = {

dashboard-ui/scripts/site.js

@@ -1359,7 +1359,8 @@ var Dashboard = {
     },
 
     capabilities: function () {
-        return {
+
+        var caps = {
             PlayableMediaTypes: "Audio,Video",
 
             SupportedCommands: Dashboard.getSupportedRemoteCommands().join(','),
@@ -1367,6 +1368,8 @@ var Dashboard = {
             SupportsMediaControl: true,
             SupportedLiveMediaTypes: ['Audio', 'Video']
         };
+
+        return caps;
     },
 
     getDefaultImageQuality: function (imageType) {
@@ -1600,12 +1603,10 @@ var AppInfo = {};
     }
 
     //localStorage.clear();
-    function createConnectionManager(appInfo) {
+    function createConnectionManager(appInfo, capabilities) {
 
         var credentialProvider = new MediaBrowser.CredentialProvider();
 
-        var capabilities = Dashboard.capabilities();
-
         window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, appInfo.appName, appInfo.appVersion, appInfo.deviceName, appInfo.deviceId, capabilities);
 
         $(ConnectionManager).on('apiclientcreated', function (e, newApiClient) {
@@ -1713,6 +1714,10 @@ var AppInfo = {};
             $(document).addClass('nativeApp');
         }
 
+        if (AppInfo.enableBackButton) {
+            $(document.body).addClass('enableBackButton');
+        }
+
         var videoPlayerHtml = '<div id="mediaPlayer" data-theme="b" class="ui-bar-b" style="display: none;">';
 
         videoPlayerHtml += '<div class="videoBackdrop">';
@@ -1823,6 +1828,10 @@ var AppInfo = {};
 
         if (Dashboard.isRunningInCordova()) {
             requirejs(['thirdparty/cordova/connectsdk', 'thirdparty/cordova/remotecontrols']);
+
+            if ($.browser.android) {
+                requirejs(['thirdparty/cordova/android/immersive']);
+            }
         } else {
             if ($.browser.chrome) {
                 requirejs(['scripts/chromecast']);
@@ -1830,7 +1839,7 @@ var AppInfo = {};
         }
     }
 
-    function init(deferred, appName, deviceId, deviceName, resolveOnReady) {
+    function init(deferred, capabilities, appName, deviceId, deviceName, resolveOnReady) {
 
         requirejs.config({
             map: {
@@ -1850,12 +1859,14 @@ var AppInfo = {};
 
         var appInfo = Dashboard.getAppInfo(appName, deviceId, deviceName);
 
-        createConnectionManager(appInfo);
+        createConnectionManager(appInfo, capabilities);
 
         if (!resolveOnReady) {
+
             Dashboard.initPromiseDone = true;
             deferred.resolve();
         }
+
         $(function () {
             onDocumentReady();
             if (resolveOnReady) {
@@ -1867,9 +1878,19 @@ var AppInfo = {};
 
     function initCordovaWithDeviceId(deferred, deviceId) {
 
+        var screenWidth = Math.max(screen.height, screen.width);
+        initCordovaWithDeviceProfile(deferred, deviceId, MediaPlayer.getDeviceProfile(screenWidth));
+    }
+
+    function initCordovaWithDeviceProfile(deferred, deviceId, deviceProfile) {
+
         requirejs(['thirdparty/cordova/imagestore.js']);
 
-        init(deferred, "Emby Mobile", deviceId, device.model, true);
+        var capablities = Dashboard.capabilities();
+
+        capablities.DeviceProfile = deviceProfile;
+
+        init(deferred, capablities, "Emby Mobile", deviceId, device.model, true);
     }
 
     function initCordova(deferred) {
@@ -1894,7 +1915,7 @@ var AppInfo = {};
     if (Dashboard.isRunningInCordova()) {
         initCordova(initDeferred);
     } else {
-        init(initDeferred);
+        init(initDeferred, Dashboard.capabilities());
     }
 
 })();

dashboard-ui/scripts/tvshows.js

@@ -1,6 +1,6 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard');
+    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
     // The base query options
     var query = {

dashboard-ui/thirdparty/apiclient/apiclient.js

@@ -1082,6 +1082,17 @@
             });
         };
 
+        self.getRegistrationInfo = function (feature) {
+
+            var url = self.getUrl("Registrations/" + feature);
+
+            return self.ajax({
+                type: "GET",
+                url: url,
+                dataType: "json"
+            });
+        };
+
         /**
          * Gets the current server status
          */

dashboard-ui/thirdparty/apiclient/connectionmanager.js

@@ -1221,6 +1221,12 @@
             });
         };
 
+        self.getRegistrationInfo = function (feature, apiClient) {
+
+            return apiClient.getRegistrationInfo(feature);
+        };
+
+
         return self;
     };
 

dashboard-ui/thirdparty/cordova/android/immersive.js

@@ -0,0 +1,34 @@
+(function () {
+
+    function onSuccess() {
+        console.log('Immersive mode succeeded');
+    }
+
+    function onError() {
+        console.log('Immersive mode failed');
+    }
+
+    //// Is this plugin supported?
+    //AndroidFullScreen.isSupported();
+
+    //// Is immersive mode supported?
+    //AndroidFullScreen.isImmersiveModeSupported(successFunction, errorFunction);
+
+    //// The width of the screen in immersive mode
+    //AndroidFullScreen.immersiveWidth(trace, errorFunction);
+
+    //// The height of the screen in immersive mode
+    //AndroidFullScreen.immersiveHeight(trace, errorFunction);
+
+    //// Hide system UI until user interacts
+    //AndroidFullScreen.leanMode(successFunction, errorFunction);
+
+    //// Show system UI
+    //AndroidFullScreen.showSystemUI(successFunction, errorFunction);
+
+    //// Extend your app underneath the system UI (Android 4.4+ only)
+    //AndroidFullScreen.showUnderSystemUI(successFunction, errorFunction);
+
+    //// Hide system UI and keep it hidden (Android 4.4+ only)
+    //AndroidFullScreen.immersiveMode(successFunction, errorFunction);
+})();

dashboard-ui/thirdparty/cordova/chromecast.js

@@ -92,7 +92,7 @@
             getEndpointInfo().done(function (endpoint) {
 
                 if (endpoint.IsLocal || endpoint.IsInNetwork) {
-                    ApiClient.getSystemInfo().done(function (info) {
+                    ApiClient.getPublicSystemInfo().done(function (info) {
 
                         message.serverAddress = info.LocalAddress;
                         sendMessageInternal(message);

dashboard-ui/thirdparty/cordova/externalplayer.js

@@ -18,33 +18,6 @@
         });
     }
 
-    function getExternalPlayers(url, mimeType) {
-
-        var deferred = $.Deferred();
-
-        window.plugins.launcher.canLaunch({
-            uri: url,
-            dataType: mimeType,
-            getAppList: true
-        }, function (data) {
-
-            console.log('plugin canLaunch succcess');
-            var players = data.appList.map(function (p) {
-
-            });
-            deferred.resolveWith(null, [players]);
-
-        }, function () {
-            console.log('plugin canLaunch error');
-            deferred.reject();
-        });
-
-        deferred.resolveWith(null, [players]);
-
-        return deferred.promise();
-    }
-
-    window.ExternalPlayer.getExternalPlayers = getExternalPlayers;
     window.ExternalPlayer.showPlayerSelectionMenu = showPlayerSelectionMenu;
 
 })();

dashboard-ui/thirdparty/cordova/registrationservices.js

@@ -1,28 +1,105 @@
 (function () {
 
-    function validatePlayback(deferred) {
+    var updatedProducts = [];
+
+    function updateProductInfo(p) {
+
+        updatedProducts = updatedProducts.filter(function (r) {
+            return r.alias != p.alias;
+        });
+
+        updatedProducts.push(p);
+    }
+
+    function isAndroid() {
 
         var platform = (device.platform || '').toLowerCase();
 
+        return platform.indexOf('android') != -1;
+    }
+
+    function validatePlayback(deferred) {
+
         // Don't require validation on android
-        if (platform.indexOf('android') != -1) {
+        if (isAndroid()) {
             deferred.resolve();
             return;
         }
 
-        deferred.resolve();
+        validateFeature({
+
+            id: 'appunlock',
+            alias: "premium features"
+
+        }, deferred);
     }
 
     function validateLiveTV(deferred) {
 
-        var platform = (device.platform || '').toLowerCase();
-
         // Don't require validation if not android
-        if (platform.indexOf('android') == -1) {
+        if (!isAndroid()) {
             deferred.resolve();
             return;
         }
 
+        validateFeature({
+
+            id: 'premiumunlock',
+            alias: "premium features"
+
+        }, deferred);
+    }
+
+    function validateSmb(deferred) {
+
+        // Don't require validation if not android
+        if (!isAndroid()) {
+            deferred.resolve();
+            return;
+        }
+
+        validateFeature({
+
+            id: 'premiumunlock',
+            alias: "premium features"
+
+        }, deferred);
+    }
+
+    function validateFeature(info, deferred) {
+
+        var products = updatedProducts.filter(function (r) {
+            return r.alias == info.alias;
+        });
+
+        var product = products.length ? products[0] : null;
+
+        if (product && product.owned) {
+            deferred.resolve();
+            return;
+        }
+
+        // Get supporter status
+        ConnectionManager.getRegistrationInfo('appunlock', ApiClient).done(function (registrationInfo) {
+
+            if (registrationInfo.IsRegistered) {
+                deferred.resolve();
+                return;
+            }
+
+            showInAppPurchaseInfo(info, product, registrationInfo, deferred);
+
+        }).fail(function () {
+            deferred.reject();
+        });
+    }
+
+    function showInAppPurchaseInfo(info, product, serverRegistrationInfo, deferred) {
+
+        var requiresLocalValidation = serverRegistrationInfo.IsLocalValidationRequired;
+        var canPurchase = product != null && product.canPurchase;
+
+        // Can only purchase if product != null
         deferred.resolve();
     }
 
@@ -57,4 +134,82 @@
         }
     };
 
+    function validateProduct(product, callback) {
+
+        // product attributes:
+        // https://github.com/j3k0/cordova-plugin-purchase/blob/master/doc/api.md#validation-error-codes
+
+        callback(true, {
+
+        });
+
+        //callback(true, { ... transaction details ... }); // success!
+
+        //// OR
+        //callback(false, {
+        //    error: {
+        //        code: store.PURCHASE_EXPIRED,
+        //        message: "XYZ"
+        //    }
+        //});
+
+        //// OR
+        //callback(false, "Impossible to proceed with validation");  
+    }
+
+    function initializeStore() {
+
+        // Let's set a pretty high verbosity level, so that we see a lot of stuff
+        // in the console (reassuring us that something is happening).
+        store.verbosity = store.INFO;
+
+        store.validator = validateProduct;
+
+        if (isAndroid) {
+            store.register({
+                id: "premiumunlock",
+                alias: "premium features",
+                type: store.NON_CONSUMABLE
+            });
+        } else {
+
+            // iOS
+            store.register({
+                id: "appunlock",
+                alias: "premium features",
+                type: store.NON_CONSUMABLE
+            });
+        }
+
+        // When purchase of the full version is approved,
+        // show some logs and finish the transaction.
+        store.when("premium feautres").approved(function (order) {
+            log('You just unlocked the FULL VERSION!');
+            order.finish();
+        });
+
+        // The play button can only be accessed when the user
+        // owns the full version.
+        store.when("premium feautres").updated(function (product) {
+
+            updateProductInfo(product);
+        });
+
+        // When every goes as expected, it's time to celebrate!
+        // The "ready" event should be welcomed with music and fireworks,
+        // go ask your boss about it! (just in case)
+        store.ready(function () {
+
+            console.log("Store ready");
+
+            // After we've done our setup, we tell the store to do
+            // it's first refresh. Nothing will happen if we do not call store.refresh()
+            store.refresh();
+        });
+    }
+
+    // We must wait for the "deviceready" event to fire
+    // before we can use the store object.
+    initializeStore();
+
 })();

dashboard-ui/thirdparty/cordova/serverdiscovery.js

@@ -90,6 +90,17 @@
         console.log('chrome.sockets.udp.create');
         chrome.sockets.udp.create(function (createInfo) {
 
+            if (!createInfo) {
+                console.log('create fail');
+                deferred.resolveWith(null, [servers]);
+                return;
+            }
+            if (!createInfo.socketId) {
+                console.log('create fail');
+                deferred.resolveWith(null, [servers]);
+                return;
+            }
+
             socketId = createInfo.socketId;
 
             console.log('chrome.sockets.udp.bind');