fix: check if secrets are cached instead of checking sync

chore: allow passing a timeout value to oneShotSync

Author: td-famedly

lib/encryption/ssss.dart

@@ -747,6 +747,10 @@ class OpenSSSS {
       throw Exception('SSSS not unlocked');
     }
     await ssss.store(type, secret, keyId, privateKey, add: add);
+
+    while (!(await ssss.encryption.keyManager.isCached())) {
+      await ssss.client.oneShotSync(timeout: Duration(seconds: 5));
+    }
   }
 
   Future<void> validateAndStripOtherKeys(String type, String secret) async {

lib/encryption/utils/bootstrap.dart

@@ -581,14 +581,6 @@ class Bootstrap {
       );
       Logs().v('Store the secret...');
       await newSsssKey?.store(megolmKey, base64.encode(privKey));
-      Logs().v('Wait for secret to come down sync');
-
-      if (!await encryption.keyManager.isCached()) {
-        await client.onSync.stream.firstWhere((syncUpdate) =>
-            syncUpdate.accountData != null &&
-            syncUpdate.accountData!
-                .any((accountData) => accountData.type == megolmKey));
-      }
 
       Logs().v(
           'And finally set all megolm keys as needing to be uploaded again...');

lib/src/client.dart

@@ -1625,8 +1625,8 @@ class Client extends MatrixApi {
 
   /// Immediately start a sync and wait for completion.
   /// If there is an active sync already, wait for the active sync instead.
-  Future<void> oneShotSync() {
-    return _sync();
+  Future<void> oneShotSync({Duration? timeout}) {
+    return _sync(timeout: timeout);
   }
 
   /// Pass a timeout to set how long the server waits before sending an empty response.