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

Merge pull request #9841 from JosJuice/revert-9835 

Partially revert "Android: Clean up some hardcoded strings"
This commit is contained in:
Léo Lam 2021-07-06 13:07:50 +02:00 committed by GitHub
parent 39e14b6b5f 98bdf3b1ce
commit be0163b7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -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);

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

@ -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);

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

@ -253,19 +253,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;