diff options
| author | 2024-01-24 12:34:50 -0500 | |
|---|---|---|
| committer | 2024-01-25 12:53:49 -0500 | |
| commit | 97ca160b08537314ca6ba953a382aebda3da06b9 (patch) | |
| tree | 53282078af75ecba5ad87c5bcd3ea1cdb14f0249 /src/android | |
| parent | frontend_common: Remove key rederivation and keep key check (diff) | |
| download | yuzu-97ca160b08537314ca6ba953a382aebda3da06b9.tar.gz yuzu-97ca160b08537314ca6ba953a382aebda3da06b9.tar.xz yuzu-97ca160b08537314ca6ba953a382aebda3da06b9.zip | |
frontend_common: Consistently use references
Was swapping between references and pointers for no reason. Just unify them here since each of these utility functions will need their parameters to be alive.
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/jni/native.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 963f57380..4c3644cc5 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp | |||
| @@ -463,8 +463,8 @@ int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject | |||
| 463 | }; | 463 | }; |
| 464 | 464 | ||
| 465 | return static_cast<int>( | 465 | return static_cast<int>( |
| 466 | ContentManager::InstallNSP(&EmulationSession::GetInstance().System(), | 466 | ContentManager::InstallNSP(EmulationSession::GetInstance().System(), |
| 467 | EmulationSession::GetInstance().System().GetFilesystem().get(), | 467 | *EmulationSession::GetInstance().System().GetFilesystem(), |
| 468 | GetJString(env, j_file), callback)); | 468 | GetJString(env, j_file), callback)); |
| 469 | } | 469 | } |
| 470 | 470 | ||
| @@ -819,7 +819,7 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject job | |||
| 819 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, | 819 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, |
| 820 | jstring jprogramId) { | 820 | jstring jprogramId) { |
| 821 | auto program_id = EmulationSession::GetProgramId(env, jprogramId); | 821 | auto program_id = EmulationSession::GetProgramId(env, jprogramId); |
| 822 | ContentManager::RemoveAllDLC(&EmulationSession::GetInstance().System(), program_id); | 822 | ContentManager::RemoveAllDLC(EmulationSession::GetInstance().System(), program_id); |
| 823 | } | 823 | } |
| 824 | 824 | ||
| 825 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId, | 825 | void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId, |
| @@ -829,8 +829,9 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, | |||
| 829 | program_id, GetJString(env, jname)); | 829 | program_id, GetJString(env, jname)); |
| 830 | } | 830 | } |
| 831 | 831 | ||
| 832 | jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, jobject jobj, | 832 | jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* env, |
| 833 | jobject jcallback) { | 833 | jobject jobj, |
| 834 | jobject jcallback) { | ||
| 834 | auto jlambdaClass = env->GetObjectClass(jcallback); | 835 | auto jlambdaClass = env->GetObjectClass(jcallback); |
| 835 | auto jlambdaInvokeMethod = env->GetMethodID( | 836 | auto jlambdaInvokeMethod = env->GetMethodID( |
| 836 | jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); | 837 | jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); |
| @@ -842,7 +843,7 @@ jobject Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyInstalledContents(JNIEnv* en | |||
| 842 | 843 | ||
| 843 | auto& session = EmulationSession::GetInstance(); | 844 | auto& session = EmulationSession::GetInstance(); |
| 844 | std::vector<std::string> result = ContentManager::VerifyInstalledContents( | 845 | std::vector<std::string> result = ContentManager::VerifyInstalledContents( |
| 845 | &session.System(), session.GetContentProvider(), callback); | 846 | session.System(), *session.GetContentProvider(), callback); |
| 846 | jobjectArray jresult = | 847 | jobjectArray jresult = |
| 847 | env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, "")); | 848 | env->NewObjectArray(result.size(), IDCache::GetStringClass(), ToJString(env, "")); |
| 848 | for (size_t i = 0; i < result.size(); ++i) { | 849 | for (size_t i = 0; i < result.size(); ++i) { |
| @@ -863,7 +864,7 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_verifyGameContents(JNIEnv* env, jobje | |||
| 863 | }; | 864 | }; |
| 864 | auto& session = EmulationSession::GetInstance(); | 865 | auto& session = EmulationSession::GetInstance(); |
| 865 | return static_cast<jint>( | 866 | return static_cast<jint>( |
| 866 | ContentManager::VerifyGameContents(&session.System(), GetJString(env, jpath), callback)); | 867 | ContentManager::VerifyGameContents(session.System(), GetJString(env, jpath), callback)); |
| 867 | } | 868 | } |
| 868 | 869 | ||
| 869 | jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj, | 870 | jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj, |