Merge pull request #10787 from JosJuice/channel-uri

Android: Add app link intent URI to channels projection

3 files changed, 11 insertions, 11 deletions

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 48af4e4f4d..2e11049ab2 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();
+        subscriptions = TvUtil.createUniversalSubscriptions(context);
         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 c789084343..62d9bfce30 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,7 +98,8 @@ public class SyncProgramsJobService extends JobService
           Channel channel = TvUtil.getChannelById(context, channelId);
           for (Platform platform : Platform.values())
           {
-            if (channel != null && channel.getDisplayName().equals(platform.getIdString()))
+            if (channel != null &&
+                    channel.getAppLinkIntentUri().equals(AppLinkHelper.buildBrowseUri(platform)))
             {
               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 8a4b589444..164463cb50 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
@@ -50,8 +50,9 @@ public class TvUtil
 
   private static final String[] CHANNELS_PROJECTION = {
           TvContractCompat.Channels._ID,
-          TvContract.Channels.COLUMN_DISPLAY_NAME,
-          TvContractCompat.Channels.COLUMN_BROWSABLE
+          TvContractCompat.Channels.COLUMN_DISPLAY_NAME,
+          TvContractCompat.Channels.COLUMN_BROWSABLE,
+          TvContractCompat.Channels.COLUMN_APP_LINK_INTENT_URI
   };
   private static final String LEANBACK_PACKAGE = "com.google.android.tvlauncher";
 
@@ -253,21 +254,19 @@ public class TvUtil
   /**
    * 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<>();
     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(
-              platform.getIdString(),
-              platform.getIdString(),
+              context.getString(platform.getHeaderName()),
+              context.getString(platform.getHeaderName()),
               AppLinkHelper.buildBrowseUri(platform)));
     }
     return subs;