Merge pull request #8598 from JosJuice/channel-sync-android-tv

Android: More robust check for whether to sync channels
dolphin-emu · Mar 16, 2020 · d408538 · d408538
2 parents 3613642 + 64953bb
commit d408538
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -59,8 +59,6 @@ protected void onCreate(Bundle savedInstanceState)
     {
       StartupHandler.HandleInit(this);
     }
-    // Setup and/or sync channels
-    TvUtil.scheduleSyncingChannel(getApplicationContext());
   }
 
   @Override

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
@@ -27,6 +27,10 @@ public static void HandleInit(FragmentActivity parent)
     // Ask the user if he wants to enable analytics if we haven't yet.
     Analytics.checkAnalyticsInit(parent);
 
+    // Set up and/or sync Android TV channels
+    if (TvUtil.isLeanback(parent))
+      TvUtil.scheduleSyncingChannel(parent);
+
     String[] start_files = null;
     Bundle extras = parent.getIntent().getExtras();
     if (extras != null)