sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed unecessary code in time preference

This commit is contained in:
Daniel Gultsch 2018-11-22 10:07:10 +01:00
parent 61ac804f93
commit 66850a525a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/ui/TimePreference.java
View File

@ -48,8 +48,8 @@ public class TimePreference extends DialogPreference implements Preference.OnPre
super.onBindDialogView(v); super.onBindDialogView(v);
long time = getPersistedLong(DEFAULT_VALUE); long time = getPersistedLong(DEFAULT_VALUE);
picker.setCurrentHour((int) (time / 60)); picker.setCurrentHour((int) ((time % (24 * 60)) / 60));
picker.setCurrentMinute((int) (time % 60)); picker.setCurrentMinute((int) ((time % (24 * 60)) % 60));
} }
@Override @Override
@ -80,12 +80,8 @@ public class TimePreference extends DialogPreference implements Preference.OnPre
@Override @Override
protected void onSetInitialValue(final boolean restorePersistedValue, final Object defaultValue) { protected void onSetInitialValue(final boolean restorePersistedValue, final Object defaultValue) {
long time; long time;
if (defaultValue == null) { if (defaultValue instanceof Long) {
time = restorePersistedValue ? getPersistedLong(DEFAULT_VALUE) : DEFAULT_VALUE;
} else if (defaultValue instanceof Long) {
time = restorePersistedValue ? getPersistedLong((Long) defaultValue) : (Long) defaultValue; time = restorePersistedValue ? getPersistedLong((Long) defaultValue) : (Long) defaultValue;
} else if (defaultValue instanceof Calendar) {
time = restorePersistedValue ? getPersistedLong(((Calendar)defaultValue).getTimeInMillis()) : ((Calendar)defaultValue).getTimeInMillis();
} else { } else {
time = restorePersistedValue ? getPersistedLong(DEFAULT_VALUE) : DEFAULT_VALUE; time = restorePersistedValue ? getPersistedLong(DEFAULT_VALUE) : DEFAULT_VALUE;
} }