Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

harmonize UserPreferences.java 

This was possibly due to some changes not entirely validated on a merge conflict.
This commit is contained in:
domingos86 2016-04-17 18:28:15 -04:00 committed by Domingos Lopes
parent b3fbc5258e
commit 78b2ceab57
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
View File

@ -494,16 +494,16 @@ public class UserPreferences {
public static void setVolume(int leftVolume, int rightVolume) { public static void setVolume(int leftVolume, int rightVolume) {
assert(0 <= leftVolume && leftVolume <= 100); assert(0 <= leftVolume && leftVolume <= 100);
assert (0 <= rightVolume && rightVolume <= 100); assert(0 <= rightVolume && rightVolume <= 100);
prefs.edit() prefs.edit()
.putInt(PREF_LEFT_VOLUME, leftVolume) .putInt(PREF_LEFT_VOLUME, leftVolume)
.putInt(PREF_RIGHT_VOLUME, rightVolume) .putInt(PREF_RIGHT_VOLUME, rightVolume)
.apply(); .apply();
} }
public static void setAutodownloadSelectedNetworks(String[] value) { public static void setAutodownloadSelectedNetworks(String[] value) {
prefs.edit() prefs.edit()
.putString(PREF_AUTODL_SELECTED_NETWORKS, TextUtils.join(",", value)) .putString(PREF_AUTODL_SELECTED_NETWORKS, TextUtils.join(",", value))
.apply(); .apply();
} }
@ -541,7 +541,7 @@ public class UserPreferences {
throw new IllegalArgumentException("Flattr threshold must be in range [0.0, 1.0]"); throw new IllegalArgumentException("Flattr threshold must be in range [0.0, 1.0]");
} }
prefs.edit() prefs.edit()
.putBoolean(PREF_AUTO_FLATTR, enabled) .putBoolean(PREF_AUTO_FLATTR, enabled)
.putFloat(PREF_AUTO_FLATTR_PLAYED_DURATION_THRESHOLD, autoFlattrThreshold) .putFloat(PREF_AUTO_FLATTR_PLAYED_DURATION_THRESHOLD, autoFlattrThreshold)
.apply(); .apply();
} }