Browse Source

making final changes before a new release

pull/186/head
mhogomchungu 7 months ago
parent
commit
401ea3e7c9
  1. 5
      changelog
  2. 2
      rpm/sirikali.spec
  3. 4
      src/engines/cryptomator.cpp
  4. 2
      src/sirikali.appdata.xml
  5. 20
      src/sirikali.cpp
  6. 31
      src/sirikali.h

5
changelog

@ -257,13 +257,12 @@ version 1.4.2(December 18,2019)
-- Add explicit support for extensions that do not use cipher path and use "google-drive-ocamlfuse"
as a reference program.
version 1.4.8(unreleased)
version 1.4.8(December 01,2020)
[ALL]
-- Mounting items in Favorites now respects Re Use Mount Point setting.
[LINUX]
-- Add cryptomator CLI backend(https://github.com/cryptomator/cli). SiriKali expects the backend
to be FUSE based and named simply "cryptomator-cli".
-- Add cryptomator CLI backend(https://github.com/mhogomchungu/cli).
-- Kwallet now works when it was not build in at compile time by accessing it through dbus.
-- Only show volumes unlocked by the current user by default.

2
rpm/sirikali.spec

@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
Name: SiriKali
Version: 1.4.7
Version: 1.4.8
Release: 0
Summary: SiriKali is a Qt/C++ GUI front end to fscrypt,encfs,cryfs,gocryptfs,ecryptfs and securefs.
License: GPL-2.0+

4
src/engines/cryptomator.cpp

@ -57,14 +57,14 @@ static engines::engine::BaseOptions _setOptions()
s.volumePropertiesCommands = QStringList{} ;
s.windowsUnMountCommand = QStringList{} ;
s.configFileNames = QStringList{ "masterkey.cryptomator" } ;
s.fuseNames = QStringList{ "fuse.cryptomator" } ;
s.fuseNames = QStringList{ "fuse.Cryptomator" } ;
s.names = QStringList{ "cryptomator" } ;
s.failedToMountList = QStringList{ " ERROR ","Exception","fuse: unknown option" } ;
s.successfulMountedList = QStringList{ "Mounted to" } ;
s.unMountCommand = QStringList{ "fusermount","-u","%{mountPoint}" } ;
s.notFoundCode = engines::engine::status::engineExecutableNotFound ;
s.versionInfo = { { "--version",true,0,0 } } ;
s.versionMinimum = "0.5.0" ;
s.versionMinimum = "0.4.5" ;
s.mountControlStructure = "--foreground --vault %{cipherFolder} --fusemount %{mountPoint} --mountFlags %{fuseOpts}" ;
s.createControlStructure = "" ;

2
src/sirikali.appdata.xml

@ -34,7 +34,7 @@
</screenshots>
<releases>
<!-- Get timestamp with 'date +%s' -->
<release version="1.4.6" timestamp="1601526348"></release>
<release version="1.4.7" timestamp="1601526348"></release>
<release version="1.4.6" timestamp="1596453789"></release>
<release version="1.4.5" timestamp="1596304029"></release>
<release version="1.4.4" timestamp="1590982845"></release>

20
src/sirikali.cpp

@ -783,7 +783,7 @@ void sirikali::startGUI( const QString& volume )
this->startGUI( volume,m ) ;
}else{
this->disableAll_1() ;
this->disableAll() ;
this->showMainWindow() ;
@ -2210,7 +2210,7 @@ void sirikali::emergencyShutDown()
void sirikali::unMountAll()
{
m_mountInfo.announceEvents( false ) ;
m_allowEnableAll.setFalse() ;
m_allowEnableAll.setFalse( 2020 ) ;
this->disableAll() ;
@ -2238,7 +2238,7 @@ void sirikali::unMountAll()
}
}
m_allowEnableAll.setTrue() ;
m_allowEnableAll.setTrue( 2020 ) ;
this->updateList() ;
@ -2299,21 +2299,15 @@ void sirikali::slotCurrentItemChanged( QTableWidgetItem * current,QTableWidgetIt
void sirikali::disableAll()
{
m_ui->pbmenu->setEnabled( false ) ;
m_ui->pbupdate->setEnabled( false ) ;
m_ui->tableWidget->setEnabled( false ) ;
m_ui->pbunlockvolume->setEnabled( false ) ;
m_ui->pbcreate->setEnabled( false ) ;
m_ui->pbFavorites->setEnabled( false ) ;
}
void sirikali::disableAll_1()
{
m_ui->pbmenu->setEnabled( false ) ;
//m_ui->pbupdate->setEnabled( false ) ;
m_ui->tableWidget->setEnabled( false ) ;
m_ui->pbunlockvolume->setEnabled( false ) ;
m_ui->pbcreate->setEnabled( false ) ;
m_ui->pbFavorites->setEnabled( false ) ;
if( !utility::miscOptions::instance().starting() ){
m_ui->pbupdate->setEnabled( false ) ;
}
}
void sirikali::enableAll()

31
src/sirikali.h

@ -156,7 +156,6 @@ private:
void updateList( const volumeInfo& ) ;
void setUpAppMenu( void ) ;
void disableAll( void ) ;
void disableAll_1( void ) ;
void closeEvent( QCloseEvent * e ) ;
void setUpFont( void ) ;
void setUpShortCuts( void ) ;
@ -243,15 +242,37 @@ private:
{
return m_allowEnableAll ;
}
void setTrue()
void setTrue( int token = -1 )
{
m_allowEnableAll = true ;
/*
* Only the person who knows the token can uset the option.
* Normal users set token of -1, super users set higher number tokens.
*/
if( token == m_token ){
m_token = -1 ;
m_allowEnableAll = true ;
}
}
void setFalse()
void setFalse( int token = -1 )
{
m_allowEnableAll = false ;
if( token != -1 && m_token != -1 ){
utility::debug() << "Warning: Two users with super token just collided" ;
return ;
}
/*
* Option can be changed only if token is unset or set by normal user.
*/
if( m_token == -1 ){
m_token = token ;
m_allowEnableAll = false ;
}
}
private:
int m_token = -1 ;
bool m_allowEnableAll = true ;
} m_allowEnableAll ;
};

Loading…
Cancel
Save