From 081db5a58bdfc421230b79d15cad4debb0850ac2 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 12 Nov 2019 18:43:32 +0100
Subject: [PATCH] Settings: remove default setting for default activity.

---
 .../settings/ActivityTypePreference.java          | 15 +++++++--------
 .../opentracks/util/PreferencesUtils.java         |  5 +----
 src/main/res/values/settings.xml                  |  4 +++-
 src/main/res/xml/settings.xml                     |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
index 94bdbd62f..918d9972c 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/ActivityTypePreference.java
@@ -43,14 +43,6 @@ import de.dennisguse.opentracks.util.TrackIconUtils;
  */
 public class ActivityTypePreference extends DialogPreference {
 
-    private SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
-        @Override
-        public CharSequence provideSummary(DialogPreference preference) {
-            String defaultActivity = PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
-            return defaultActivity != null && !defaultActivity.equals(PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT) ? defaultActivity : getContext().getString(R.string.value_unknown);
-        }
-    };
-
     public ActivityTypePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setDialogLayoutResource(R.layout.preference_activity_type);
@@ -58,6 +50,13 @@ public class ActivityTypePreference extends DialogPreference {
         setNegativeButtonText(android.R.string.cancel);
         setDialogIcon(null);
         setPersistent(true);
+
+        SummaryProvider<DialogPreference> summaryProvider = new SummaryProvider<DialogPreference>() {
+            @Override
+            public CharSequence provideSummary(DialogPreference preference) {
+                return PreferencesUtils.getDefaultActivity(ActivityTypePreference.this.getContext());
+            }
+        };
         setSummaryProvider(summaryProvider);
     }
 
diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
index b75098329..018ab82a2 100644
--- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
@@ -99,11 +99,8 @@ public class PreferencesUtils {
         PreferencesUtils.setInt(context, R.string.auto_resume_track_current_retry_key, getAutoResumeTrackCurrentRetryDefault(context) + 1);
     }
 
-
-    public static final String DEFAULT_ACTIVITY_DEFAULT = "";
-
     public static String getDefaultActivity(Context context) {
-        return PreferencesUtils.getString(context, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
+        return PreferencesUtils.getString(context, R.string.default_activity_key, context.getString(R.string.default_activity_default));
     }
 
     public static void setDefaultActivity(Context context, String newDefaultActivity) {
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 10b4025a4..166f15506 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -32,7 +32,10 @@
     <string name="sensor_type_value_none" translatable="false">NONE</string>
 
     <string name="default_activity_key" translatable="false">defaultActivity</string>
+    <string name="default_activity_default" translatable="false">@string/activity_type_unknown</string>
     <string-array name="activity_types">
+        <item>@string/default_activity_default</item>
+
         <item>@string/activity_type_airplane</item>
         <item>@string/activity_type_atv</item>
         <item>@string/activity_type_biking</item>
@@ -94,7 +97,6 @@
         <item>@string/activity_type_trail_running</item>
         <item>@string/activity_type_train</item>
         <item>@string/activity_type_ultimate_frisbee</item>
-        <item>@string/activity_type_unknown</item>
         <item>@string/activity_type_wakeboarding</item>
         <item>@string/activity_type_walking</item>
         <item>@string/activity_type_water_skiing</item>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 972727ba2..c9a713591 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -124,7 +124,7 @@ limitations under the License.
             android:title="@string/settings_recording_auto_resume_track_timeout_title"
             app:useSimpleSummaryProvider="true" />
         <de.dennisguse.opentracks.settings.ActivityTypePreference
-            android:defaultValue="@string/activity_type_running"
+            android:defaultValue="@string/"
             android:key="@string/default_activity_key"
             android:title="@string/settings_recording_default_activity_title" />
     </PreferenceCategory>