From f5b381ddc0090b4bdb8e4822e83d64066ac43de6 Mon Sep 17 00:00:00 2001 From: Adam Velebil Date: Mon, 23 Jan 2023 08:23:14 +0100 Subject: [PATCH 1/6] bump version to 6.1.0+60100 --- helper/version_info.txt | 8 ++++---- lib/version.dart | 4 ++-- pubspec.yaml | 2 +- resources/win/release-win.ps1 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helper/version_info.txt b/helper/version_info.txt index ba984521..97de108d 100755 --- a/helper/version_info.txt +++ b/helper/version_info.txt @@ -6,8 +6,8 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(6, 0, 3, 0), - prodvers=(6, 0, 3, 0), + filevers=(6, 1, 0, 0), + prodvers=(6, 1, 0, 0), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. @@ -31,11 +31,11 @@ VSVersionInfo( '040904b0', [StringStruct('CompanyName', 'Yubico'), StringStruct('FileDescription', 'Yubico Authenticator Helper'), - StringStruct('FileVersion', '6.0.3-dev.0'), + StringStruct('FileVersion', '6.1.0'), StringStruct('LegalCopyright', 'Copyright (c) 2022 Yubico AB'), StringStruct('OriginalFilename', 'authenticator-helper.exe'), StringStruct('ProductName', 'Yubico Authenticator'), - StringStruct('ProductVersion', '6.0.3-dev.0')]) + StringStruct('ProductVersion', '6.1.0')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/lib/version.dart b/lib/version.dart index 530603bd..e8529d37 100755 --- a/lib/version.dart +++ b/lib/version.dart @@ -1,5 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND // This file is generated by running ./set-version.py -const String version = '6.0.3-dev.0'; -const int build = 60009; +const String version = '6.1.0'; +const int build = 60100; diff --git a/pubspec.yaml b/pubspec.yaml index 9a8bc39e..b1bf17bd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # This field is updated by running ./set-version.py # DO NOT MANUALLY EDIT THIS! -version: 6.0.3-dev.0+60009 +version: 6.1.0+60100 environment: sdk: ">=2.17.0 <3.0.0" diff --git a/resources/win/release-win.ps1 b/resources/win/release-win.ps1 index a47ed83e..14abb764 100644 --- a/resources/win/release-win.ps1 +++ b/resources/win/release-win.ps1 @@ -1,4 +1,4 @@ -$version="6.0.3-dev.0" +$version="6.1.0" echo "Clean-up of old files" rm *.msi From 801540263fea86ab34b2cf5ccce4fe6041a7eb62 Mon Sep 17 00:00:00 2001 From: Adam Velebil Date: Mon, 23 Jan 2023 09:39:57 +0100 Subject: [PATCH 2/6] update copyright --- helper/version_info.txt | 2 +- lib/about_page.dart | 3 --- macos/Runner/Configs/AppInfo.xcconfig | 2 +- windows/runner/Runner.rc | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/helper/version_info.txt b/helper/version_info.txt index 97de108d..6515059a 100755 --- a/helper/version_info.txt +++ b/helper/version_info.txt @@ -32,7 +32,7 @@ VSVersionInfo( [StringStruct('CompanyName', 'Yubico'), StringStruct('FileDescription', 'Yubico Authenticator Helper'), StringStruct('FileVersion', '6.1.0'), - StringStruct('LegalCopyright', 'Copyright (c) 2022 Yubico AB'), + StringStruct('LegalCopyright', 'Copyright (c) Yubico'), StringStruct('OriginalFilename', 'authenticator-helper.exe'), StringStruct('ProductName', 'Yubico Authenticator'), StringStruct('ProductVersion', '6.1.0')]) diff --git a/lib/about_page.dart b/lib/about_page.dart index 96b2dab0..ebac783a 100755 --- a/lib/about_page.dart +++ b/lib/about_page.dart @@ -57,9 +57,6 @@ class AboutPage extends ConsumerWidget { ), const Text(version), const Text(''), - const Text('Copyright © 2022 Yubico'), - const Text('All rights reserved'), - const Text(''), Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 02f3e9f6..e87353ff 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -11,4 +11,4 @@ PRODUCT_NAME = Yubico Authenticator PRODUCT_BUNDLE_IDENTIFIER = com.yubico.yubioath // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2021 Yubico. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © Yubico. All rights reserved. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index 0e32677c..47fc6d79 100755 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -93,7 +93,7 @@ BEGIN VALUE "FileDescription", "Yubico Authenticator" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "authenticator" "\0" - VALUE "LegalCopyright", "Copyright (C) 2022 Yubico. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) Yubico. All rights reserved." "\0" VALUE "OriginalFilename", "authenticator.exe" "\0" VALUE "ProductName", "Yubico Authenticator" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" @@ -118,4 +118,4 @@ END ///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED \ No newline at end of file +#endif // not APSTUDIO_INVOKED From 8acfda79cee41014edc93b4f45ea989cc075d647 Mon Sep 17 00:00:00 2001 From: Dain Nilsson Date: Mon, 23 Jan 2023 11:26:45 +0100 Subject: [PATCH 3/6] Add tooltip to "Configure YubiKey" button. --- lib/app/views/app_page.dart | 3 +++ lib/l10n/app_en.arb | 1 + 2 files changed, 4 insertions(+) diff --git a/lib/app/views/app_page.dart b/lib/app/views/app_page.dart index 8b0430ba..ba062822 100755 --- a/lib/app/views/app_page.dart +++ b/lib/app/views/app_page.dart @@ -15,6 +15,7 @@ */ import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import '../../widgets/delayed_visibility.dart'; import '../message.dart'; @@ -124,6 +125,8 @@ class AppPage extends StatelessWidget { }, icon: const Icon(Icons.tune), iconSize: 24, + tooltip: + AppLocalizations.of(context)!.general_configure_yubikey, padding: const EdgeInsets.all(12), ), ), diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index a7362496..63332f39 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -116,6 +116,7 @@ "general_nfc": "NFC", "general_setup": "Setup", "general_manage": "Manage", + "general_configure_yubikey": "Configure YubiKey", "fido_press_fingerprint_begin": "Press your finger against the YubiKey to begin.", "fido_keep_touching_yubikey": "Keep touching your YubiKey repeatedly...", From 0c87036519bb6a4e7f7322945381eb2167bac784 Mon Sep 17 00:00:00 2001 From: Adam Velebil Date: Mon, 23 Jan 2023 16:29:57 +0100 Subject: [PATCH 4/6] add metadata to activity alias --- android/app/src/main/AndroidManifest.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index dc52042a..3ec2600d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -62,6 +62,10 @@ android:exported="true" android:targetActivity=".MainActivity"> + + From 5c0cb7e627c666e11a0067d9b86c6c2d6ba6d3af Mon Sep 17 00:00:00 2001 From: Dain Nilsson Date: Wed, 25 Jan 2023 09:15:19 +0100 Subject: [PATCH 5/6] Update NEWS. --- NEWS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 17fc474d..b0ee91b8 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +* Version 6.1.0 (released 2023-01-25) + ** UI: Split Configuration and Device Picker into two buttons. + ** OATH: Avoid truncation of account issuer/name in dialog view. + ** Android: Add option to disable NFC sounds. + ** Android: Add "launch on USB" setting, though it blocks other apps from accessing the key over USB. + ** Desktop: Fix timeout waiting for helper process to start. + ** Desktop: Fix handling of unrecoverable keyring data. + ** Desktop: Explicitly set UTF-8 encoding for passing data to/from the helper. + * Version 6.0.2b (released 2022-12-14) ** Linux: Fix compatibility with older glibc versions. From 898cc0c008a7770aed840add8c3f2d223aad05d5 Mon Sep 17 00:00:00 2001 From: Dain Nilsson Date: Wed, 25 Jan 2023 09:34:45 +0100 Subject: [PATCH 6/6] Bump version to 6.1.1-dev.0 --- helper/version_info.txt | 8 ++++---- lib/version.dart | 4 ++-- pubspec.yaml | 2 +- resources/win/release-win.ps1 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helper/version_info.txt b/helper/version_info.txt index 6515059a..36eee451 100755 --- a/helper/version_info.txt +++ b/helper/version_info.txt @@ -6,8 +6,8 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(6, 1, 0, 0), - prodvers=(6, 1, 0, 0), + filevers=(6, 1, 1, 0), + prodvers=(6, 1, 1, 0), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. @@ -31,11 +31,11 @@ VSVersionInfo( '040904b0', [StringStruct('CompanyName', 'Yubico'), StringStruct('FileDescription', 'Yubico Authenticator Helper'), - StringStruct('FileVersion', '6.1.0'), + StringStruct('FileVersion', '6.1.1-dev.0'), StringStruct('LegalCopyright', 'Copyright (c) Yubico'), StringStruct('OriginalFilename', 'authenticator-helper.exe'), StringStruct('ProductName', 'Yubico Authenticator'), - StringStruct('ProductVersion', '6.1.0')]) + StringStruct('ProductVersion', '6.1.1-dev.0')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/lib/version.dart b/lib/version.dart index e8529d37..288f3155 100755 --- a/lib/version.dart +++ b/lib/version.dart @@ -1,5 +1,5 @@ // GENERATED CODE - DO NOT MODIFY BY HAND // This file is generated by running ./set-version.py -const String version = '6.1.0'; -const int build = 60100; +const String version = '6.1.1-dev.0'; +const int build = 60101; diff --git a/pubspec.yaml b/pubspec.yaml index b1bf17bd..0a40f141 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # This field is updated by running ./set-version.py # DO NOT MANUALLY EDIT THIS! -version: 6.1.0+60100 +version: 6.1.1-dev.0+60101 environment: sdk: ">=2.17.0 <3.0.0" diff --git a/resources/win/release-win.ps1 b/resources/win/release-win.ps1 index 14abb764..ecd7e445 100644 --- a/resources/win/release-win.ps1 +++ b/resources/win/release-win.ps1 @@ -1,4 +1,4 @@ -$version="6.1.0" +$version="6.1.1-dev.0" echo "Clean-up of old files" rm *.msi