Disable auto-away status while on "do not disturb". Fixes #18.

17f2672a · Alexander Ivanov · a5f9fea0 · 17f2672a
Commit 17f2672a authored Feb 05, 2013 by Alexander Ivanov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

AccountItem.java src/com/xabber/android/data/account/AccountItem.java +6 -4

No files found.
--- a/src/com/xabber/android/data/account/AccountItem.java
+++ b/src/com/xabber/android/data/account/AccountItem.java
@@ -284,10 +284,12 @@ public class AccountItem extends ConnectionItem {
 			return new Presence(Type.unavailable);
 		else {
 			int priority;
-			if (AccountManager.getInstance().isXa())
-				statusMode = StatusMode.xa;
-			else if (AccountManager.getInstance().isAway())
-				statusMode = StatusMode.away;
+			if (statusMode != StatusMode.dnd) {
+				if (AccountManager.getInstance().isXa())
+					statusMode = StatusMode.xa;
+				else if (AccountManager.getInstance().isAway())
+					statusMode = StatusMode.away;
+			}
 			if (SettingsManager.connectionAdjustPriority()) {
 				if (statusMode == StatusMode.available)
 					priority = SettingsManager.connectionPriorityAvailable();