diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java index 17e95dea36..5e33a852a2 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java @@ -87,7 +87,7 @@ public class SyncChannelJobService extends JobService } else { - subscriptions = TvUtil.createUniversalSubscriptions(context); + subscriptions = TvUtil.createUniversalSubscriptions(); for (HomeScreenChannel subscription : subscriptions) { long channelId = createChannel(subscription); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java index f8fe977855..9d75c35fc5 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java @@ -98,8 +98,7 @@ public class SyncProgramsJobService extends JobService Channel channel = TvUtil.getChannelById(context, channelId); for (Platform platform : Platform.values()) { - if (channel != null && - channel.getAppLinkIntentUri().equals(AppLinkHelper.buildBrowseUri(platform))) + if (channel != null && channel.getDisplayName().equals(platform.getIdString())) { getGamesByPlatform(platform); syncPrograms(channelId); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java index df952e2342..8a4b589444 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java @@ -253,19 +253,21 @@ public class TvUtil /** * Generates all subscriptions for homescreen channels. */ - public static List createUniversalSubscriptions(Context context) + public static List createUniversalSubscriptions() { - return new ArrayList<>(createPlatformSubscriptions(context)); + return new ArrayList<>(createPlatformSubscriptions()); } - private static List createPlatformSubscriptions(Context context) + private static List createPlatformSubscriptions() { List subs = new ArrayList<>(); for (Platform platform : Platform.values()) { + // TODO: Replace the getIdString calls with getHeaderName to get localized names. + // This would require SyncProgramsJobService to stop using the display name as a key subs.add(new HomeScreenChannel( - context.getString(platform.getHeaderName()), - context.getString(platform.getHeaderName()), + platform.getIdString(), + platform.getIdString(), AppLinkHelper.buildBrowseUri(platform))); } return subs;