Merge pull request #9841 from JosJuice/revert-9835

Partially revert "Android: Clean up some hardcoded strings"
dolphin-emu · Jul 6, 2021 · be0163b · be0163b
2 parents 39e14b6 + 98bdf3b
commit be0163b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java b/...e/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncChannelJobService.java
@@ -87,7 +87,7 @@ protected Boolean doInBackground(Void... voids)
       }
       else
       {
-        subscriptions = TvUtil.createUniversalSubscriptions(context);
+        subscriptions = TvUtil.createUniversalSubscriptions();
         for (HomeScreenChannel subscription : subscriptions)
         {
           long channelId = createChannel(subscription);

diff --git a/.../Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java b/.../Android/app/src/main/java/org/dolphinemu/dolphinemu/services/SyncProgramsJobService.java
@@ -98,8 +98,7 @@ protected Boolean doInBackground(Long... channelIds)
           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
@@ -253,19 +253,21 @@ private static int getJobIdForChannelId(long channelId)
   /**
    * 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;