Merge PR #928.

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.
 

android/app/src/main/AndroidManifest.xml

@@ -62,6 +62,10 @@
             android:exported="true"
             android:targetActivity=".MainActivity">
 
+            <meta-data
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>

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),
+    filevers=(6, 1, 1, 0),
-    prodvers=(6, 0, 3, 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.0.3-dev.0'),
+        StringStruct('FileVersion', '6.1.1-dev.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.0.3-dev.0')])
+        StringStruct('ProductVersion', '6.1.1-dev.0')])
       ]),
     VarFileInfo([VarStruct('Translation', [1033, 1200])])
   ]

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: [

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),
               ),
             ),

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...",

lib/version.dart

@@ -1,5 +1,5 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // This file is generated by running ./set-version.py <version> <build>
 
-const String version = '6.0.3-dev.0';
+const String version = '6.1.1-dev.0';
-const int build = 60009;
+const int build = 60101;

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.

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 <version>
 # DO NOT MANUALLY EDIT THIS!
-version: 6.0.3-dev.0+60009
+version: 6.1.1-dev.0+60101
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

resources/win/release-win.ps1

@@ -1,4 +1,4 @@
-$version="6.0.3-dev.0"
+$version="6.1.1-dev.0"
 
 echo "Clean-up of old files"
 rm *.msi

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
+#endif    // not APSTUDIO_INVOKED