piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9802 from JosJuice/android-game-file-cache-path

Browse Source 
Android: Stop using custom path for GameFileCache
This commit is contained in:
Léo Lam 2021-06-13 12:53:49 +02:00 committed by GitHub
commit 90a994f937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java
View File

@ -17,12 +17,12 @@ public class GameFileCache
@Keep
private long mPointer;
public GameFileCache(String path)
public GameFileCache()
{
mPointer = newGameFileCache(path);
mPointer = newGameFileCache();
}
private static native long newGameFileCache(String path);
private static native long newGameFileCache();
@Override
public native void finalize();

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheService.java
View File

@ -172,7 +172,7 @@ public final class GameFileCacheService extends IntentService
// Load the game list cache if it isn't already loaded, otherwise do nothing
if (ACTION_LOAD.equals(intent.getAction()) && gameFileCache == null)
{
GameFileCache temp = new GameFileCache(getCacheDir() + File.separator + "gamelist.cache");
GameFileCache temp = new GameFileCache();
synchronized (temp)
{
gameFileCache = temp;

6
Source/Android/jni/GameList/GameFileCache.cpp
View File

@ -27,10 +27,10 @@ static UICommon::GameFileCache* GetPointer(JNIEnv* env, jobject obj)
extern "C" {
#endif
JNIEXPORT jlong JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_newGameFileCache(
JNIEnv* env, jclass, jstring path)
JNIEXPORT jlong JNICALL
Java_org_dolphinemu_dolphinemu_model_GameFileCache_newGameFileCache(JNIEnv* env, jclass)
{
return reinterpret_cast<jlong>(new UICommon::GameFileCache(GetJString(env, path)));
return reinterpret_cast<jlong>(new UICommon::GameFileCache());
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_finalize(JNIEnv* env,

4
Source/Core/UICommon/GameFileCache.cpp
View File

@ -43,10 +43,6 @@ GameFileCache::GameFileCache() : m_path(File::GetUserPath(D_CACHE_IDX) + "gameli
{
}
GameFileCache::GameFileCache(std::string path) : m_path(std::move(path))
{
}
void GameFileCache::ForEach(std::function<void(const std::shared_ptr<const GameFile>&)> f) const
{
for (const std::shared_ptr<const GameFile>& item : m_cached_files)

3
Source/Core/UICommon/GameFileCache.h
View File

@ -31,8 +31,7 @@ public:
Yes = 1,
};
GameFileCache(); // Uses the default path
explicit GameFileCache(std::string path);
GameFileCache();
void ForEach(std::function<void(const std::shared_ptr<const GameFile>&)> f) const;