karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fix comment b287683b8500

Browse Source
This commit is contained in:
Jimmy Shih
2012-01-09 15:54:19 -08:00
parent 362dcda90c
commit 4b33e94707
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/keys.xml
+2 -2
View File
@@ -36,7 +36,6 @@ limitations under the License.
<string name="send_to_fusion_tables_key">sendToFusionTables</string>
<string name="send_to_maps_key">sendToMaps</string>
<string name="sensor_type_key">sensorType</string>
<string name="settings_recording_track_name_key">settingsRecordingTrackName</string>
<string name="share_url_only_key">shareUrlOnly</string>
<string name="split_frequency_key">splitFrequency</string>
<string name="track_color_mode_dynamic_speed_variation_key">trackColorModeDynamicVariation
@@ -48,7 +47,8 @@ limitations under the License.
</string>
<string name="track_color_mode_fixed_speed_slow_key">trackColorModeFixedSlow</string>
<string name="track_color_mode_key">trackColorMode</string>
<string name="track_name_key">trackName</string>
<!-- Preference keys which keep transient state (not user preferences). Sorted alphabetically.
- DO NOT TRANSLATE -->
<string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
MyTracks/res/xml/preferences.xml
+1 -1
View File
@@ -137,7 +137,7 @@ limitations under the License.
android:entryValues="@array/recording_auto_resume_timeout_values"
android:defaultValue="10" />
<ListPreference android:key="@string/settings_recording_track_name_key"
<ListPreference android:key="@string/track_name_key"
android:title="@string/settings_recording_track_name"
android:summary="@string/settings_recording_track_name_summary"
android:entries="@array/settings_recording_track_name_options"
MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
+13 -6
View File
@@ -47,11 +47,7 @@ public class DefaultTrackNameFactory {
* @param startTime the track start time
*/
public String getDefaultTrackName(long trackId, long startTime) {
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
String trackNameSetting = sharedPreferences.getString(
context.getString(R.string.settings_recording_track_name_key),
context.getString(R.string.settings_recording_track_name_date_local_value));
String trackNameSetting = getTrackNameSetting();
if (trackNameSetting.equals(
context.getString(R.string.settings_recording_track_name_date_local_value))) {
@@ -61,10 +57,21 @@ public class DefaultTrackNameFactory {
SimpleDateFormat dateFormat = new SimpleDateFormat(ISO_8601_FORMAT);
return dateFormat.format(startTime);
} else {
// trackNameSetting equals
// R.string.settings_recording_track_name_number_value
return String.format(context.getString(R.string.track_name_format), trackId);
}
}
/**
* Gets the track name setting.
*/
@VisibleForTesting
String getTrackNameSetting() {
SharedPreferences sharedPreferences = context.getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
return sharedPreferences.getString(
context.getString(R.string.settings_recording_track_name_key),
context.getString(R.string.settings_recording_track_name_date_local_value));
}
}
MyTracksTest/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactoryTest.java
+18 -23
View File
@@ -15,12 +15,9 @@
*/
package com.google.android.apps.mytracks.services;
import com.google.android.apps.mytracks.Constants;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.content.SharedPreferences;
import android.test.AndroidTestCase;
import java.text.SimpleDateFormat;
@@ -37,20 +34,23 @@ public class DefaultTrackNameFactoryTest extends AndroidTestCase {
private static final long START_TIME = 1288213406000L;
public void testDefaultTrackName_date_local() {
String value = getContext().getString(R.string.settings_recording_track_name_date_local_value);
setTrackNameSeting(value);
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext());
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
@Override
String getTrackNameSetting() {
return getContext().getString(R.string.settings_recording_track_name_date_local_value);
}
};
assertEquals(StringUtils.formatDateTime(getContext(), START_TIME),
defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
}
public void testDefaultTrackName_date_iso_8601() {
String value = getContext().getString(
R.string.settings_recording_track_name_date_iso_8601_value);
setTrackNameSeting(value);
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext());
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
@Override
String getTrackNameSetting() {
return getContext().getString(R.string.settings_recording_track_name_date_iso_8601_value);
}
};
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(
DefaultTrackNameFactory.ISO_8601_FORMAT);
assertEquals(simpleDateFormat.format(new Date(START_TIME)),
@@ -58,18 +58,13 @@ public class DefaultTrackNameFactoryTest extends AndroidTestCase {
}
public void testDefaultTrackName_number() {
String value = getContext().getString(R.string.settings_recording_track_name_number_value);
setTrackNameSeting(value);
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext());
DefaultTrackNameFactory defaultTrackNameFactory = new DefaultTrackNameFactory(getContext()) {
@Override
String getTrackNameSetting() {
return getContext().getString(R.string.settings_recording_track_name_number_value);
}
};
assertEquals(
"Track " + TRACK_ID, defaultTrackNameFactory.getDefaultTrackName(TRACK_ID, START_TIME));
}
private void setTrackNameSeting(String value) {
SharedPreferences sharedPreferences = getContext().getSharedPreferences(
Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
String key = getContext().getString(R.string.settings_recording_track_name_key);
sharedPreferences.edit().putString(key, value).apply();
}
}