Minor bugfixes

Fix empty Google Authenticator Export window in case of locked OTP db Fix UI issues in Google Authenticator Export Closes #100
Rookiestyle · Feb 21, 2022 · eb44f1d · eb44f1d
1 parent a1aed0a
commit eb44f1d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/...eAuthenticatorExportSelection.Designer.cs → ...eAuthenticatorExportSelection.Designer.cs b/...eAuthenticatorExportSelection.Designer.cs → ...eAuthenticatorExportSelection.Designer.cs
diff --git a/...ort/GoogleAuthenticatorExportSelection.cs → ...tor/GoogleAuthenticatorExportSelection.cs b/...ort/GoogleAuthenticatorExportSelection.cs → ...tor/GoogleAuthenticatorExportSelection.cs
@@ -114,9 +114,7 @@ private void lvEntries_ItemChecked(object sender, ItemCheckedEventArgs e)
 
 		private void GoogleAuthenticatorImportSelection_Shown(object sender, EventArgs e)
 		{
-			chGroup.Width = chEntry.Width = lvEntries.ClientSize.Width / 2;
-			lvEntries.Height = ClientSize.Height - pDesc.Height - pButtons.Height - Padding.Top - Padding.Bottom;
-			lvEntries.Width = ClientSize.Width - Padding.Left - Padding.Right;
+			lvEntries.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent);
 
 			if (bSelectAll.Width > bDeselectAll.Width) bDeselectAll.Width = bSelectAll.Width;
 			if (bDeselectAll.Width > bSelectAll.Width) bSelectAll.Width = bDeselectAll.Width;

diff --git a/...icatorImport/GoogleAuthenticatorImport.cs → ...uthenticator/GoogleAuthenticatorImport.cs b/...icatorImport/GoogleAuthenticatorImport.cs → ...uthenticator/GoogleAuthenticatorImport.cs
diff --git a/...eAuthenticatorImportSelection.Designer.cs → ...eAuthenticatorImportSelection.Designer.cs b/...eAuthenticatorImportSelection.Designer.cs → ...eAuthenticatorImportSelection.Designer.cs
diff --git a/...ort/GoogleAuthenticatorImportSelection.cs → ...tor/GoogleAuthenticatorImportSelection.cs b/...ort/GoogleAuthenticatorImportSelection.cs → ...tor/GoogleAuthenticatorImportSelection.cs
diff --git a/src/KeePassOTP.csproj b/src/KeePassOTP.csproj
@@ -66,17 +66,17 @@
     <Compile Include="DAO\OTPDAO_DB.cs" />
     <Compile Include="DAO\OTPDAO_Entry.cs" />
     <Compile Include="DAO\OTPDAO.cs" />
-    <Compile Include="GoogleAuthenticatorImport\GoogleAuthenticatorImport.cs" />
-    <Compile Include="GoogleAuthenticatorImport\GoogleAuthenticatorExportSelection.cs">
+    <Compile Include="GoogleAuthenticator\GoogleAuthenticatorImport.cs" />
+    <Compile Include="GoogleAuthenticator\GoogleAuthenticatorExportSelection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GoogleAuthenticatorImport\GoogleAuthenticatorExportSelection.Designer.cs">
+    <Compile Include="GoogleAuthenticator\GoogleAuthenticatorExportSelection.Designer.cs">
       <DependentUpon>GoogleAuthenticatorExportSelection.cs</DependentUpon>
     </Compile>
-    <Compile Include="GoogleAuthenticatorImport\GoogleAuthenticatorImportSelection.cs">
+    <Compile Include="GoogleAuthenticator\GoogleAuthenticatorImportSelection.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GoogleAuthenticatorImport\GoogleAuthenticatorImportSelection.Designer.cs">
+    <Compile Include="GoogleAuthenticator\GoogleAuthenticatorImportSelection.Designer.cs">
       <DependentUpon>GoogleAuthenticatorImportSelection.cs</DependentUpon>
     </Compile>
     <Compile Include="HotkeyManager.cs" />

diff --git a/src/KeePassOTPExt.cs b/src/KeePassOTPExt.cs
@@ -966,6 +966,7 @@ private void OnGoogleAuthenticatorExport(object sender, EventArgs e)
 				m_host.Database.RootGroup.TraverseTree(TraversalMethod.PreOrder, null, eh);
 
 				lMsg.Add("Exportable entries: " + dEntries.Where(x => x.Value != null).Count().ToString());
+				if (dEntries.Count == 0) return;
 
 				using (var selForm = new GoogleAuthenticatorExportSelection())
 				{

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3")]
-[assembly: AssemblyFileVersion("1.3")]
+[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyFileVersion("1.3.1")]
diff --git a/version.info b/version.info
@@ -1,5 +1,5 @@
 :
-KeePassOTP:1.3
+KeePassOTP:1.3.1
 KeePassOTP!de:23
 KeePassOTP!fr:7
 KeePassOTP!nl:3