reverting a change related to Sd card detection
This commit is contained in:
parent
5f06385508
commit
fb8850d77f
3 changed files with 3 additions and 14 deletions
|
@ -7,7 +7,7 @@ buildscript {
|
|||
propMinSdkVersion = 21
|
||||
propTargetSdkVersion = propCompileSdkVersion
|
||||
propVersionCode = 1
|
||||
propVersionName = '5.2.13'
|
||||
propVersionName = '5.2.14'
|
||||
kotlin_version = '1.2.71'
|
||||
}
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ import android.os.Environment
|
|||
import android.provider.DocumentsContract
|
||||
import android.provider.MediaStore
|
||||
import android.text.TextUtils
|
||||
import android.widget.Toast
|
||||
import androidx.core.content.FileProvider
|
||||
import androidx.documentfile.provider.DocumentFile
|
||||
import com.simplemobiletools.commons.R
|
||||
|
@ -50,17 +49,7 @@ fun Context.getSDCardPath(): String {
|
|||
}
|
||||
|
||||
val finalPath = sdCardPath.trimEnd('/')
|
||||
|
||||
// /storage/emulated/0 should probably never be an SD card path, so if it is, and the internal storage path matches a pattern, flip them
|
||||
val fullSDpattern = Pattern.compile("^/storage/[A-Za-z0-9]{4}-[A-Za-z0-9]{4}$")
|
||||
toast("final $finalPath\nint $internalStoragePath \n${fullSDpattern.matcher(internalStoragePath).matches()}", Toast.LENGTH_LONG)
|
||||
if (finalPath == "/storage/emulated/0" && fullSDpattern.matcher(internalStoragePath).matches()) {
|
||||
baseConfig.sdCardPath = internalStoragePath
|
||||
baseConfig.internalStoragePath = finalPath
|
||||
} else {
|
||||
baseConfig.sdCardPath = finalPath
|
||||
}
|
||||
|
||||
baseConfig.sdCardPath = finalPath
|
||||
return finalPath
|
||||
}
|
||||
|
||||
|
|
|
@ -416,7 +416,7 @@
|
|||
<string name="recycle_bin_empty">回收桶是空的</string>
|
||||
<string name="moving_recycle_bin_items_disabled">Moving Recycle bin items is disabled, please use Restore</string>
|
||||
|
||||
<plurals name="moving_items_into_bin">
|
||||
<plurals name="moving_items_into_bin">
|
||||
<item quantity="one">正在移動%d個項目進回收桶</item>
|
||||
<item quantity="other">正在移動%d個項目進回收桶</item>
|
||||
</plurals>
|
||||
|
|
Loading…
Reference in a new issue