Merge pull request #334 from syphon-org/fix/olm-decryption-issue

[fix] Decryption Issues
syphon-org · Aug 21, 2021 · 487e902 · 487e902
2 parents c3c916b + abc772c
commit 487e902
Show file tree

Hide file tree

Showing 17 changed files with 421 additions and 360 deletions.
diff --git a/fastlane/metadata/android/en-US/changelogs/230.txt b/fastlane/metadata/android/en-US/changelogs/230.txt
@@ -0,0 +1,18 @@
+0.1.13
+
+🔮 New Features:
+- Multi-Account Support 🎉
+- Advanced Color Customization
+- Customizable FAB Settings
+- Manual Verification Data Exposed
+- New and Improved Languages Through Weblate!
+  - German, Portuguese, Dutch, Czech, Slovak, and more!
+
+🐛 Bug Fixes
+- Issue with decrypting messages from other clients (pre-key failures)
+- Issue with profile preview modal loading indefinitely
+- Issue with decrypting events for new chats
+- Issue with completing multi step onboarding flows
+
+📐 Refactoring
+- Lots!
diff --git a/lib/cache/middleware.dart b/lib/cache/middleware.dart
@@ -21,6 +21,7 @@ bool cacheMiddleware(Store<AppState> store, dynamic action) {
     case SetOlmAccount:
     case SetOlmAccountBackup:
     case SetDeviceKeysOwned:
+    case SaveKeySession:
     case SetUser:
     case ResetCrypto:
     case ResetUser:

diff --git a/lib/global/libs/matrix/encryption.dart b/lib/global/libs/matrix/encryption.dart
@@ -17,7 +17,7 @@ class Algorithms {
 class Keys {
   static String fingerprintId({String? deviceId}) => '${Algorithms.ed25519}:$deviceId';
   static String identityKeyId({String? deviceId}) => '${Algorithms.curve25591}:$deviceId';
-  static String oneTimeKey({String? deviceId}) => '${Algorithms.signedcurve25519}:$deviceId';
+  static String oneTimeKeyId({String? keyId}) => '${Algorithms.signedcurve25519}:$keyId';
 }
 
 abstract class Encryption {

diff --git a/lib/storage/middleware.dart b/lib/storage/middleware.dart
@@ -124,11 +124,10 @@ storageMiddleware(Database storage) {
       case SetDeviceKeys:
       case SetOneTimeKeysCounts:
       case SetOneTimeKeysClaimed:
-      case AddInboundKeySession:
       case AddInboundMessageSession:
-      case AddOutboundKeySession:
       case AddOutboundMessageSession:
       case UpdateMessageSessionOutbound:
+      case SaveKeySession:
       case ResetCrypto:
         saveCrypto(store.state.cryptoStore, storage: storage);
         break;

diff --git a/lib/store/auth/actions.dart b/lib/store/auth/actions.dart
@@ -223,6 +223,7 @@ ThunkAction<AppState> startAuthObserver() {
     onAuthStateChanged(User? user) async {
       if (user != null && user.accessToken != null) {
         await store.dispatch(fetchAuthUserProfile());
+        await store.dispatch(fetchDevices());
 
         // init encryption for E2EE
         await store.dispatch(initKeyEncryption(user));