diff --git a/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt index d0a1c7c0..91c38c24 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt @@ -8,10 +8,20 @@ import net.lingala.zip4j.io.inputstream.ZipInputStream import net.lingala.zip4j.model.LocalFileHeader import org.fossify.commons.dialogs.EnterPasswordDialog import org.fossify.commons.dialogs.FilePickerDialog -import org.fossify.commons.extensions.* +import org.fossify.commons.extensions.createDirectorySync +import org.fossify.commons.extensions.getDoesFilePathExist +import org.fossify.commons.extensions.getFileOutputStreamSync +import org.fossify.commons.extensions.getFilenameFromPath +import org.fossify.commons.extensions.getMimeType +import org.fossify.commons.extensions.getParentPath +import org.fossify.commons.extensions.getRealPathFromURI +import org.fossify.commons.extensions.internalStoragePath +import org.fossify.commons.extensions.isGone +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.commons.extensions.viewBinding import org.fossify.commons.helpers.NavigationIcon import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.commons.helpers.isOreoPlus import org.fossify.filemanager.R import org.fossify.filemanager.adapters.DecompressItemsAdapter import org.fossify.filemanager.databinding.ActivityDecompressBinding @@ -247,7 +257,7 @@ class DecompressActivity : SimpleActivity() { passwordDialog = null } - val lastModified = if (isOreoPlus()) zipEntry.lastModifiedTime else 0 + val lastModified = zipEntry.lastModifiedTime val filename = zipEntry.fileName.removeSuffix("/") allFiles.add( ListItem( diff --git a/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt index 1eb423ce..ba9dd618 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt @@ -59,7 +59,6 @@ import org.fossify.commons.helpers.TAB_RECENT_FILES import org.fossify.commons.helpers.TAB_STORAGE_ANALYSIS import org.fossify.commons.helpers.VIEW_TYPE_GRID import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.commons.helpers.isOreoPlus import org.fossify.commons.helpers.isRPlus import org.fossify.commons.models.FAQItem import org.fossify.commons.models.RadioItem @@ -108,7 +107,7 @@ class MainActivity : SimpleActivity() { refreshMenuItems() mTabsToShow = getTabsList() - if (!config.wasStorageAnalysisTabAdded && isOreoPlus()) { + if (!config.wasStorageAnalysisTabAdded) { config.wasStorageAnalysisTabAdded = true if (config.showTabs and TAB_STORAGE_ANALYSIS == 0) { config.showTabs += TAB_STORAGE_ANALYSIS diff --git a/app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt index 82f6a33f..b13dfb1e 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt @@ -35,19 +35,81 @@ import net.lingala.zip4j.model.LocalFileHeader import net.lingala.zip4j.model.ZipParameters import net.lingala.zip4j.model.enums.EncryptionMethod import org.fossify.commons.adapters.MyRecyclerViewAdapter -import org.fossify.commons.dialogs.* -import org.fossify.commons.extensions.* -import org.fossify.commons.helpers.* +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.dialogs.PropertiesDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.dialogs.RenameDialog +import org.fossify.commons.dialogs.RenameItemDialog +import org.fossify.commons.dialogs.RenameItemsDialog +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.beVisible +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.convertToBitmap +import org.fossify.commons.extensions.copyToClipboard +import org.fossify.commons.extensions.createDirectorySync +import org.fossify.commons.extensions.deleteFile +import org.fossify.commons.extensions.deleteFileBg +import org.fossify.commons.extensions.deleteFolderBg +import org.fossify.commons.extensions.formatDate +import org.fossify.commons.extensions.formatSize +import org.fossify.commons.extensions.getAndroidSAFFileItems +import org.fossify.commons.extensions.getAndroidSAFUri +import org.fossify.commons.extensions.getColoredDrawableWithColor +import org.fossify.commons.extensions.getDefaultCopyDestinationPath +import org.fossify.commons.extensions.getDocumentFile +import org.fossify.commons.extensions.getDoesFilePathExist +import org.fossify.commons.extensions.getFileCount +import org.fossify.commons.extensions.getFileInputStreamSync +import org.fossify.commons.extensions.getFileOutputStreamSync +import org.fossify.commons.extensions.getFilenameFromPath +import org.fossify.commons.extensions.getIsPathDirectory +import org.fossify.commons.extensions.getMimeType +import org.fossify.commons.extensions.getParentPath +import org.fossify.commons.extensions.getProperSize +import org.fossify.commons.extensions.getTextSize +import org.fossify.commons.extensions.getTimeFormat +import org.fossify.commons.extensions.handleDeletePasswordProtection +import org.fossify.commons.extensions.hasOTGConnected +import org.fossify.commons.extensions.highlightTextPart +import org.fossify.commons.extensions.isPathOnOTG +import org.fossify.commons.extensions.isRestrictedSAFOnlyRoot +import org.fossify.commons.extensions.relativizeWith +import org.fossify.commons.extensions.setupViewBackground +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toFileDirItem +import org.fossify.commons.extensions.toast +import org.fossify.commons.helpers.CONFLICT_OVERWRITE +import org.fossify.commons.helpers.CONFLICT_SKIP +import org.fossify.commons.helpers.VIEW_TYPE_LIST +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.helpers.getFilePlaceholderDrawables import org.fossify.commons.models.FileDirItem import org.fossify.commons.models.RadioItem import org.fossify.commons.views.MyRecyclerView import org.fossify.filemanager.R import org.fossify.filemanager.activities.SimpleActivity import org.fossify.filemanager.activities.SplashActivity -import org.fossify.filemanager.databinding.* +import org.fossify.filemanager.databinding.ItemDirGridBinding +import org.fossify.filemanager.databinding.ItemEmptyBinding +import org.fossify.filemanager.databinding.ItemFileDirListBinding +import org.fossify.filemanager.databinding.ItemFileGridBinding +import org.fossify.filemanager.databinding.ItemSectionBinding import org.fossify.filemanager.dialogs.CompressAsDialog -import org.fossify.filemanager.extensions.* -import org.fossify.filemanager.helpers.* +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.extensions.isPathOnRoot +import org.fossify.filemanager.extensions.isZipFile +import org.fossify.filemanager.extensions.setAs +import org.fossify.filemanager.extensions.sharePaths +import org.fossify.filemanager.extensions.toggleItemVisibility +import org.fossify.filemanager.extensions.tryOpenPathIntent +import org.fossify.filemanager.helpers.OPEN_AS_AUDIO +import org.fossify.filemanager.helpers.OPEN_AS_IMAGE +import org.fossify.filemanager.helpers.OPEN_AS_OTHER +import org.fossify.filemanager.helpers.OPEN_AS_TEXT +import org.fossify.filemanager.helpers.OPEN_AS_VIDEO +import org.fossify.filemanager.helpers.RootHelpers import org.fossify.filemanager.interfaces.ItemOperationsListener import org.fossify.filemanager.models.ListItem import java.io.BufferedInputStream @@ -112,7 +174,7 @@ class ItemsAdapter( findItem(R.id.cab_open_with).isVisible = isOneFileSelected() findItem(R.id.cab_open_as).isVisible = isOneFileSelected() findItem(R.id.cab_set_as).isVisible = isOneFileSelected() - findItem(R.id.cab_create_shortcut).isVisible = isOreoPlus() && isOneItemSelected() + findItem(R.id.cab_create_shortcut).isVisible = isOneItemSelected() checkHideBtnVisibility(this) } diff --git a/app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt index 4040518d..29760beb 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt @@ -1,13 +1,11 @@ package org.fossify.filemanager.dialogs import org.fossify.commons.activities.BaseSimpleActivity -import org.fossify.commons.extensions.beGone import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff import org.fossify.commons.helpers.TAB_FILES import org.fossify.commons.helpers.TAB_RECENT_FILES import org.fossify.commons.helpers.TAB_STORAGE_ANALYSIS -import org.fossify.commons.helpers.isOreoPlus import org.fossify.commons.views.MyAppCompatCheckbox import org.fossify.filemanager.R import org.fossify.filemanager.databinding.DialogManageVisibleTabsBinding @@ -25,10 +23,6 @@ class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) { put(TAB_STORAGE_ANALYSIS, R.id.manage_visible_tabs_storage_analysis) } - if (!isOreoPlus()) { - binding.manageVisibleTabsStorageAnalysis.beGone() - } - val showTabs = activity.config.showTabs for ((key, value) in tabs) { binding.root.findViewById(value).isChecked = showTabs and key != 0 diff --git a/app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt index a8884e81..6d721421 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt @@ -2,15 +2,24 @@ package org.fossify.filemanager.extensions import android.app.Activity import android.content.Intent -import android.net.Uri import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.content.FileProvider import org.fossify.commons.activities.BaseSimpleActivity -import org.fossify.commons.extensions.* -import org.fossify.commons.helpers.isNougatPlus +import org.fossify.commons.extensions.getFilenameFromPath +import org.fossify.commons.extensions.getMimeTypeFromUri +import org.fossify.commons.extensions.getParentPath +import org.fossify.commons.extensions.launchActivityIntent +import org.fossify.commons.extensions.openPathIntent +import org.fossify.commons.extensions.renameFile +import org.fossify.commons.extensions.setAsIntent +import org.fossify.commons.extensions.sharePathsIntent import org.fossify.filemanager.BuildConfig -import org.fossify.filemanager.helpers.* +import org.fossify.filemanager.helpers.OPEN_AS_AUDIO +import org.fossify.filemanager.helpers.OPEN_AS_DEFAULT +import org.fossify.filemanager.helpers.OPEN_AS_IMAGE +import org.fossify.filemanager.helpers.OPEN_AS_TEXT +import org.fossify.filemanager.helpers.OPEN_AS_VIDEO import java.io.File fun Activity.sharePaths(paths: ArrayList) { @@ -19,11 +28,9 @@ fun Activity.sharePaths(paths: ArrayList) { fun Activity.tryOpenPathIntent(path: String, forceChooser: Boolean, openAsType: Int = OPEN_AS_DEFAULT, finishActivity: Boolean = false) { if (!forceChooser && path.endsWith(".apk", true)) { - val uri = if (isNougatPlus()) { - FileProvider.getUriForFile(this, "${BuildConfig.APPLICATION_ID}.provider", File(path)) - } else { - Uri.fromFile(File(path)) - } + val uri = FileProvider.getUriForFile( + this, "${BuildConfig.APPLICATION_ID}.provider", File(path) + ) Intent().apply { action = Intent.ACTION_VIEW diff --git a/app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt b/app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt index 1caee426..a61de593 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt @@ -4,7 +4,6 @@ import android.content.Context import android.os.storage.StorageManager import org.fossify.commons.extensions.isPathOnOTG import org.fossify.commons.extensions.isPathOnSD -import org.fossify.commons.helpers.isNougatPlus import org.fossify.filemanager.helpers.Config import org.fossify.filemanager.helpers.PRIMARY_VOLUME_NAME import java.util.Locale @@ -15,15 +14,13 @@ fun Context.isPathOnRoot(path: String) = !(path.startsWith(config.internalStorag fun Context.getAllVolumeNames(): List { val volumeNames = mutableListOf(PRIMARY_VOLUME_NAME) - if (isNougatPlus()) { - val storageManager = getSystemService(Context.STORAGE_SERVICE) as StorageManager - getExternalFilesDirs(null) - .mapNotNull { storageManager.getStorageVolume(it) } - .filterNot { it.isPrimary } - .mapNotNull { it.uuid?.lowercase(Locale.US) } - .forEach { - volumeNames.add(it) - } - } + val storageManager = getSystemService(Context.STORAGE_SERVICE) as StorageManager + getExternalFilesDirs(null) + .mapNotNull { storageManager.getStorageVolume(it) } + .filterNot { it.isPrimary } + .mapNotNull { it.uuid?.lowercase(Locale.US) } + .forEach { + volumeNames.add(it) + } return volumeNames } diff --git a/app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt b/app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt index aab6e7c0..f7b1b327 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt @@ -6,11 +6,16 @@ import android.provider.MediaStore.Files import android.provider.MediaStore.Files.FileColumns import android.util.AttributeSet import androidx.core.os.bundleOf -import org.fossify.commons.extensions.* +import org.fossify.commons.extensions.areSystemAnimationsEnabled +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.getDoesFilePathExist +import org.fossify.commons.extensions.getFilenameFromPath +import org.fossify.commons.extensions.getLongValue +import org.fossify.commons.extensions.getStringValue +import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.helpers.VIEW_TYPE_GRID import org.fossify.commons.helpers.VIEW_TYPE_LIST import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.commons.helpers.isOreoPlus import org.fossify.commons.models.FileDirItem import org.fossify.commons.views.MyGridLayoutManager import org.fossify.commons.views.MyRecyclerView @@ -156,17 +161,13 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage ) try { - if (isOreoPlus()) { - val queryArgs = bundleOf( - ContentResolver.QUERY_ARG_LIMIT to RECENTS_LIMIT, - ContentResolver.QUERY_ARG_SORT_COLUMNS to arrayOf(FileColumns.DATE_MODIFIED), - ContentResolver.QUERY_ARG_SORT_DIRECTION to ContentResolver.QUERY_SORT_DIRECTION_DESCENDING - ) - context?.contentResolver?.query(uri, projection, queryArgs, null) - } else { - val sortOrder = "${FileColumns.DATE_MODIFIED} DESC LIMIT $RECENTS_LIMIT" - context?.contentResolver?.query(uri, projection, null, null, sortOrder) - }?.use { cursor -> + val queryArgs = bundleOf( + ContentResolver.QUERY_ARG_LIMIT to RECENTS_LIMIT, + ContentResolver.QUERY_ARG_SORT_COLUMNS to arrayOf(FileColumns.DATE_MODIFIED), + ContentResolver.QUERY_ARG_SORT_DIRECTION to ContentResolver.QUERY_SORT_DIRECTION_DESCENDING + ) + + context?.contentResolver?.query(uri, projection, queryArgs, null)?.use { cursor -> if (cursor.moveToFirst()) { do { val path = cursor.getStringValue(FileColumns.DATA) diff --git a/app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt b/app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt index b0804aed..0c9a569f 100644 --- a/app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt @@ -16,8 +16,26 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.core.view.children import androidx.core.view.isVisible -import org.fossify.commons.extensions.* -import org.fossify.commons.helpers.* +import org.fossify.commons.extensions.adjustAlpha +import org.fossify.commons.extensions.applyColorFilter +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.beVisible +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.fadeIn +import org.fossify.commons.extensions.formatSize +import org.fossify.commons.extensions.getIsPathDirectory +import org.fossify.commons.extensions.getLongValue +import org.fossify.commons.extensions.getProperBackgroundColor +import org.fossify.commons.extensions.getProperPrimaryColor +import org.fossify.commons.extensions.getStringValue +import org.fossify.commons.extensions.queryCursor +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.updateTextColors +import org.fossify.commons.helpers.LOWER_ALPHA +import org.fossify.commons.helpers.SHORT_ANIMATION_DURATION +import org.fossify.commons.helpers.VIEW_TYPE_GRID +import org.fossify.commons.helpers.VIEW_TYPE_LIST +import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.models.FileDirItem import org.fossify.commons.views.MyGridLayoutManager import org.fossify.filemanager.R @@ -29,7 +47,19 @@ import org.fossify.filemanager.databinding.StorageFragmentBinding import org.fossify.filemanager.extensions.config import org.fossify.filemanager.extensions.formatSizeThousand import org.fossify.filemanager.extensions.getAllVolumeNames -import org.fossify.filemanager.helpers.* +import org.fossify.filemanager.helpers.ARCHIVES +import org.fossify.filemanager.helpers.AUDIO +import org.fossify.filemanager.helpers.DOCUMENTS +import org.fossify.filemanager.helpers.IMAGES +import org.fossify.filemanager.helpers.OTHERS +import org.fossify.filemanager.helpers.PRIMARY_VOLUME_NAME +import org.fossify.filemanager.helpers.SHOW_MIMETYPE +import org.fossify.filemanager.helpers.VIDEOS +import org.fossify.filemanager.helpers.VOLUME_NAME +import org.fossify.filemanager.helpers.archiveMimeTypes +import org.fossify.filemanager.helpers.extraAudioMimeTypes +import org.fossify.filemanager.helpers.extraDocumentMimeTypes +import org.fossify.filemanager.helpers.getListItemsFromFileDirItems import org.fossify.filemanager.interfaces.ItemOperationsListener import org.fossify.filemanager.models.ListItem import java.util.Locale @@ -173,10 +203,6 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage } private fun getSizes(volumeName: String) { - if (!isOreoPlus()) { - return - } - ensureBackgroundThread { val filesSize = getSizesByMimeType(volumeName) val fileSizeImages = filesSize[IMAGES]!! @@ -284,15 +310,10 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage if (storageVolume.isPrimary) { // internal storage volumeName = PRIMARY_VOLUME_NAME - if (isOreoPlus()) { - val storageStatsManager = context.getSystemService(AppCompatActivity.STORAGE_STATS_SERVICE) as StorageStatsManager - val uuid = StorageManager.UUID_DEFAULT - totalStorageSpace = storageStatsManager.getTotalBytes(uuid) - freeStorageSpace = storageStatsManager.getFreeBytes(uuid) - } else { - totalStorageSpace = file.totalSpace - freeStorageSpace = file.freeSpace - } + val storageStatsManager = context.getSystemService(AppCompatActivity.STORAGE_STATS_SERVICE) as StorageStatsManager + val uuid = StorageManager.UUID_DEFAULT + totalStorageSpace = storageStatsManager.getTotalBytes(uuid) + freeStorageSpace = storageStatsManager.getFreeBytes(uuid) } else { volumeName = storageVolume.uuid!!.lowercase(Locale.US) totalStorageSpace = file.totalSpace @@ -405,16 +426,12 @@ class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPage ) try { - if (isOreoPlus()) { - val queryArgs = bundleOf( - ContentResolver.QUERY_ARG_SORT_COLUMNS to arrayOf(MediaStore.Files.FileColumns.DATE_MODIFIED), - ContentResolver.QUERY_ARG_SORT_DIRECTION to ContentResolver.QUERY_SORT_DIRECTION_DESCENDING - ) - context?.contentResolver?.query(uri, projection, queryArgs, null) - } else { - val sortOrder = "${MediaStore.Files.FileColumns.DATE_MODIFIED} DESC" - context?.contentResolver?.query(uri, projection, null, null, sortOrder) - }?.use { cursor -> + val queryArgs = bundleOf( + ContentResolver.QUERY_ARG_SORT_COLUMNS to arrayOf(MediaStore.Files.FileColumns.DATE_MODIFIED), + ContentResolver.QUERY_ARG_SORT_DIRECTION to ContentResolver.QUERY_SORT_DIRECTION_DESCENDING + ) + + context?.contentResolver?.query(uri, projection, queryArgs, null)?.use { cursor -> if (cursor.moveToFirst()) { do { try { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 89587066..8463527e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ gradlePlugins-agp = "8.7.3" #build app-build-compileSDKVersion = "34" app-build-targetSDK = "34" -app-build-minimumSDK = "23" +app-build-minimumSDK = "26" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning