arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-09 06:02:42 +00:00
Code Issues Releases Wiki Activity

Don't show warning on AccountSettings version updates

Browse Source
This commit is contained in:
Ricki Hirner 2016-12-30 13:50:33 +01:00
parent d5807e44af
commit 88b5a26c3b
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/at/bitfire/davdroid/AccountSettings.java
View File

@ -104,31 +104,12 @@ public class AccountSettings {
version = Integer.parseInt(versionStr); version = Integer.parseInt(versionStr);
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
} }
App.log.info("Account " + account.name + " has version " + version + ", current version: " + CURRENT_VERSION); App.log.fine("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);
if (version < CURRENT_VERSION)
update(version); update(version);
} }
} }
}
public static Bundle initialUserData(String userName) { public static Bundle initialUserData(String userName) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();

3
app/src/main/res/values/strings.xml
View File

@ -209,9 +209,6 @@
<string name="settings_manage_calendar_colors">Manage calendar colors</string> <string name="settings_manage_calendar_colors">Manage calendar colors</string>
<string name="settings_manage_calendar_colors_on">Calendar colors are managed by DAVdroid</string> <string name="settings_manage_calendar_colors_on">Calendar colors are managed by DAVdroid</string>
<string name="settings_manage_calendar_colors_off">Calendar colors are not set by DAVdroid</string> <string name="settings_manage_calendar_colors_off">Calendar colors are not set by DAVdroid</string>
<string name="settings_version_update">DAVdroid version update</string>
<string name="settings_version_update_settings_updated">Internal settings have been updated.</string>
<string name="settings_version_update_install_hint">Problems? Uninstall DAVdroid, then re-install.</string>
<!-- collection management --> <!-- collection management -->
<string name="create_addressbook">Create address book</string> <string name="create_addressbook">Create address book</string>