kagura/SimpleFileManager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: paste

Browse source
This commit is contained in:
Kagura 2024-10-20 15:08:21 +08:00
parent eacb4abddd
commit de105d7cb7
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/dazuoye/filemanager/music_page.kt
View file

@ -25,6 +25,7 @@ import com.dazuoye.filemanager.fileSystem.adapters.MusicModel
import com.dazuoye.filemanager.compose.SearchActivity import com.dazuoye.filemanager.compose.SearchActivity
import com.dazuoye.filemanager.fileSystem.CutHelper import com.dazuoye.filemanager.fileSystem.CutHelper
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister.Companion.instance import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister.Companion.instance
import com.dazuoye.filemanager.utils.AlertHelper import com.dazuoye.filemanager.utils.AlertHelper
import com.dazuoye.filemanager.utils.ClipHelper import com.dazuoye.filemanager.utils.ClipHelper
@ -150,7 +151,7 @@ class music_page : AppCompatActivity() {
} }
val name = uri.path?.split('/')?.last() ?: "somePastedItem" val name = uri.path?.split('/')?.last() ?: "somePastedItem"
val ext = name.split('.').last() val ext = name.split('.').last()
if (!"$ext.".matches(DocumentLister.regex)) { if (!"$ext.".matches(MusicLister.regex)) {
Toast.makeText(this, getString(R.string.error_nothing_to_paste), Toast.LENGTH_SHORT) Toast.makeText(this, getString(R.string.error_nothing_to_paste), Toast.LENGTH_SHORT)
.show() .show()
return@showItemAlert return@showItemAlert

3
app/src/main/java/com/dazuoye/filemanager/picture_page.kt
View file

@ -24,6 +24,7 @@ import com.dazuoye.filemanager.fileSystem.adapters.ImageModel
import com.dazuoye.filemanager.compose.SearchActivity import com.dazuoye.filemanager.compose.SearchActivity
import com.dazuoye.filemanager.fileSystem.CutHelper import com.dazuoye.filemanager.fileSystem.CutHelper
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister.Companion.instance import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister.Companion.instance
import com.dazuoye.filemanager.utils.AlertHelper import com.dazuoye.filemanager.utils.AlertHelper
import com.dazuoye.filemanager.utils.ClipHelper import com.dazuoye.filemanager.utils.ClipHelper
@ -151,7 +152,7 @@ class picture_page : AppCompatActivity() {
} }
val name = uri.path?.split('/')?.last() ?: "somePastedItem" val name = uri.path?.split('/')?.last() ?: "somePastedItem"
val ext = name.split('.').last() val ext = name.split('.').last()
if (!"$ext.".matches(DocumentLister.regex)) { if (!"$ext.".matches(ImageLister.regex)) {
Toast.makeText(this, getString(R.string.error_nothing_to_paste), Toast.LENGTH_SHORT) Toast.makeText(this, getString(R.string.error_nothing_to_paste), Toast.LENGTH_SHORT)
.show() .show()
return@showItemAlert return@showItemAlert

3
app/src/main/java/com/dazuoye/filemanager/video_page.kt
View file

@ -24,6 +24,7 @@ import com.dazuoye.filemanager.fileSystem.adapters.VideoModel
import com.dazuoye.filemanager.compose.SearchActivity import com.dazuoye.filemanager.compose.SearchActivity
import com.dazuoye.filemanager.fileSystem.CutHelper import com.dazuoye.filemanager.fileSystem.CutHelper
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister
import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister.Companion.instance import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister.Companion.instance
import com.dazuoye.filemanager.utils.AlertHelper import com.dazuoye.filemanager.utils.AlertHelper
import com.dazuoye.filemanager.utils.ClipHelper import com.dazuoye.filemanager.utils.ClipHelper
@ -150,7 +151,7 @@ class video_page : AppCompatActivity() {
} }
val name = uri.path?.split('/')?.last() ?: "somePastedItem" val name = uri.path?.split('/')?.last() ?: "somePastedItem"
val ext = name.split('.').last() val ext = name.split('.').last()
if (!"$ext.".matches(DocumentLister.regex)) { if (!"$ext.".matches(VideoLister.regex)) {
Toast.makeText(this, getString(R.string.error_nothing_to_paste), Toast.LENGTH_SHORT) Toast.makeText(this, getString(R.string.error_nothing_to_paste), Toast.LENGTH_SHORT)
.show() .show()
return@showItemAlert return@showItemAlert