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

Android: Stop using custom path for GameFileCache
dolphin-emu · Jun 13, 2021 · 90a994f · 90a994f
2 parents 4e3e3bf + d304d75
commit 90a994f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java
@@ -17,12 +17,12 @@
   @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();

diff --git a/...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheService.java b/...ce/Android/app/src/main/java/org/dolphinemu/dolphinemu/services/GameFileCacheService.java
@@ -172,7 +172,7 @@ protected void onHandleIntent(Intent intent)
     // 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;

diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp
@@ -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,

diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp
@@ -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)

diff --git a/Source/Core/UICommon/GameFileCache.h b/Source/Core/UICommon/GameFileCache.h
@@ -31,8 +31,7 @@ class GameFileCache
     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;