diff options
| author | Christian S <christian@pix-art.de> | 2016-01-15 18:19:00 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-15 18:19:00 +0100 |
| commit | 188e0a118cd0d9d0e009f4b0b062165f60f1a3da (patch) | |
| tree | 20ff0057054200eda1d7ce746a3b634fb873a576 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | 35a991844ad0275984bd21f82eae8056e406d923 (diff) | |
| parent | 635210d278ed3abc61e86978446c1f2f3706f2e4 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 4e57d7f81..1237b1db1 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1408,7 +1408,7 @@ public class ConversationActivity extends XmppActivity } private void openBatteryOptimizationDialogIfNeeded() { - if (showBatteryOptimizationWarning() && getPreferences().getBoolean("show_battery_optimizationF", true)) { + if (showBatteryOptimizationWarning() && getPreferences().getBoolean("show_battery_optimization", true)) { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.battery_optimizations_enabled); builder.setMessage(R.string.battery_optimizations_enabled_dialog); |