revisit how volumes keys are accessed

mhogomchungu · Sep 18, 2024 · bf6df83 · bf6df83
1 parent 207581f
commit bf6df83
Show file tree

Hide file tree

Showing 12 changed files with 589 additions and 377 deletions.
diff --git a/src/engines.h b/src/engines.h
@@ -46,7 +46,8 @@ class engines
 	static QStringList executableSearchPaths() ;
 	static QStringList executableSearchPaths( const engines::engine& ) ;
 
-	class engineVersion{
+	class engineVersion
+	{
 	public:
 		engineVersion() ;
 		engineVersion( int major,int minor,int patch ) ;

diff --git a/src/favorites2.cpp b/src/favorites2.cpp
@@ -594,7 +594,7 @@ favorites2::favorites2( QWidget * parent,
 
 			this->hide() ;
 
-			m_secrets.changeInternalWalletPassword( a,b,[ this ]( bool s ){
+			m_secrets.changeInternalWalletPassword( this,a,b,[ this ]( bool s ){
 
 				if( s ){
 
@@ -608,7 +608,7 @@ favorites2::favorites2( QWidget * parent,
 
 			this->hide() ;
 
-			m_secrets.changeWindowsDPAPIWalletPassword( a,b,[ this ]( bool s ){
+			m_secrets.changeWindowsDPAPIWalletPassword( this,a,b,[ this ]( bool s ){
 
 				if( s ){
 
@@ -880,29 +880,60 @@ void favorites2::walletBkChanged( LXQt::Wallet::BackEnd bk )
 
 	m_wallet = m_secrets.walletBk( bk ) ;
 
-	m_wallet.open( [ this ](){
+	class meaw
+	{
+	public:
+		meaw( favorites2 * parent,LXQt::Wallet::BackEnd s ) :
+			m_parent( *parent ),
+			m_showAndHide( this->showAndHide( s ) )
+		{
+		}
+		void opened()
+		{
+			auto& m = *this ;
 
-		for( const auto& it : this->readAllKeys() ){
+			m( true ) ;
+		}
+		void before()
+		{
+			if( m_showAndHide ){
 
-			tablewidget::addRow( m_ui->tableWidgetWallet,{ it } ) ;
+				m_parent.hide() ;
+			}
+		}
+		void after()
+		{
 		}
+		void operator()( bool e )
+		{
+			if( e ){
 
-	},_hide_ui( [ this ](){ this->hide() ; },bk ),[ this ]( bool opened ){
+				for( const auto& it : m_parent.readAllKeys() ){
 
-		if( opened ){
+					tablewidget::addRow( m_parent.m_ui->tableWidgetWallet,{ it } ) ;
+				}
+			}else{
+				m_parent.m_ui->lineEditVolumePath->clear() ;
 
-			for( const auto& it : this->readAllKeys() ){
+				m_parent.setControlsAvailability( false,true ) ;
+			}
+			if( m_showAndHide ){
 
-				tablewidget::addRow( m_ui->tableWidgetWallet,{ it } ) ;
+				m_parent.show() ;
 			}
-		}else{
-			m_ui->lineEditVolumePath->clear() ;
+		}
+	private:
+		bool showAndHide( LXQt::Wallet::BackEnd m )
+		{
+			using bk = LXQt::Wallet::BackEnd ;
 
-			this->setControlsAvailability( false,true ) ;
+			return m == bk::internal || m == bk::windows_dpapi ;
 		}
+		favorites2& m_parent ;
+		bool m_showAndHide ;
+	} ;
 
-		this->show() ;
-	} ) ;
+	m_wallet.open( meaw( this,bk ) ) ;
 }
 
 void favorites2::setControlsAvailability( bool e,bool m )

diff --git a/src/favorites2.h b/src/favorites2.h
@@ -119,7 +119,7 @@ private :
 	void setMenu( QMenu& ) ;
 	void folderPath( void ) ;
 	void filePath( void ) ;
-	void mountPointPath( void ) ;
+	void mountPointPath() ;
 	void currentItemChanged( QTableWidgetItem * current,QTableWidgetItem * previous ) ;
 	void itemClicked( QTableWidgetItem * current,bool ) ;
 	void itemClicked( QTableWidgetItem * current ) ;
@@ -128,7 +128,7 @@ private :
 	void setVolumeProperties( utility2::result_ref< const favorites::entry& > e ) ;
 	void clearVolumeProperties() ;
 	void ShowUI() ;
-	void HideUI( void ) ;
+	void HideUI() ;
 	void checkFavoritesConsistency() ;
 	void setUiLikeSsh( const QString& cipherPath,const engines::engine& engine ) ;
 	void setDefaultUI( const engines::engine& ) ;
@@ -154,8 +154,8 @@ private :
 	QString m_cipherPath ;
 	QString m_keyFilePath ;
 
-	class wallet{
-
+	class wallet
+	{
 	public:
 		void operator=( secrets::wallet s )
 		{