6.4.8-rc2 (#1336)

- Make sure to not enable accounts without password after being restored via iCloud backup
monal-im · Dec 17, 2024 · 22bdd16 · 22bdd16
2 parents ee47cc7 + 48744e0
commit 22bdd16
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Monal/Classes/PasswordMigration.swift b/Monal/Classes/PasswordMigration.swift
@@ -94,7 +94,7 @@ struct PasswordMigration: View {
             ToolbarItem(placement: .navigationBarTrailing) {
                 HStack{
                     Button(action: {
-                        DDLogInfo("Saving migrated accounts: \(String(describing:self.needingMigration))")
+                        DDLogInfo("Saving migrated accounts...")
                         for id in self.needingMigration.keys {
                             var dic = self.needingMigration[id]!
                             //don't show this migration dialog again, even if the user did not activate this account
@@ -108,6 +108,8 @@ struct PasswordMigration: View {
                                     MLXMPPManager.sharedInstance().connectAccount(dic["account_id"] as! NSNumber)
                                 }
                             } else {
+                                //make sure to never enable accounts without password
+                                dic["enabled"] = NSNumber(value:false)
                                 DDLogDebug("Updating account in DB: enabled=\(String(describing:dic["enabled"])), needs_password_migration=\(String(describing:dic["needs_password_migration"])), password.count=0")
                                 DataLayer.sharedInstance().updateAccoun(with:dic)
                             }