From 88b5a26c3b996009a6ae40395d4dec222c556107 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 30 Dec 2016 13:50:33 +0100 Subject: [PATCH] Don't show warning on AccountSettings version updates --- .../at/bitfire/davdroid/AccountSettings.java | 23 ++----------------- app/src/main/res/values/strings.xml | 3 --- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java index 5f1ce1a9..70ae84fe 100644 --- a/app/src/main/java/at/bitfire/davdroid/AccountSettings.java +++ b/app/src/main/java/at/bitfire/davdroid/AccountSettings.java @@ -104,29 +104,10 @@ public class AccountSettings { version = Integer.parseInt(versionStr); } catch (NumberFormatException ignored) { } - App.log.info("Account " + account.name + " has version " + version + ", current version: " + CURRENT_VERSION); - - if (version < CURRENT_VERSION) { - Notification notify = new NotificationCompat.Builder(context) - .setSmallIcon(R.drawable.ic_new_releases_light) - .setLargeIcon(App.getLauncherBitmap(context)) - .setContentTitle(context.getString(R.string.settings_version_update)) - .setContentText(context.getString(R.string.settings_version_update_settings_updated)) - .setSubText(context.getString(R.string.settings_version_update_install_hint)) - .setStyle(new NotificationCompat.BigTextStyle() - .bigText(context.getString(R.string.settings_version_update_settings_updated))) - .setCategory(NotificationCompat.CATEGORY_SYSTEM) - .setPriority(NotificationCompat.PRIORITY_HIGH) - .setContentIntent(PendingIntent.getActivity(context, 0, - new Intent(Intent.ACTION_VIEW, Constants.webUri.buildUpon().appendEncodedPath("faq/entry/davdroid-not-working-after-update/").build()), - PendingIntent.FLAG_CANCEL_CURRENT)) - .setLocalOnly(true) - .build(); - NotificationManagerCompat nm = NotificationManagerCompat.from(context); - nm.notify(Constants.NOTIFICATION_ACCOUNT_SETTINGS_UPDATED, notify); + App.log.fine("Account " + account.name + " has version " + version + ", current version: " + CURRENT_VERSION); + if (version < CURRENT_VERSION) update(version); - } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e7d1c0f2..e7ebf720 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -209,9 +209,6 @@ Manage calendar colors Calendar colors are managed by DAVdroid Calendar colors are not set by DAVdroid - DAVdroid version update - Internal settings have been updated. - Problems? Uninstall DAVdroid, then re-install. Create address book