forked from upstream-mirrors/OpenTracks
Fix startup sequence to set the preferred unit if not set
This commit is contained in:
@@ -659,12 +659,12 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
|
|||||||
.show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG);
|
.show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!EulaUtils.hasDefaultUnits(this)) {
|
// If stats_units_key is undefined, set it
|
||||||
|
if (PreferencesUtils.getString(this, R.string.stats_units_key, "").equals("")) {
|
||||||
String statsUnits = getString(
|
String statsUnits = getString(
|
||||||
Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial
|
Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial
|
||||||
: R.string.stats_units_metric);
|
: R.string.stats_units_metric);
|
||||||
PreferencesUtils.setString(this, R.string.stats_units_key, statsUnits);
|
PreferencesUtils.setString(this, R.string.stats_units_key, statsUnits);
|
||||||
EulaUtils.setDefaultUnits(this);
|
|
||||||
}
|
}
|
||||||
checkGooglePlayServices();
|
checkGooglePlayServices();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public class EulaUtils {
|
|||||||
|
|
||||||
// Accepting Google mobile terms of service
|
// Accepting Google mobile terms of service
|
||||||
private static final String ACCEPT_EULA_PREFERENCE_KEY = "eula.google_mobile_tos_accepted";
|
private static final String ACCEPT_EULA_PREFERENCE_KEY = "eula.google_mobile_tos_accepted";
|
||||||
private static final String DEFAULT_UNITS_PREFERENCE_KEY = "defaultUnits";
|
|
||||||
private static final String SHOW_ENABLE_SYNC_PREFERENCE_KEY = "showEnableSync";
|
private static final String SHOW_ENABLE_SYNC_PREFERENCE_KEY = "showEnableSync";
|
||||||
|
|
||||||
private EulaUtils() {}
|
private EulaUtils() {}
|
||||||
@@ -53,24 +52,6 @@ public class EulaUtils {
|
|||||||
setValue(context, ACCEPT_EULA_PREFERENCE_KEY, true);
|
setValue(context, ACCEPT_EULA_PREFERENCE_KEY, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the default units is initialized.
|
|
||||||
*
|
|
||||||
* @param context the context
|
|
||||||
*/
|
|
||||||
public static boolean hasDefaultUnits(Context context) {
|
|
||||||
return getValue(context, DEFAULT_UNITS_PREFERENCE_KEY, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets to true that the default units is initialized.
|
|
||||||
*
|
|
||||||
* @param context the context
|
|
||||||
*/
|
|
||||||
public static void setDefaultUnits(Context context) {
|
|
||||||
setValue(context, DEFAULT_UNITS_PREFERENCE_KEY, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns true if show enable sync is needed.
|
* Returns true if show enable sync is needed.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user