Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61afcb19 authored by tibbi's avatar tibbi
Browse files

adding a new string about Moving disabled from the recycle bin

parent cb9b5ca0

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 21

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '5.2.11'

        propVersionName = '5.2.13'

        kotlin_version = '1.2.71'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt

+12 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 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
@@ -49,7 +50,17 @@ 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

    }



    return finalPath

}

commons/src/main/res/values-ar/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ 
    <string name="files_restored_successfully">Files have been restored successfully</string>

    <string name="empty_recycle_bin_confirmation">Are you sure you want to empty the Recycle Bin? The files will be permanently lost.</string>

    <string name="recycle_bin_empty">The Recycle Bin is 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">

        <item quantity="one">Moving %d item into the Recycle Bin</item>

commons/src/main/res/values-az/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ 
    <string name="files_restored_successfully">Fayllar uğurla geri qaytarıldı</string>

    <string name="empty_recycle_bin_confirmation">Zibil qutusunu boşaltmaq istədiyinizə əminsiniz? Fayllar tamamilə itiriləcək.</string>

    <string name="recycle_bin_empty">Zibil qutusu boşdur</string>

    <string name="moving_recycle_bin_items_disabled">Moving Recycle bin items is disabled, please use Restore</string>



    <plurals name="moving_items_into_bin">

        <item quantity="one">Moving %d item into the Recycle Bin</item>

commons/src/main/res/values-br/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ 
    <string name="files_restored_successfully">Files have been restored successfully</string>

    <string name="empty_recycle_bin_confirmation">Are you sure you want to empty the Recycle Bin? The files will be permanently lost.</string>

    <string name="recycle_bin_empty">The Recycle Bin is 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">

        <item quantity="one">Moving %d item into the Recycle Bin</item>