Minor epg fix

Philipp0002 · Feb 2, 2025 · 033997f · 033997f
1 parent be4d019
commit 033997f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/src/main/java/de/hahnphilipp/watchwithfritzbox/epg/LogcatEpgReader.java b/app/src/main/java/de/hahnphilipp/watchwithfritzbox/epg/LogcatEpgReader.java
@@ -60,7 +60,7 @@ private void processLine(String line) {
             lastReferencedServiceId = Integer.parseInt(serviceId);
         } else if (line.startsWith("- type=")) {
             int providerIndex = line.indexOf("provider=") + "provider=".length();
-            int providerEndIndex = line.indexOf(" ", providerIndex);
+            int providerEndIndex = line.indexOf("name=", providerIndex);
             int nameIndex = line.indexOf("name=") + "name=".length();
 
             String provider = line.substring(providerIndex, providerEndIndex);
@@ -69,7 +69,7 @@ private void processLine(String line) {
             ChannelUtils.Channel ch = ChannelUtils.getChannelByTitle(context, name);
             if (ch == null) return;
             ChannelUtils.Channel originalCh = ch.copy();
-            if (ch != null && lastReferencedServiceId != -1) {
+            if (lastReferencedServiceId != -1) {
                 ch.serviceId = lastReferencedServiceId;
                 ch.provider = provider;
                 ChannelUtils.updateChannel(context, originalCh, ch);

diff --git a/app/src/main/java/de/hahnphilipp/watchwithfritzbox/player/SettingsTVOverlay.java b/app/src/main/java/de/hahnphilipp/watchwithfritzbox/player/SettingsTVOverlay.java
@@ -85,7 +85,7 @@ public void updateTVSettings() {
             descriptionsSubtitle = player.getSpuTracks();
         }
 
-        //tvSettings.add(new TVSetting(getString(R.string.settings_open_epg), R.drawable.round_remote, () -> showEpg(), true));
+        tvSettings.add(new TVSetting(context.getString(R.string.settings_open_epg), R.drawable.round_remote, this::showEpg, true));
 
         if (descriptionsAudio != null && descriptionsAudio.length != 0) {
             tvSettings.add(new TVSetting(context.getString(R.string.audio_tracks), R.drawable.round_audiotrack, this::showAudioTrackSelection, true));

diff --git a/app/src/main/java/de/hahnphilipp/watchwithfritzbox/player/TVPlayerActivity.java b/app/src/main/java/de/hahnphilipp/watchwithfritzbox/player/TVPlayerActivity.java
@@ -93,7 +93,6 @@ protected void onCreate(Bundle savedInstanceState) {
             ivlcVout.setWindowSize(surfaceView.getWidth(), surfaceView.getHeight());
         });
 
-
         initializeOverlay();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,6 @@ protected void onCreate(Bundle savedInstanceState) { @@
                 ivlcVout.setWindowSize(surfaceView.getWidth(), surfaceView.getHeight());
             });
             initializeOverlay();
         }
@@ Expand Down @@