From 1d0d0b4f5d8f4c8345b901f98243cc9dc8a5d2a3 Mon Sep 17 00:00:00 2001 From: ereio Date: Fri, 24 Dec 2021 11:09:06 -0500 Subject: [PATCH 1/2] chore: fix drone, needs login name? --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 12810b4d9..f22c8ac82 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,7 +45,7 @@ steps: commands: # Modify the existing release and add the android apk - go install code.gitea.io/tea@latest - - tea login add -u https://git.syphon.org + - tea login add -u https://git.syphon.org -n syphon - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-android" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-nightly-android" --asset ./syphon.nightly.android.apk --- @@ -97,7 +97,7 @@ steps: commands: # Modify the existing release and add the android apk - go install code.gitea.io/tea@latest - - tea login add -u https://git.syphon.org + - tea login add -u https://git.syphon.org -n syphon - tea release create --tag "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-android" --target ${DRONE_COMMIT_SHA} --repo syphon-org/syphon --title "${DRONE_BRANCH}-$(echo $DRONE_COMMIT_SHA | cut -c1-7)-android" --asset ./syphon.$(echo $DRONE_COMMIT_SHA | cut -c1-7).android.apk --- kind: pipeline From ab576277d9538888c604e8b4e38214bf4ca83114 Mon Sep 17 00:00:00 2001 From: ereio Date: Mon, 27 Dec 2021 11:54:34 -0500 Subject: [PATCH 2/2] fix: screen lock issue, bumping to 0.2.6 (2007), updated changelogs and version.txt --- changelog.md | 12 +++++++- .../android/en-US/changelogs/2007.txt | 28 +++++++++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 9 ++++-- ios/Runner/Info.plist | 2 +- lib/storage/index.dart | 6 ---- .../settings/settings-privacy-screen.dart | 1 + lib/views/intro/lock-screen.dart | 3 +- .../modal-lock-overlay/lock-controller.dart | 15 +++++----- .../modal-lock-overlay/lock-overlay.dart | 4 +-- pubspec.yaml | 2 +- version.txt | 4 +-- 11 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/2007.txt diff --git a/changelog.md b/changelog.md index b734315bd..1d695bbcf 100644 --- a/changelog.md +++ b/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 diff --git a/fastlane/metadata/android/en-US/changelogs/2007.txt b/fastlane/metadata/android/en-US/changelogs/2007.txt new file mode 100644 index 000000000..d0124c33d --- /dev/null +++ b/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! diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index c94377932..bfe95a660 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/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"; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 1f481db3f..62970f140 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleURLTypes diff --git a/lib/storage/index.dart b/lib/storage/index.dart index a9a564626..a26b38f69 100644 --- a/lib/storage/index.dart +++ b/lib/storage/index.dart @@ -173,16 +173,10 @@ loadStorageAsync(StorageDatabase storage, Store 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()); } diff --git a/lib/views/home/settings/settings-privacy-screen.dart b/lib/views/home/settings/settings-privacy-screen.dart index 1639e515d..c5bbf5e74 100644 --- a/lib/views/home/settings/settings-privacy-screen.dart +++ b/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(); }, ); } diff --git a/lib/views/intro/lock-screen.dart b/lib/views/intro/lock-screen.dart index 028185a61..5a7d5a7af 100644 --- a/lib/views/intro/lock-screen.dart +++ b/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 with Lifecycle { }, onUnlocked: (String pin) { Prelock.toggleLocked(context, pin); + Navigator.of(context).pop(); }); } diff --git a/lib/views/widgets/modals/modal-lock-overlay/lock-controller.dart b/lib/views/widgets/modals/modal-lock-overlay/lock-controller.dart index f06378e53..5048b7476 100644 --- a/lib/views/widgets/modals/modal-lock-overlay/lock-controller.dart +++ b/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 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 Function(String input) onVerifyInput, }) { loadingController = StreamController.broadcast(); @@ -111,7 +112,7 @@ class LockController { confirmedController = StreamController.broadcast(); _onVerifyInput = onVerifyInput; - _isConfirmed = isConfirmed; + _isConfirmMode = isConfirmMode; _maxLength = maxLength; } diff --git a/lib/views/widgets/modals/modal-lock-overlay/lock-overlay.dart b/lib/views/widgets/modals/modal-lock-overlay/lock-overlay.dart index 3c35880e0..a1257a877 100644 --- a/lib/views/widgets/modals/modal-lock-overlay/lock-overlay.dart +++ b/lib/views/widgets/modals/modal-lock-overlay/lock-overlay.dart @@ -161,9 +161,9 @@ class _LockOverlayState extends State { 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 { ); } - if (unlocking) return; + if (unlocking || widget.confirmMode) return; unlocking = true; diff --git a/pubspec.yaml b/pubspec.yaml index efc699a0c..31c58e710 100644 --- a/pubspec.yaml +++ b/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" diff --git a/version.txt b/version.txt index e8049c701..5fffdc879 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -versionName=0.2.5 -versionCode=2006 +versionName=0.2.6 +versionCode=2007