Merge pull request #115 from paulhiggs/UI-fix

UI image related fixes

Author: paulhiggs

frontend/android/js/dvbi-mobile.js

@@ -337,11 +337,7 @@ function loadServicelist(list) {
 function serviceListSelected() {
   $("#servicelist_registry").hide();
   $("#settings").hide();
-  if (serviceList.image) {
-    $("#list_logo").attr("src", serviceList.image);
-  } else {
-    $("#list_logo").attr("src", "images/logo_dvbi_sofia.png");
-  }
+  $("#list_logo").attr("src", serviceList?.image?.mediaUri || "images/logo_dvbi_sofia.png");
   var channelIndex = 0;
   for (var i = 0; i < serviceList.services.length; i++) {
     var channel = new Channel();

frontend/android/js/program.js

@@ -86,7 +86,7 @@ function UseLocalisation(elems, language) {
 
 Program.prototype.populateProgramInfo = function () {
   var i;
-  $("#info_chicon").attr("src", this.channel.image || "./images/empty.png");
+  $("#info_chicon").attr("src", this.channel?.image?.mediaUri || "./images/empty.png");
   $("#info_chnumber").text(this.channel.lcn);
   $(".chdrm_prginfo").remove();
   if (this.cpsIndex) {

frontend/channel-common.js

@@ -270,16 +270,12 @@ Channel.prototype.getServiceInstanceByCPSIndex = function (cpsIndex) {
 Channel.prototype.getMoreEpisodes = function (programId, callback) {
   var self = this;
   if (this.moreEpisodesURI && typeof callback == "function") {
-    NetworkRequest({
-      url: this.moreEpisodesURI + "?pid=" + programId + "&type=ondemand",
+    NetworkRequest(this.moreEpisodesURI + "?pid=" + programId + "&type=ondemand", {
       success: function (data) {
         var episodes = self.parseSchedule(data);
         callback.call(callback, episodes);
       },
       datatype: "text",
-      beforeSend: function (xhr) {
-        xhr.setRequestHeader("Accept", "application/vnd.dvb.dvbi.r6");
-      },
     });
   } else if (typeof callback == "function") {
     callback.call(null);