Revert "Temporarily disable OSM multithreading for testing purposes"

This reverts commit da08dfe.
mliebl · Aug 13, 2023 · 61a8d37 · 61a8d37
1 parent aa902e4
commit 61a8d37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/main/src/main/java/cgeo/geocaching/settings/Settings.java b/main/src/main/java/cgeo/geocaching/settings/Settings.java
@@ -1014,9 +1014,7 @@ public static boolean hasOSMMultiThreading() {
     }
 
     public static int getMapOsmThreads() {
-        // @todo temporarily disabled, see https://github.com/orgs/cgeo/discussions/73
-        return 1;
-        // return hasOSMMultiThreading() ? Math.max(1, getInt(R.string.pref_map_osm_threads, Math.min(Runtime.getRuntime().availableProcessors() + 1, 4))) : 1;
+        return hasOSMMultiThreading() ? Math.max(1, getInt(R.string.pref_map_osm_threads, Math.min(Runtime.getRuntime().availableProcessors() + 1, 4))) : 1;
     }
 
     public static int getCompactIconMode() {

diff --git a/main/src/main/res/xml/preferences_map_sources.xml b/main/src/main/res/xml/preferences_map_sources.xml
@@ -133,12 +133,8 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="@string/pref_map_osm_multithreaded"
-
-            android:summary="(temporarily disabled for testing purposes)"
-            android:enabled="false"
-
+            android:summary="@string/init_summary_map_osm_multithreaded"
             android:title="@string/init_map_osm_multithreaded"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
-    <!-- android:summary="@string/init_summary_map_osm_multithreaded" -->
 </PreferenceScreen>