wbrawner/Simple-Gallery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply the pattern protection to temporarily showing hidden folders too

Browse source
This commit is contained in:
tibbi 2017-07-29 21:56:45 +02:00
parent 2b518ec4f2
commit f789ecdf02
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
View file

@ -97,8 +97,8 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
R.id.sort -> showSortingDialog()
R.id.open_camera -> launchCamera()
R.id.show_all -> showAllMedia()
R.id.temporarily_show_hidden -> toggleTemporarilyShowHidden(true)
R.id.stop_showing_hidden -> toggleTemporarilyShowHidden(false)
R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden(true)
R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden(false)
R.id.increase_column_count -> increaseColumnCount()
R.id.reduce_column_count -> reduceColumnCount()
R.id.settings -> launchSettings()
@ -210,6 +210,16 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
finish()
}
private fun tryToggleTemporarilyShowHidden(show: Boolean) {
if (config.temporarilyShowHidden) {
toggleTemporarilyShowHidden(show)
} else {
handleHiddenFolderPasswordProtection {
toggleTemporarilyShowHidden(show)
}
}
}
private fun toggleTemporarilyShowHidden(show: Boolean) {
config.temporarilyShowHidden = show
getDirectories()

14
app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
View file

@ -216,8 +216,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
R.id.hide_folder -> tryHideFolder()
R.id.unhide_folder -> unhideFolder()
R.id.exclude_folder -> tryExcludeFolder()
R.id.temporarily_show_hidden -> toggleTemporarilyShowHidden(true)
R.id.stop_showing_hidden -> toggleTemporarilyShowHidden(false)
R.id.temporarily_show_hidden -> tryToggleTemporarilyShowHidden(true)
R.id.stop_showing_hidden -> tryToggleTemporarilyShowHidden(false)
R.id.increase_column_count -> increaseColumnCount()
R.id.reduce_column_count -> reduceColumnCount()
R.id.settings -> launchSettings()
@ -316,6 +316,16 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
false
}
private fun tryToggleTemporarilyShowHidden(show: Boolean) {
if (config.temporarilyShowHidden) {
toggleTemporarilyShowHidden(show)
} else {
handleHiddenFolderPasswordProtection {
toggleTemporarilyShowHidden(show)
}
}
}
private fun toggleTemporarilyShowHidden(show: Boolean) {
config.temporarilyShowHidden = show
getMedia()

3
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
View file

@ -89,7 +89,8 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
}
if (intent.extras?.containsKey(IS_VIEW_INTENT) == true) {
config.temporarilyShowHidden = true
if (!config.isPasswordProtectionOn)
config.temporarilyShowHidden = true
}
showSystemUI()