From 6480b3dbbdc1474502697f1d53a51627ad052c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot=20=28=40U-Exp=29?=
 <loic.blot@unix-experience.fr>
Date: Sun, 18 Jan 2015 17:42:38 +0100
Subject: [PATCH] v1.6.1: Remove sync error notification if a good sync is done
 after a bad sync

---
 AndroidManifest.xml                                           | 4 ++--
 .../owncloud_sms/notifications/OCSMSNotificationManager.java  | 4 ++++
 .../owncloud_sms/sync_adapters/SmsSyncAdapter.java            | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f49a081..a5db226 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="fr.unix_experience.owncloud_sms"
-    android:versionCode="16"
-    android:versionName="0.16.0" >
+    android:versionCode="17"
+    android:versionName="0.16.1" >
 	<!-- From Android 3.0 to 5.0 -->
     <uses-sdk
         android:minSdkVersion="11"
diff --git a/src/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java b/src/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java
index a7ddb19..ea7fb33 100644
--- a/src/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java
+++ b/src/fr/unix_experience/owncloud_sms/notifications/OCSMSNotificationManager.java
@@ -46,6 +46,10 @@ public class OCSMSNotificationManager {
 		);
 	}
 	
+	public void dropSyncErrorMsg() {
+		_notification.cancelNotify(OCSMSNotificationType.SYNC_FAILED);
+	}
+	
 	public void setDebugMsg(String errMsg) {
 		createNotificationIfPossible(OCSMSNotificationType.DEBUG, 
 			"DEBUG", errMsg
diff --git a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
index 6bf3a42..b107bb0 100644
--- a/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
+++ b/src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
@@ -58,6 +58,8 @@ public class SmsSyncAdapter extends AbstractThreadedSyncAdapter {
 			
 			// and push datas
 			_client.doPushRequest(null);
+			
+			nMgr.dropSyncErrorMsg();
 		} catch (OCSyncException e) {
 			nMgr.setSyncErrorMsg(getContext().getString(e.getErrorId()));
 			if (e.getErrorType() == OCSyncErrorType.IO) {
@@ -75,6 +77,7 @@ public class SmsSyncAdapter extends AbstractThreadedSyncAdapter {
 		}
 		
 		nMgr.dropSyncProcessMsg();
+		
 	}
 
 	private AccountManager _accountMgr;