wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5966 from k9mail/notification_channel_version

Browse source 
Set `messagesNotificationChannelVersion` on settings import
This commit is contained in:
cketti 2022-03-16 21:18:05 +01:00 committed by GitHub
commit c376e8ef95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
View file

@ -18,6 +18,7 @@ import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import com.fsck.k9.Account;
import com.fsck.k9.AccountPreferenceSerializer;
import com.fsck.k9.Clock;
import com.fsck.k9.Core;
import com.fsck.k9.DI;
import com.fsck.k9.Identity;
@ -456,7 +457,12 @@ public class SettingsImporter {
}
}
//TODO: sync folder settings with localstore?
// When deleting an account and then restoring it using settings import, the same account UUID will be used.
// To avoid reusing a previously existing notification channel ID, we need to make sure to use a unique value
// for `messagesNotificationChannelVersion`.
Clock clock = DI.get(Clock.class);
String messageNotificationChannelVersion = Long.toString(clock.getTime() / 1000);
putString(editor, accountKeyPrefix + "messagesNotificationChannelVersion", messageNotificationChannelVersion);
AccountDescription imported = new AccountDescription(accountName, uuid);
return new AccountDescriptionPair(original, imported, mergeImportedAccount,