wip clarify todo for 322

Author: gnprice

lib/model/push_device.dart

@@ -134,18 +134,25 @@ class PushDeviceManager extends PerAccountStoreBase {
       return _legacyRegisterToken(token);
     }
 
-    // TODO(#1764) if account.pushToken not null, skip? cf #322
-
     if (token != account.pushToken) {
       // TODO(#1764) if old pushToken not null, maybe tell server to forget
       await updateAccount(AccountsCompanion(
         pushAccountId: drift.Value(NotificationService.generatePushAccountId()),
         pushKey: drift.Value(NotificationService.generatePushKey()),
         pushToken: drift.Value(token),
       ));
+    } else {
+      // We've already attempted registering this token, perhaps succeeded.
+      // For now, just go ahead.
+      // TODO(#1764)/TODO(#322) if past registration succeeded, and recently,
+      //   then skip doing it again.
+    }
+
+    final pushAccountId = account.pushAccountId;
+    final pushKey = account.pushKey;
+    if (pushAccountId == null || pushKey == null) {
+      throw StateError('Account missing pushAccountId and/or pushKey, while has pushToken'); // TODO(log)
     }
-    final pushAccountId = account.pushAccountId!;
-    final pushKey = account.pushKey!;
 
     final tokenKind = switch (defaultTargetPlatform) {
       TargetPlatform.android => PushTokenKind.fcm,