diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:51:27 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:51:27 +0100 |
| commit | 07b07115d684b27ebc0c3ee4f70ef2e33a3b2dbb (patch) | |
| tree | 3b19be17a403cfbb2a695e50da9a1b277376ac45 /src/main/java/eu/siacs/conversations/ui | |
| parent | 5b9c690c47cbb6fd352d7ddce3b13e6bf119fc22 (diff) | |
| parent | bdc86bb8e3667acb4d3f59ece718dc763d59374f (diff) | |
Merge branch 'feature/foreground_service' into development
Conflicts:
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index aba60175..b6f3a077 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -70,6 +70,8 @@ public class SettingsActivity extends XmppActivity implements } } } + } else if (name.equals("keep_foreground_service")) { + xmppConnectionService.toggleForegroundService(); } } |