diff options
| author | Léo Lam <leo@leolam.fr> | 2020-03-16 20:53:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 20:53:47 +0100 |
| commit | d4085382dccac850b96a5d263939c89af85525d1 (patch) | |
| tree | 840c08a15a61a0e690b86c0f26c18fe48c751f77 /Source/Android/app/src/main/java | |
| parent | 361364260a3e335e23be99ad0642d5095ebb60fd (diff) | |
| parent | 64953bb63a8e4a54cd9ac37e81d77453783b6620 (diff) | |
Merge pull request #8598 from JosJuice/channel-sync-android-tv
Android: More robust check for whether to sync channels
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java | 2 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java | 4 |
2 files changed, 4 insertions, 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 index ef1aed4ea8..2f450ade7a 100644 --- 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 @@ public final class TvMainActivity extends FragmentActivity implements MainView { 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 index a7f479cde8..68f3ff3a49 100644 --- 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 final class StartupHandler // 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) |