Merge 165852023c into 0fdf1cc386

Android: Remove unused BiMap class

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/BiMap.java

@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class BiMap<K, V>
-{
-
-  private Map<K, V> forward = new HashMap<>();
-  private Map<V, K> backward = new HashMap<>();
-
-  public synchronized void add(K key, V value)
-  {
-    forward.put(key, value);
-    backward.put(value, key);
-  }
-
-  public synchronized V getForward(K key)
-  {
-    return forward.get(key);
-  }
-
-  public synchronized K getBackward(V key)
-  {
-    return backward.get(key);
-  }
-}

Source/Core/Core/AchievementManager.h

@@ -309,22 +309,14 @@ private:
 #include <string>
 
 #include "Common/CommonTypes.h"
-
-namespace ActionReplay
-{
-struct ARCode;
-}
+#include "Core/ActionReplay.h"
+#include "Core/GeckoCode.h"
 
 namespace DiscIO
 {
 class Volume;
 }
 
-namespace Gecko
-{
-class GeckoCode;
-}
-
 class AchievementManager
 {
 public:
@@ -339,13 +331,13 @@ public:
   constexpr bool ShouldGeckoCodeBeActivated(const Gecko::GeckoCode& code,
                                             const std::string& game_id, u16 revision)
   {
-    return true;
+    return code.enabled;
   }
 
   constexpr bool ShouldARCodeBeActivated(const ActionReplay::ARCode& code,
                                          const std::string& game_id, u16 revision)
   {
-    return true;
+    return code.enabled;
   }
 
   constexpr void LoadGame(const DiscIO::Volume*) {}

Source/Core/Core/DolphinAnalytics.cpp

@@ -57,10 +57,19 @@ void DolphinAnalytics::AndroidSetGetValFunc(std::function<std::string(std::strin
 
 DolphinAnalytics::DolphinAnalytics()
 {
+  m_last_analytics_enabled = Config::Get(Config::MAIN_ANALYTICS_ENABLED);
+
   ReloadConfig();
   MakeBaseBuilder();
 
-  m_config_changed_callback_id = Config::AddConfigChangedCallback([this] { ReloadConfig(); });
+  m_config_changed_callback_id = Config::AddConfigChangedCallback([this] {
+    bool current_analytics_enabled = Config::Get(Config::MAIN_ANALYTICS_ENABLED);
+    if (m_last_analytics_enabled != current_analytics_enabled)
+    {
+      m_last_analytics_enabled = current_analytics_enabled;
+      ReloadConfig();
+    }
+  });
 }
 
 DolphinAnalytics::~DolphinAnalytics()
@@ -80,7 +89,7 @@ void DolphinAnalytics::ReloadConfig()
 
   // Install the HTTP backend if analytics support is enabled.
   std::unique_ptr<Common::AnalyticsReportingBackend> new_backend;
-  if (Config::Get(Config::MAIN_ANALYTICS_ENABLED))
+  if (m_last_analytics_enabled)
   {
     new_backend = std::make_unique<Common::HttpAnalyticsBackend>(ANALYTICS_ENDPOINT);
   }

Source/Core/Core/DolphinAnalytics.h

@@ -203,4 +203,5 @@ private:
   std::mutex m_reporter_mutex;
   Common::AnalyticsReporter m_reporter;
   Config::ConfigChangedCallbackID m_config_changed_callback_id{};
+  bool m_last_analytics_enabled = false;
 };