Android 198

README.md

@@ -4,7 +4,7 @@
 | [12660](https://github.com/yuzu-emu/yuzu-android//pull/12660) | [`2cacb9d48`](https://github.com/yuzu-emu/yuzu-android//pull/12660/files) | service: hid: Fully implement abstract vibration | [german77](https://github.com/german77/) | Yes |
 | [12688](https://github.com/yuzu-emu/yuzu-android//pull/12688) | [`e9eb017aa`](https://github.com/yuzu-emu/yuzu-android//pull/12688/files) | renderer_vulkan: recreate swapchain when frame size changes | [liamwhite](https://github.com/liamwhite/) | Yes |
 | [12701](https://github.com/yuzu-emu/yuzu-android//pull/12701) | [`e4bbb24dc`](https://github.com/yuzu-emu/yuzu-android//pull/12701/files) |  vi: check layer state before opening or closing | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12715](https://github.com/yuzu-emu/yuzu-android//pull/12715) | [`a363fa78e`](https://github.com/yuzu-emu/yuzu-android//pull/12715/files) | android: Add uninstall addon button | [t895](https://github.com/t895/) | Yes |
+| [12715](https://github.com/yuzu-emu/yuzu-android//pull/12715) | [`47058d705`](https://github.com/yuzu-emu/yuzu-android//pull/12715/files) | android: Add uninstall addon button | [t895](https://github.com/t895/) | Yes |
 
 
 End of merge log. You can find the original README.md below the break.

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -551,10 +551,10 @@ object NativeLibrary {
     external fun removeUpdate(programId: String)
 
     /**
-     * Removes all DLC for a  [programId]
-     * @param programId String representation of a game's program ID
+     * Removes DLC by its unique [titleId]
+     * @param titleId String representation of a DLC's title ID
      */
-    external fun removeDLC(programId: String)
+    external fun removeDLC(titleId: String)
 
     /**
      * Removes a mod installed for a given [programId]

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt

@@ -61,7 +61,7 @@ class AddonViewModel : ViewModel() {
     fun onDeleteAddon(patch: Patch) {
         when (PatchType.from(patch.type)) {
             PatchType.Update -> NativeLibrary.removeUpdate(patch.programId)
-            PatchType.DLC -> NativeLibrary.removeDLC(patch.programId)
+            PatchType.DLC -> NativeLibrary.removeDLC(patch.titleId)
             PatchType.Mod -> NativeLibrary.removeMod(patch.programId, patch.name)
         }
         refreshAddons()

src/android/app/src/main/jni/native.cpp

@@ -816,10 +816,10 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject job
                                  program_id);
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj,
-                                                     jstring jprogramId) {
-    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id);
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, jstring jtitleId) {
+    auto title_id = EmulationSession::GetProgramId(env, jtitleId);
+    ContentManager::RemoveDLC(EmulationSession::GetInstance().System().GetFileSystemController(),
+                              title_id);
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,