Merge branch 'main' into dev

changelog.md

@@ -5,7 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [0.2.4](https://github.com/syphon-org/syphon/releases/tag/0.2.4) - 2021-12-23
+## [0.2.6](https://github.com/syphon-org/syphon/releases/tag/0.2.6) - 2021-12-27
+
+### Fixed
+- screen lock regression on confirming after toggled on
+
+## [0.2.5](https://github.com/syphon-org/syphon/releases/tag/0.2.5) - 2021-12-24
+
+### Fixed
+- issue with chat colors and message details screens
+
+## [0.2.4](https://github.com/syphon-org/syphon/releases/tag/0.2.4) - 2021-12-24
 
 ### Added 
 - Screen Lock

fastlane/metadata/android/en-US/changelogs/2007.txt

@@ -0,0 +1,28 @@
+0.2.6
+
+🔥 Hot Fixes
+- fixed screen lock issues when toggling on
+- fixed issue with chat bubble colors and message details
+
+🔮 New Features
+- Screen Lock
+- Pin Protected Encrypted Storage
+
+✨ Improvements
+- Improved Edit Message UI
+- Improved Chat UI spacing
+
+🐛 Bug Fixes
+- major performance improvements and fixes
+- fixed improper cache checks when loading older messages
+- fixed editing encrypted messages 
+- fixed deleting encrypted messages
+- fixed read receipts locally if toggled on
+- fixed defaulting to device language
+- fixed editing messages higher in the chat
+- fixed opening links in Android 11
+- fixed showing more icon in user previews
+- fixed input text border regression
+
+📐 Refactoring
+- Lots!

ios/Runner.xcodeproj/project.pbxproj

@@ -354,7 +354,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2004;
+				CURRENT_PROJECT_VERSION = 2006;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -370,6 +370,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 0.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -492,7 +493,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2004;
+				CURRENT_PROJECT_VERSION = 2006;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -508,6 +509,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 0.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -524,7 +526,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2004;
+				CURRENT_PROJECT_VERSION = 2006;
 				DEVELOPMENT_TEAM = W98LUTKH5G;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -540,6 +542,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 0.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.tether.tether;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Runner/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

lib/storage/index.dart

@@ -173,16 +173,10 @@ loadStorageAsync(StorageDatabase storage, Store<AppState> store) {
         ));
       }
 
-      // TODO: remove after loadAsync works
-      // printJson({'loadAync': 'SQL LOAD COMPLETED'});
-
       store.dispatch(LoadMedia(mediaMap: medias));
       store.dispatch(LoadReceipts(receiptsMap: receipts));
       store.dispatch(LoadReactions(reactionsMap: reactions));
 
-      // TODO: remove after loadAsync works
-      // printJson({'loadAync': 'STATE LOAD COMPLETED'});
-
       // mutate messages
       store.dispatch(mutateMessagesAll());
     }

lib/views/home/settings/settings-privacy-screen.dart

@@ -171,6 +171,7 @@ class PrivacySettingsScreen extends StatelessWidget {
       onConfirmed: (String matchedText) async {
         await props.onSetScreenLock(matchedText);
         Syphon.reloadCurrentContext(context);
+        Navigator.of(context).pop();
       },
     );
   }

lib/views/intro/lock-screen.dart

@@ -1,11 +1,9 @@
 import 'dart:io';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:syphon/context/auth.dart';
 import 'package:syphon/context/types.dart';
-import 'package:syphon/global/print.dart';
 
 import 'package:syphon/views/intro/signup/loading-screen.dart';
 import 'package:syphon/views/prelock.dart';
@@ -50,6 +48,7 @@ class _LockScreenState extends State<LockScreen> with Lifecycle<LockScreen> {
         },
         onUnlocked: (String pin) {
           Prelock.toggleLocked(context, pin);
+          Navigator.of(context).pop();
         });
   }
 

lib/views/widgets/modals/modal-lock-overlay/lock-controller.dart

@@ -1,9 +1,11 @@
 import 'dart:async';
 
+import 'package:syphon/global/print.dart';
+
 class LockController {
   LockController();
 
-  late bool _isConfirmed;
+  late bool _isConfirmMode;
   late int _maxLength;
   late Future<bool> Function(String input) _onVerifyInput;
 
@@ -74,15 +76,16 @@ class LockController {
 
     final inputText = _currentInputs.join();
 
-    if (!_isConfirmed) {
+    if (!_isConfirmMode) {
       final verified = await _onVerifyInput(inputText);
 
       if (!verified) {
         loadingController.add(false);
       }
-
       return verifyController.add(verified);
     } else {
+      loadingController.add(false);
+
       if (_firstInput.isEmpty) {
         setConfirmed();
         clear();
@@ -94,15 +97,13 @@ class LockController {
       } else {
         verifyController.add(false);
       }
-
-      loadingController.add(false);
     }
   }
 
   /// Create each stream.
   void initialize({
     int maxLength = 9, // DEFAULT MAX LENGTH
-    bool isConfirmed = false,
+    bool isConfirmMode = false,
     required Future<bool> Function(String input) onVerifyInput,
   }) {
     loadingController = StreamController.broadcast();
@@ -111,7 +112,7 @@ class LockController {
     confirmedController = StreamController.broadcast();
 
     _onVerifyInput = onVerifyInput;
-    _isConfirmed = isConfirmed;
+    _isConfirmMode = isConfirmMode;
     _maxLength = maxLength;
   }
 

lib/views/widgets/modals/modal-lock-overlay/lock-overlay.dart

@@ -161,9 +161,9 @@ class _LockOverlayState extends State<LockOverlay> {
     super.initState();
     lockController = widget.lockController ?? LockController();
     lockController.initialize(
-      isConfirmed: widget.confirmMode,
       maxLength: widget.maxLength,
       onVerifyInput: widget.onVerify,
+      isConfirmMode: widget.confirmMode,
     );
 
     lockController.currentInput.listen((event) {
@@ -188,7 +188,7 @@ class _LockOverlayState extends State<LockOverlay> {
         );
       }
 
-      if (unlocking) return;
+      if (unlocking || widget.confirmMode) return;
 
       unlocking = true;
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: syphon
 description: a privacy focused matrix client
-version: 0.2.5+2006
+version: 0.2.6+2007
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

readme.md

@@ -25,7 +25,7 @@ a privacy centric matrix client - now in open alpha*
 <p align='center'>
     <img src="https://img.shields.io/github/license/syphon-org/syphon?color=teal"/>
     <img src="https://img.shields.io/github/v/release/syphon-org/syphon?include_prereleases&color=teal"/>
-    <img src="https://img.shields.io/github/commits-since/syphon-org/syphon/0.2.3?color=teal"/> 
+    <img src="https://img.shields.io/github/commits-since/syphon-org/syphon/0.2.4?color=teal"/> 
     <a href="https://pub.dev/packages/lint">
         <img src="https://img.shields.io/badge/style-lint-4BC0F5.svg?color=teal"/> 
     </a>

version.txt

@@ -1,2 +1,2 @@
-versionName=0.2.5
-versionCode=2006
+versionName=0.2.6
+versionCode=2007