From 66087cb3608ec70fd04248591b8531a0f4705a2f Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 18 Nov 2014 15:26:28 +0100
Subject: [PATCH] put error notification into notification service

---
 .../services/NotificationService.java         |  39 ++++++++++++++++
 .../services/XmppConnectionService.java       |   7 ++-
 .../siacs/conversations/utils/UIHelper.java   |  42 ------------------
 .../drawable-hdpi/ic_stat_alert_warning.png   | Bin 0 -> 757 bytes
 .../drawable-mdpi/ic_stat_alert_warning.png   | Bin 0 -> 425 bytes
 .../drawable-xhdpi/ic_stat_alert_warning.png  | Bin 0 -> 1175 bytes
 .../drawable-xxhdpi/ic_stat_alert_warning.png | Bin 0 -> 2276 bytes
 7 files changed, 42 insertions(+), 46 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_stat_alert_warning.png
 create mode 100644 src/main/res/drawable-mdpi/ic_stat_alert_warning.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_stat_alert_warning.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_stat_alert_warning.png

diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index c23a95b9e..f649f9d40 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -20,6 +20,7 @@ import android.util.DisplayMetrics;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,6 +32,7 @@ import eu.siacs.conversations.entities.Downloadable;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.ui.ConversationActivity;
+import eu.siacs.conversations.ui.ManageAccountActivity;
 
 public class NotificationService {
 
@@ -40,6 +42,8 @@ public class NotificationService {
 
 	public static int NOTIFICATION_ID = 0x2342;
 	public static int FOREGROUND_NOTIFICATION_ID = 0x8899;
+	public static int ERROR_NOTIFICATION_ID = 0x5678;
+
 	private Conversation mOpenConversation;
 	private boolean mIsInForeground;
 	private long mLastNotification;
@@ -380,4 +384,39 @@ public class NotificationService {
 		mBuilder.setPriority(NotificationCompat.PRIORITY_MIN);
 		return mBuilder.build();
 	}
+
+	public void updateErrorNotification() {
+		NotificationManager mNotificationManager = (NotificationManager) mXmppConnectionService.getSystemService(Context.NOTIFICATION_SERVICE);
+		List<Account> errors = new ArrayList<>();
+		for (Account account : mXmppConnectionService.getAccounts()) {
+			if (account.hasErrorStatus()) {
+				errors.add(account);
+			}
+		}
+		NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService);
+		if (errors.size() == 0) {
+			mNotificationManager.cancel(ERROR_NOTIFICATION_ID);
+			return;
+		} else if (errors.size() == 1) {
+			mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.problem_connecting_to_account));
+			mBuilder.setContentText(errors.get(0).getJid().toBareJid().toString());
+		} else {
+			mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.problem_connecting_to_accounts));
+			mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_fix));
+		}
+		mBuilder.setOngoing(true);
+		mBuilder.setLights(0xffffffff, 2000, 4000);
+		mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
+		TaskStackBuilder stackBuilder = TaskStackBuilder.create(mXmppConnectionService);
+		stackBuilder.addParentStack(ConversationActivity.class);
+
+		Intent manageAccountsIntent = new Intent(mXmppConnectionService,ManageAccountActivity.class);
+		stackBuilder.addNextIntent(manageAccountsIntent);
+
+		PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0,PendingIntent.FLAG_UPDATE_CURRENT);
+
+		mBuilder.setContentIntent(resultPendingIntent);
+		Notification notification = mBuilder.build();
+		mNotificationManager.notify(ERROR_NOTIFICATION_ID, notification);
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 2ff29b196..d181fac33 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -204,8 +204,7 @@ public class XmppConnectionService extends Service {
 					scheduleWakeupCall((int) (next * 1.2), false);
 				}
 					}
-			UIHelper.showErrorNotification(getApplicationContext(),
-					getAccounts());
+			getNotificationService().updateErrorNotification();
 		}
 	};
 	private Integer accountChangedListenerCount = 0;
