From 587099dba74974d39bfc712a3e8630cfb7c66ada Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Tue, 12 Sep 2017 08:10:58 +0200 Subject: [PATCH] Fullsync: add a complete sync message when sync is done instead of telling nothing to sync --- .../unix_experience/owncloud_sms/engine/ASyncSMSSync.java | 7 ++++++- src/main/res/values-en-rGB/strings.xml | 1 + src/main/res/values-en/strings.xml | 1 + src/main/res/values-fr/strings.xml | 1 + src/main/res/values/strings.xml | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java index 600af56..1f0dc31 100644 --- a/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java +++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java @@ -68,15 +68,19 @@ public interface ASyncSMSSync { Log.i(ASyncSMSSync.TAG, "Current message date is " + syncStartupDate); boolean shouldSync = true; + boolean hasSyncSomething = false; AndroidSmsFetcher fetcher = new AndroidSmsFetcher(_context); while (shouldSync) { SmsBuffer smsBuffer = new SmsBuffer(); fetcher.bufferMessagesSinceDate(smsBuffer, syncStartupDate); if (smsBuffer.empty()) { if (_activity != null) { + final boolean syncComplete = hasSyncSomething; _activity.runOnUiThread(new Runnable() { public void run() { - Toast.makeText(_context, _context.getString(R.string.nothing_to_sync), Toast.LENGTH_SHORT).show(); + Toast.makeText(_context, + _context.getString(syncComplete ? R.string.sync_complete : R.string.nothing_to_sync), + Toast.LENGTH_SHORT).show(); } }); } @@ -94,6 +98,7 @@ public interface ASyncSMSSync { syncStartupDate = smsBuffer.getLastMessageDate(); performSync(smsBuffer); + hasSyncSomething = true; } } diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml index 89e3e61..8a9f366 100644 --- a/src/main/res/values-en-rGB/strings.xml +++ b/src/main/res/values-en-rGB/strings.xml @@ -182,4 +182,5 @@ Yes No Show sync notifications + Synchronization complete diff --git a/src/main/res/values-en/strings.xml b/src/main/res/values-en/strings.xml index 598cc1d..97e2561 100644 --- a/src/main/res/values-en/strings.xml +++ b/src/main/res/values-en/strings.xml @@ -158,5 +158,6 @@ Yes No Show sync notifications + Synchronization complete diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index f3582ca..562530a 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -182,4 +182,5 @@ Oui Non Afficher les notifications de synchronisation + Synchronisation terminée diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 523f8ca..00b6c86 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -271,4 +271,5 @@ Yes No Show sync notifications + Synchronization complete