ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partially revert "Android: Clean up hardcoded platform names" 

This partially reverts commit cbc4989095
due to a crash: https://bugs.dolphin-emu.org/issues/12561

I can't debug what the cause of the crash is due to not having an
Android TV device. Let's just revert this for now to fix the crash.
This commit is contained in:
JosJuice 2021-06-24 17:24:29 +02:00
parent c77a5f7e32
commit 98bdf3b1ce
3 changed files with 9 additions and 8 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

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

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

@ -96,8 +96,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);

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

@ -251,19 +251,21 @@ public class TvUtil
/**
* Generates all subscriptions for homescreen channels.
*/
public static List<HomeScreenChannel> createUniversalSubscriptions(Context context)
public static List<HomeScreenChannel> createUniversalSubscriptions()
{
return new ArrayList<>(createPlatformSubscriptions(context));
return new ArrayList<>(createPlatformSubscriptions());
}
private static List<HomeScreenChannel> createPlatformSubscriptions(Context context)
private static List<HomeScreenChannel> createPlatformSubscriptions()
{
List<HomeScreenChannel> 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;