From 4d34ab7a014035a2efc475cd58569627286208ac Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:40:22 +0530
Subject: [PATCH] Force insert offline entry to avoid bad conflict

---
 lib/store/code_store.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/store/code_store.dart b/lib/store/code_store.dart
index 902ef81553..fd1064ff37 100644
--- a/lib/store/code_store.dart
+++ b/lib/store/code_store.dart
@@ -122,7 +122,10 @@ class CodeStore {
               oc.account == eachCode.account &&
               oc.secret == eachCode.secret,
         );
+        int? generatedID = eachCode.generatedID!;
         if (!alreadyPresent) {
+          // Avoid conflict with generatedID of online codes
+          eachCode.generatedID = null;
           await CodeStore.instance.addCode(
             eachCode,
             accountMode: AccountMode.online,
@@ -130,7 +133,7 @@ class CodeStore {
           );
         }
         await OfflineAuthenticatorDB.instance.deleteByIDs(
-          generatedIDs: [eachCode.generatedID!],
+          generatedIDs: [generatedID],
         );
       }
       AuthenticatorService.instance.onlineSync().ignore();