android: Add options to verify installed content
This commit is contained in:
		@@ -23,6 +23,7 @@ import org.yuzu.yuzu_emu.utils.Log
 | 
				
			|||||||
import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
 | 
					import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
 | 
				
			||||||
import org.yuzu.yuzu_emu.model.InstallResult
 | 
					import org.yuzu.yuzu_emu.model.InstallResult
 | 
				
			||||||
import org.yuzu.yuzu_emu.model.Patch
 | 
					import org.yuzu.yuzu_emu.model.Patch
 | 
				
			||||||
 | 
					import org.yuzu.yuzu_emu.model.GameVerificationResult
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Class which contains methods that interact
 | 
					 * Class which contains methods that interact
 | 
				
			||||||
@@ -564,6 +565,26 @@ object NativeLibrary {
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    external fun removeMod(programId: String, name: String)
 | 
					    external fun removeMod(programId: String, name: String)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Verifies all installed content
 | 
				
			||||||
 | 
					     * @param callback UI callback for verification progress. Return true in the callback to cancel.
 | 
				
			||||||
 | 
					     * @return Array of content that failed verification. Successful if empty.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    external fun verifyInstalledContents(
 | 
				
			||||||
 | 
					        callback: (max: Long, progress: Long) -> Boolean
 | 
				
			||||||
 | 
					    ): Array<String>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Verifies the contents of a game
 | 
				
			||||||
 | 
					     * @param path String path to a game
 | 
				
			||||||
 | 
					     * @param callback UI callback for verification progress. Return true in the callback to cancel.
 | 
				
			||||||
 | 
					     * @return Int that is meant to be converted to a [GameVerificationResult]
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    external fun verifyGameContents(
 | 
				
			||||||
 | 
					        path: String,
 | 
				
			||||||
 | 
					        callback: (max: Long, progress: Long) -> Boolean
 | 
				
			||||||
 | 
					    ): Int
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Gets the save location for a specific game
 | 
					     * Gets the save location for a specific game
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,8 +21,10 @@ import androidx.fragment.app.activityViewModels
 | 
				
			|||||||
import androidx.navigation.findNavController
 | 
					import androidx.navigation.findNavController
 | 
				
			||||||
import androidx.navigation.fragment.navArgs
 | 
					import androidx.navigation.fragment.navArgs
 | 
				
			||||||
import com.google.android.material.transition.MaterialSharedAxis
 | 
					import com.google.android.material.transition.MaterialSharedAxis
 | 
				
			||||||
 | 
					import org.yuzu.yuzu_emu.NativeLibrary
 | 
				
			||||||
import org.yuzu.yuzu_emu.R
 | 
					import org.yuzu.yuzu_emu.R
 | 
				
			||||||
import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
 | 
					import org.yuzu.yuzu_emu.databinding.FragmentGameInfoBinding
 | 
				
			||||||
 | 
					import org.yuzu.yuzu_emu.model.GameVerificationResult
 | 
				
			||||||
import org.yuzu.yuzu_emu.model.HomeViewModel
 | 
					import org.yuzu.yuzu_emu.model.HomeViewModel
 | 
				
			||||||
import org.yuzu.yuzu_emu.utils.GameMetadata
 | 
					import org.yuzu.yuzu_emu.utils.GameMetadata
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -101,6 +103,38 @@ class GameInfoFragment : Fragment() {
 | 
				
			|||||||
                """.trimIndent()
 | 
					                """.trimIndent()
 | 
				
			||||||
                copyToClipboard(args.game.title, details)
 | 
					                copyToClipboard(args.game.title, details)
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            buttonVerifyIntegrity.setOnClickListener {
 | 
				
			||||||
 | 
					                ProgressDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                    requireActivity(),
 | 
				
			||||||
 | 
					                    R.string.verifying,
 | 
				
			||||||
 | 
					                    true
 | 
				
			||||||
 | 
					                ) { progressCallback, _ ->
 | 
				
			||||||
 | 
					                    val result = GameVerificationResult.from(
 | 
				
			||||||
 | 
					                        NativeLibrary.verifyGameContents(
 | 
				
			||||||
 | 
					                            args.game.path,
 | 
				
			||||||
 | 
					                            progressCallback
 | 
				
			||||||
 | 
					                        )
 | 
				
			||||||
 | 
					                    )
 | 
				
			||||||
 | 
					                    return@newInstance when (result) {
 | 
				
			||||||
 | 
					                        GameVerificationResult.Success ->
 | 
				
			||||||
 | 
					                            MessageDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                                titleId = R.string.verify_success,
 | 
				
			||||||
 | 
					                                descriptionId = R.string.operation_completed_successfully
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        GameVerificationResult.Failed ->
 | 
				
			||||||
 | 
					                            MessageDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                                titleId = R.string.verify_failure,
 | 
				
			||||||
 | 
					                                descriptionId = R.string.verify_failure_description
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                        GameVerificationResult.NotImplemented ->
 | 
				
			||||||
 | 
					                            MessageDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                                titleId = R.string.verify_no_result,
 | 
				
			||||||
 | 
					                                descriptionId = R.string.verify_no_result_description
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                }.show(parentFragmentManager, ProgressDialogFragment.TAG)
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        setInsets()
 | 
					        setInsets()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,6 +32,7 @@ import org.yuzu.yuzu_emu.BuildConfig
 | 
				
			|||||||
import org.yuzu.yuzu_emu.HomeNavigationDirections
 | 
					import org.yuzu.yuzu_emu.HomeNavigationDirections
 | 
				
			||||||
import org.yuzu.yuzu_emu.NativeLibrary
 | 
					import org.yuzu.yuzu_emu.NativeLibrary
 | 
				
			||||||
import org.yuzu.yuzu_emu.R
 | 
					import org.yuzu.yuzu_emu.R
 | 
				
			||||||
 | 
					import org.yuzu.yuzu_emu.YuzuApplication
 | 
				
			||||||
import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 | 
					import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
 | 
				
			||||||
import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 | 
					import org.yuzu.yuzu_emu.databinding.FragmentHomeSettingsBinding
 | 
				
			||||||
import org.yuzu.yuzu_emu.features.DocumentProvider
 | 
					import org.yuzu.yuzu_emu.features.DocumentProvider
 | 
				
			||||||
@@ -140,6 +141,38 @@ class HomeSettingsFragment : Fragment() {
 | 
				
			|||||||
                    }
 | 
					                    }
 | 
				
			||||||
                )
 | 
					                )
 | 
				
			||||||
            )
 | 
					            )
 | 
				
			||||||
 | 
					            add(
 | 
				
			||||||
 | 
					                HomeSetting(
 | 
				
			||||||
 | 
					                    R.string.verify_installed_content,
 | 
				
			||||||
 | 
					                    R.string.verify_installed_content_description,
 | 
				
			||||||
 | 
					                    R.drawable.ic_check_circle,
 | 
				
			||||||
 | 
					                    {
 | 
				
			||||||
 | 
					                        ProgressDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                            requireActivity(),
 | 
				
			||||||
 | 
					                            titleId = R.string.verifying,
 | 
				
			||||||
 | 
					                            cancellable = true
 | 
				
			||||||
 | 
					                        ) { progressCallback, _ ->
 | 
				
			||||||
 | 
					                            val result = NativeLibrary.verifyInstalledContents(progressCallback)
 | 
				
			||||||
 | 
					                            return@newInstance if (result.isEmpty()) {
 | 
				
			||||||
 | 
					                                MessageDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                                    titleId = R.string.verify_success,
 | 
				
			||||||
 | 
					                                    descriptionId = R.string.operation_completed_successfully
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            } else {
 | 
				
			||||||
 | 
					                                val failedNames = result.joinToString("\n")
 | 
				
			||||||
 | 
					                                val errorMessage = YuzuApplication.appContext.getString(
 | 
				
			||||||
 | 
					                                    R.string.verification_failed_for,
 | 
				
			||||||
 | 
					                                    failedNames
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                                MessageDialogFragment.newInstance(
 | 
				
			||||||
 | 
					                                    titleId = R.string.verify_failure,
 | 
				
			||||||
 | 
					                                    descriptionString = errorMessage
 | 
				
			||||||
 | 
					                                )
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                )
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
            add(
 | 
					            add(
 | 
				
			||||||
                HomeSetting(
 | 
					                HomeSetting(
 | 
				
			||||||
                    R.string.share_log,
 | 
					                    R.string.share_log,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,7 +69,7 @@ class MessageDialogFragment : DialogFragment() {
 | 
				
			|||||||
        private const val HELP_LINK = "Link"
 | 
					        private const val HELP_LINK = "Link"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        fun newInstance(
 | 
					        fun newInstance(
 | 
				
			||||||
            activity: FragmentActivity,
 | 
					            activity: FragmentActivity? = null,
 | 
				
			||||||
            titleId: Int = 0,
 | 
					            titleId: Int = 0,
 | 
				
			||||||
            titleString: String = "",
 | 
					            titleString: String = "",
 | 
				
			||||||
            descriptionId: Int = 0,
 | 
					            descriptionId: Int = 0,
 | 
				
			||||||
@@ -86,10 +86,12 @@ class MessageDialogFragment : DialogFragment() {
 | 
				
			|||||||
                putString(DESCRIPTION_STRING, descriptionString)
 | 
					                putString(DESCRIPTION_STRING, descriptionString)
 | 
				
			||||||
                putInt(HELP_LINK, helpLinkId)
 | 
					                putInt(HELP_LINK, helpLinkId)
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					            if (activity != null) {
 | 
				
			||||||
                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
 | 
					                ViewModelProvider(activity)[MessageDialogViewModel::class.java].apply {
 | 
				
			||||||
                    clear()
 | 
					                    clear()
 | 
				
			||||||
                    this.positiveAction = positiveAction
 | 
					                    this.positiveAction = positiveAction
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
            dialog.arguments = bundle
 | 
					            dialog.arguments = bundle
 | 
				
			||||||
            return dialog
 | 
					            return dialog
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,15 @@
 | 
				
			|||||||
 | 
					// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
 | 
				
			||||||
 | 
					// SPDX-License-Identifier: GPL-2.0-or-later
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					package org.yuzu.yuzu_emu.model
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					enum class GameVerificationResult(val int: Int) {
 | 
				
			||||||
 | 
					    Success(0),
 | 
				
			||||||
 | 
					    Failed(1),
 | 
				
			||||||
 | 
					    NotImplemented(2);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    companion object {
 | 
				
			||||||
 | 
					        fun from(int: Int): GameVerificationResult =
 | 
				
			||||||
 | 
					            entries.firstOrNull { it.int == int } ?: Success
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -829,6 +829,43 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj,
 | 
				
			|||||||
                              program_id, GetJString(env, jname));
 | 
					                              program_id, GetJString(env, jname));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj,
 | 
				
			||||||
 | 
					                                                                      jobject jcallback) {
 | 
				
			||||||
 | 
					    auto jlambdaClass = env->GetObjectClass(jcallback);
 | 
				
			||||||
 | 
					    auto jlambdaInvokeMethod = env->GetMethodID(
 | 
				
			||||||
 | 
					        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
 | 
				
			||||||
 | 
					    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
 | 
				
			||||||
 | 
					        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
 | 
				
			||||||
 | 
					                                                   ToJDouble(env, max), ToJDouble(env, progress));
 | 
				
			||||||
 | 
					        return GetJBoolean(env, jwasCancelled);
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    auto& session = EmulationSession::GetInstance();
 | 
				
			||||||
 | 
					    std::vector<std::string> result = ContentManager::VerifyInstalledContents(
 | 
				
			||||||
 | 
					        &session.System(), session.GetContentProvider(), callback);
 | 
				
			||||||
 | 
					    jobjectArray jresult =
 | 
				
			||||||
 | 
					        env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, ""));
 | 
				
			||||||
 | 
					    for (size_t i = 0; i < result.size(); ++i) {
 | 
				
			||||||
 | 
					        env->SetObjectArrayElement(jresult, i, ToJString(env, result[i]));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    return jresult;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobject jobj,
 | 
				
			||||||
 | 
					                                                              jstring jpath, jobject jcallback) {
 | 
				
			||||||
 | 
					    auto jlambdaClass = env->GetObjectClass(jcallback);
 | 
				
			||||||
 | 
					    auto jlambdaInvokeMethod = env->GetMethodID(
 | 
				
			||||||
 | 
					        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
 | 
				
			||||||
 | 
					    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
 | 
				
			||||||
 | 
					        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
 | 
				
			||||||
 | 
					                                                   ToJDouble(env, max), ToJDouble(env, progress));
 | 
				
			||||||
 | 
					        return GetJBoolean(env, jwasCancelled);
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					    auto& session = EmulationSession::GetInstance();
 | 
				
			||||||
 | 
					    return static_cast<jint>(
 | 
				
			||||||
 | 
					        ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
 | 
					jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
 | 
				
			||||||
                                                          jstring jprogramId) {
 | 
					                                                          jstring jprogramId) {
 | 
				
			||||||
    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
 | 
					    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -118,6 +118,14 @@
 | 
				
			|||||||
                android:layout_marginTop="16dp"
 | 
					                android:layout_marginTop="16dp"
 | 
				
			||||||
                android:text="@string/copy_details" />
 | 
					                android:text="@string/copy_details" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            <com.google.android.material.button.MaterialButton
 | 
				
			||||||
 | 
					                android:id="@+id/button_verify_integrity"
 | 
				
			||||||
 | 
					                style="@style/Widget.Material3.Button"
 | 
				
			||||||
 | 
					                android:layout_width="wrap_content"
 | 
				
			||||||
 | 
					                android:layout_height="wrap_content"
 | 
				
			||||||
 | 
					                android:layout_marginTop="10dp"
 | 
				
			||||||
 | 
					                android:text="@string/verify_integrity" />
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        </LinearLayout>
 | 
					        </LinearLayout>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    </androidx.core.widget.NestedScrollView>
 | 
					    </androidx.core.widget.NestedScrollView>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -142,6 +142,8 @@
 | 
				
			|||||||
        <item quantity="other">Successfully imported %d saves</item>
 | 
					        <item quantity="other">Successfully imported %d saves</item>
 | 
				
			||||||
    </plurals>
 | 
					    </plurals>
 | 
				
			||||||
    <string name="no_save_data_found">No save data found</string>
 | 
					    <string name="no_save_data_found">No save data found</string>
 | 
				
			||||||
 | 
					    <string name="verify_installed_content">Verify installed content</string>
 | 
				
			||||||
 | 
					    <string name="verify_installed_content_description">Checks all installed content for corruption</string>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- Applet launcher strings -->
 | 
					    <!-- Applet launcher strings -->
 | 
				
			||||||
    <string name="applets">Applet launcher</string>
 | 
					    <string name="applets">Applet launcher</string>
 | 
				
			||||||
@@ -288,6 +290,7 @@
 | 
				
			|||||||
    <string name="import_complete">Import complete</string>
 | 
					    <string name="import_complete">Import complete</string>
 | 
				
			||||||
    <string name="more_options">More options</string>
 | 
					    <string name="more_options">More options</string>
 | 
				
			||||||
    <string name="use_global_setting">Use global setting</string>
 | 
					    <string name="use_global_setting">Use global setting</string>
 | 
				
			||||||
 | 
					    <string name="operation_completed_successfully">The operation completed successfully</string>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- GPU driver installation -->
 | 
					    <!-- GPU driver installation -->
 | 
				
			||||||
    <string name="select_gpu_driver">Select GPU driver</string>
 | 
					    <string name="select_gpu_driver">Select GPU driver</string>
 | 
				
			||||||
@@ -352,6 +355,14 @@
 | 
				
			|||||||
    <string name="content_install_notice_description">The content that you selected does not match this game.\nInstall anyway?</string>
 | 
					    <string name="content_install_notice_description">The content that you selected does not match this game.\nInstall anyway?</string>
 | 
				
			||||||
    <string name="confirm_uninstall">Confirm uninstall</string>
 | 
					    <string name="confirm_uninstall">Confirm uninstall</string>
 | 
				
			||||||
    <string name="confirm_uninstall_description">Are you sure you want to uninstall this addon?</string>
 | 
					    <string name="confirm_uninstall_description">Are you sure you want to uninstall this addon?</string>
 | 
				
			||||||
 | 
					    <string name="verify_integrity">Verify integrity</string>
 | 
				
			||||||
 | 
					    <string name="verifying">Verifying…</string>
 | 
				
			||||||
 | 
					    <string name="verify_success">Integrity verification succeeded!</string>
 | 
				
			||||||
 | 
					    <string name="verify_failure">Integrity verification failed!</string>
 | 
				
			||||||
 | 
					    <string name="verify_failure_description">File contents may be corrupt</string>
 | 
				
			||||||
 | 
					    <string name="verify_no_result">Integrity verification couldn\'t be performed</string>
 | 
				
			||||||
 | 
					    <string name="verify_no_result_description">File contents were not checked for validity</string>
 | 
				
			||||||
 | 
					    <string name="verification_failed_for">Verification failed for the following files:\n%1$s</string>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <!-- ROM loading errors -->
 | 
					    <!-- ROM loading errors -->
 | 
				
			||||||
    <string name="loader_error_encrypted">Your ROM is encrypted</string>
 | 
					    <string name="loader_error_encrypted">Your ROM is encrypted</string>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user