The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 15:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Partially revert "Android: Clean up hardcoded platform names""

Browse Source 
This reverts commit 98bdf3b1ceae94a35e3f47158966967d1c947d99.
This commit is contained in:
JosJuice 2022-06-26 09:24:19 +02:00
parent 2b36587af7
commit 1d772176a2
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
View File

@ -87,7 +87,7 @@ public class SyncChannelJobService extends JobService
} }
else else
{ {
subscriptions = TvUtil.createUniversalSubscriptions(); subscriptions = TvUtil.createUniversalSubscriptions(context);
for (HomeScreenChannel subscription : subscriptions) for (HomeScreenChannel subscription : subscriptions)
{ {
long channelId = createChannel(subscription); long channelId = createChannel(subscription);

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java
View File

@ -98,7 +98,8 @@ public class SyncProgramsJobService extends JobService
Channel channel = TvUtil.getChannelById(context, channelId); Channel channel = TvUtil.getChannelById(context, channelId);
for (Platform platform : Platform.values()) for (Platform platform : Platform.values())
{ {
if (channel != null && channel.getDisplayName().equals(platform.getIdString())) if (channel != null &&
channel.getAppLinkIntentUri().equals(AppLinkHelper.buildBrowseUri(platform)))
{ {
getGamesByPlatform(platform); getGamesByPlatform(platform);
syncPrograms(channelId); syncPrograms(channelId);

12
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java
View File

@ -254,21 +254,19 @@ public class TvUtil
/** /**
* Generates all subscriptions for homescreen channels. * Generates all subscriptions for homescreen channels.
*/ */
public static List<HomeScreenChannel> createUniversalSubscriptions() public static List<HomeScreenChannel> createUniversalSubscriptions(Context context)
{ {
return new ArrayList<>(createPlatformSubscriptions()); return new ArrayList<>(createPlatformSubscriptions(context));
} }
private static List<HomeScreenChannel> createPlatformSubscriptions() private static List<HomeScreenChannel> createPlatformSubscriptions(Context context)
{ {
List<HomeScreenChannel> subs = new ArrayList<>(); List<HomeScreenChannel> subs = new ArrayList<>();
for (Platform platform : Platform.values()) 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( subs.add(new HomeScreenChannel(
platform.getIdString(), context.getString(platform.getHeaderName()),
platform.getIdString(), context.getString(platform.getHeaderName()),
AppLinkHelper.buildBrowseUri(platform))); AppLinkHelper.buildBrowseUri(platform)));
} }
return subs; return subs;