@@ -1071,7 +1070,7 @@ public class XmppConnectionService extends Service {
 		databaseBackend.updateAccount(account);
 		reconnectAccount(account, false);
 		updateAccountUi();
-		UIHelper.showErrorNotification(getApplicationContext(), getAccounts());
+		getNotificationService().updateErrorNotification();
 	}
 
 	public void deleteAccount(Account account) {
@@ -1092,7 +1091,7 @@ public class XmppConnectionService extends Service {
 			databaseBackend.deleteAccount(account);
 			this.accounts.remove(account);
 			updateAccountUi();
-			UIHelper.showErrorNotification(getApplicationContext(), getAccounts());
+			getNotificationService().updateErrorNotification();
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 0d43450d1..ed6efd069 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -106,48 +106,6 @@ public class UIHelper {
 		}
 	}
 
-	public static void showErrorNotification(Context context,
-			List<Account> accounts) {
-		NotificationManager mNotificationManager = (NotificationManager) context
-				.getSystemService(Context.NOTIFICATION_SERVICE);
-		List<Account> accountsWproblems = new ArrayList<>();
-		for (Account account : accounts) {
-			if (account.hasErrorStatus()) {
-				accountsWproblems.add(account);
-			}
-		}
-		NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(
-				context);
-		if (accountsWproblems.size() == 0) {
-			mNotificationManager.cancel(1111);
-			return;
-		} else if (accountsWproblems.size() == 1) {
-			mBuilder.setContentTitle(context
-					.getString(R.string.problem_connecting_to_account));
-			mBuilder.setContentText(accountsWproblems.get(0).getJid().toBareJid().toString());
-		} else {
-			mBuilder.setContentTitle(context
-					.getString(R.string.problem_connecting_to_accounts));
-			mBuilder.setContentText(context.getString(R.string.touch_to_fix));
-		}
-		mBuilder.setOngoing(true);
-		mBuilder.setLights(0xffffffff, 2000, 4000);
-		mBuilder.setSmallIcon(R.drawable.ic_notification);
-		TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-		stackBuilder.addParentStack(ConversationActivity.class);
-
-		Intent manageAccountsIntent = new Intent(context,
-				ManageAccountActivity.class);
-		stackBuilder.addNextIntent(manageAccountsIntent);
-
-		PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0,
-				PendingIntent.FLAG_UPDATE_CURRENT);
-
-		mBuilder.setContentIntent(resultPendingIntent);
-		Notification notification = mBuilder.build();
-		mNotificationManager.notify(1111, notification);
-	}
-
 	private final static class EmoticonPattern {
 		Pattern pattern;
 		String replacement;
diff --git a/src/main/res/drawable-hdpi/ic_stat_alert_warning.png b/src/main/res/drawable-hdpi/ic_stat_alert_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1f9917f11a798f968fa46b0bd59b7e3ad677991
GIT binary patch
literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0008KNkl<ZScUDD
zOGs2v9LAjtm3+{HC<}X#6txUoL`2X7Tu5z-Y*Q|>wX~Hi0&OD*;j+MGt%4Rk$VFse
zAk`+M$07r>7C~fKjWf=_@8f*K+^*hx9lLX<#eDGNaPGP1{QvWx@0@e1sw%3e%rdjp
zU<23!*0W#kgqpwsa8hkkIg?>^TER7NPi<>is)V4cz;@6H9)quH+26+Tq!X$I$G{En
z9xSM3|0u_kOr{!a1ed@o@ZFr)zSMJ$S0|NFJva{TfFG)kshtJ4HC~@YGBol|a2>n>
zS^HZVJs;3}r8T&=IX&_S`~*2)LODHu2#%Ee7|^!v1Me(cZ^31-t5k{5$ZJ6dcp|Ta
zX;$xbXkNSq$AXREpu96<1tZUcFW`gPc|GU&CwYnU8skichu~JwqhCGesl+rG1YK&U
zJ!5lvzen@qIV`bI12_amR0Z$Ongl06o!UvySXS?kXnsQ+$*?+mz*X=9q<vm_4chf?
zyZT<GHIMUm|5KGPIVJD#CLaUeZ1FaaN+_p!W2zw6ORY2^?yP;_iaCQW*kVN`WL7XZ
z*V((GDycfWB2I$`7QD@Q9-Rj})CQeToPQsj0&9w{k~x#II@~#aBYVZWY(hy-sK1o*
z1|L+F>WZz-X3%Z!zt02&DOOzPDYyVO*>b9+WLVPu;Ff-s-^gD522<v|Go^lza$4`E
z){p+{%o&;6{33W35x|s0uQ@~asvjn<$EtTLPVkjt1taq_^sc!pB1+5IWq!?Q{WFTU
zbd@krW6sD!;IkF(r7#s+Au6r)hZL_Ss5<MwIWP)-S-5xdD#k;3<+T2&;xTT@pAbLV
z`JWDhj~2Ym<5E^}h84HgpHK@p3!Yni+dN7c#bewSe?o1bAB>y(wn>U{#clH^)C>-r
n+hJV^(y6%3A*WGA|F8Z4LoS7Zb`j>X00000NkvXXu0mjf;B{nY

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_stat_alert_warning.png b/src/main/res/drawable-mdpi/ic_stat_alert_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e62841a02250422229ee7da7516ef028a18a974
GIT binary patch
literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004SNkl<ZNQvc?
zF-t;G6vx#<a1e9~Y%Kf&77`TM;wPvNQA5-hu$HjF(YB!0R_C@541%V%76%EJ2qh3Q
zPyfUHgExKG*L%K(=)e!|JMW(Vx%ZxXZY=h1OhgvIGRW!pHxgvQ5y?g^o&-CfNpzfy
zN<7YExd5-EPG3BV1Szlwp1=rva;(18yy9BeJh%aU8C##e{9FY`a2gzfwoF@_|I%T_
z7r{EX1p|)+1O8jnxnUAyz!~ULum>(lkG?MFWP*w(z!rD_LyC342I<f@<eW{736en1
z{v5nnN8*)0IH&sKT5$Cxa4+Us`X$ggEwJso3o%W#1Zoqjch$h&MUAoU<`Z*sw1FNa
zxM|F;xNa0zzY4CwyNAH69SCEtz>4QC#5@TH;MuW4R}E~_*nOFNLc|od02<)K5$v}E
zVQhn12|Ix{)d_fU1O_qHsEFNs_$Y%r`F<_K+K5_ZJ3$c~gVTsmt>Vm{_%rqe0ucwS
TK56_a00000NkvXXu0mjfFwwcN

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_stat_alert_warning.png b/src/main/res/drawable-xhdpi/ic_stat_alert_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..952a857f62ef06023e16040dd8a84efcc6a67a99
GIT binary patch
literal 1175
zcmV;I1Zew-P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000DDNkl<ZXo2mS
zTZola6vrJ$oe`r%l5sFH3r59DqYXkAQ|KwmeCXm0LkPwqB_Bn?OQo-cW+|aB1B&$!
zWHv8Bq>v4w;05u9l?<pkGkHm8^vuli|8M;d=lJ=ZbH4L=X1)`g1wT0K*?aB(+IxR%
zUuMXVidC#)B{wr021bK=!QaD@))m<xb`+Ql=7>owOIlYXgV3R%4lDp`!~&HKO<G@G
zllU4i1*`)<i*+iiDeE90t`<BAUI#7UPtl?>{;f7?ouLL{RbUL52iAfE;HEgBvU#dg
zm9*abOyWm?r@;r{J8&MP#CesyuR0^jDu}GK`8@a%oC7yNKj_o%vtX<0lvi4Xm`A`2
z@E-UHTnD|DG5)>=_N&fxwn<v|f2QTb&1xa|8XN;X8vV5OtBim93cLfxCBBRxpjxBf
z2-bsx;8I}pvuELw>agy!YFnLT08E<`%r~k%;Bv_52WNqGc7r$6Ho3HFo)TZth#r!_
zLdH73sSVqXNkVv)md`}+k@?5@mwC!8WGU6%ueKBAYw*4Y^E^Hl%mv%P8S~837a@Q?
z)jgxObLDIJU<U9gm<3jVR`V2@3W(%Vxg~l6!KKuuRX%3Y=U|EFfo(ik40eE%;BH`)
z|1r-tE#jccvhA+g?vO9~9N2@N`Pv_Dz7cH(M?pu((&0|bvrm&)tFquy>X47k@=4zV
z_bq7jxnAD{d%+b8Pn#Us<>nWgQTlx{P$!*MugDjDK0aWxpwVaEe-3;Bj)3kE@lgXv
z2hlBGpPPSIwI!bgiRWd6+y5eP7+kg7Stn`$CLdSjbCLR}DQOVqONZ0T_53mDH2(<0
zM!(nq`sJ%rzMHJnOUeA>nr5Ezcx1@6bm9b%4&t_aH-o8Gs(rySXZ=^fcJr)JXvd9`
zg@Trn@9paA;qMIQOXo53Cz6%mSM&9nZ}e$V_JN?$=iln%L-onN<1Z!i(SHieH@{8s
zf*$p_kZ&i>*X|FnMSV`NxU*oHwD}_V4EzGRB8Yfc>r!8zf)^}KTDAMr<`S?ETr~f9
zqZmiL9h?&F7VW5Q>Vtj#puUSwtLDdBHsrJ5M)RxSzZQPe3Ns4+#yq1m>vwy^w!P|$
zeQp3RNlUbwn`K6ymvlanaGU2<u+WE_ZKouBtY}tQRO?rtd!=E9MV$r9q|MjBE^xy9
zajF<Ab{_~c_IVual$OG2)jVzTtlt1uf#1z9A5m^v*%oIX2wM8ia7bDjq%C(^H6Q(F
zz}x0eBo{3Iks+7G*$0A_K4M&umbauWd=|_{pU)gGgH7hCtTTpqTHJjgEQn5N*(7aT
zk`K-T3P*w`z`Ni_D=uvgq@~j;H7zsOI5I2%{sV%W)+gXJxMT4~ztlzz)Iv?vMvZl0
z0q}KgHTd5A@u?idr;S>uiQ1^KF)V=D=I8NmL7REnD<|5djT&c%1;7Vdo;~>Fx70j$
pmlI2+jT-B7rqYU4tYZH!y9dZ2RT8zM$KC({002ovPDHLkV1gaIL<;}_

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_stat_alert_warning.png b/src/main/res/drawable-xxhdpi/ic_stat_alert_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb5dc029cb187ec89a59feb112f5ad87d93c57e4
GIT binary patch
literal 2276
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

literal 0
HcmV?d00001