Update AGP and dependencies

app/build.gradle.kts

@@ -94,6 +94,13 @@ android {
         warningsAsErrors = true
         baseline = file("lint-baseline.xml")
     }
+
+    bundle {
+        language {
+            @Suppress("UnstableApiUsage")
+            enableSplit = false
+        }
+    }
 }
 
 detekt {

app/src/main/kotlin/org/fossify/filemanager/App.kt

@@ -1,13 +1,13 @@
 package org.fossify.filemanager
 
-import android.app.Application
 import com.github.ajalt.reprint.core.Reprint
-import org.fossify.commons.extensions.checkUseEnglish
+import org.fossify.commons.FossifyApp
+
+class App : FossifyApp() {
+    override val isAppLockFeatureAvailable = true
 
-class App : Application() {
     override fun onCreate() {
         super.onCreate()
-        checkUseEnglish()
         Reprint.initialize(this)
     }
 }

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(

app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt

@@ -18,8 +18,48 @@ import com.stericson.RootTools.RootTools
 import me.grantland.widget.AutofitHelper
 import org.fossify.commons.dialogs.ConfirmationAdvancedDialog
 import org.fossify.commons.dialogs.RadioGroupDialog
-import org.fossify.commons.extensions.*
-import org.fossify.commons.helpers.*
+import org.fossify.commons.extensions.appLaunched
+import org.fossify.commons.extensions.appLockManager
+import org.fossify.commons.extensions.beGoneIf
+import org.fossify.commons.extensions.checkWhatsNew
+import org.fossify.commons.extensions.getBottomNavigationBackgroundColor
+import org.fossify.commons.extensions.getColoredDrawableWithColor
+import org.fossify.commons.extensions.getFilePublicUri
+import org.fossify.commons.extensions.getMimeType
+import org.fossify.commons.extensions.getProperBackgroundColor
+import org.fossify.commons.extensions.getProperTextColor
+import org.fossify.commons.extensions.getRealPathFromURI
+import org.fossify.commons.extensions.getStorageDirectories
+import org.fossify.commons.extensions.getTimeFormat
+import org.fossify.commons.extensions.handleHiddenFolderPasswordProtection
+import org.fossify.commons.extensions.hasOTGConnected
+import org.fossify.commons.extensions.hasPermission
+import org.fossify.commons.extensions.hideKeyboard
+import org.fossify.commons.extensions.humanizePath
+import org.fossify.commons.extensions.internalStoragePath
+import org.fossify.commons.extensions.isPathOnOTG
+import org.fossify.commons.extensions.isPathOnSD
+import org.fossify.commons.extensions.launchMoreAppsFromUsIntent
+import org.fossify.commons.extensions.onGlobalLayout
+import org.fossify.commons.extensions.onTabSelectionChanged
+import org.fossify.commons.extensions.sdCardPath
+import org.fossify.commons.extensions.showErrorToast
+import org.fossify.commons.extensions.toast
+import org.fossify.commons.extensions.updateBottomTabItemColors
+import org.fossify.commons.extensions.viewBinding
+import org.fossify.commons.helpers.LICENSE_AUTOFITTEXTVIEW
+import org.fossify.commons.helpers.LICENSE_GESTURE_VIEWS
+import org.fossify.commons.helpers.LICENSE_GLIDE
+import org.fossify.commons.helpers.LICENSE_PATTERN
+import org.fossify.commons.helpers.LICENSE_REPRINT
+import org.fossify.commons.helpers.LICENSE_ZIP4J
+import org.fossify.commons.helpers.PERMISSION_WRITE_STORAGE
+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.VIEW_TYPE_GRID
+import org.fossify.commons.helpers.ensureBackgroundThread
+import org.fossify.commons.helpers.isRPlus
 import org.fossify.commons.models.FAQItem
 import org.fossify.commons.models.RadioItem
 import org.fossify.commons.models.Release
@@ -51,8 +91,6 @@ class MainActivity : SimpleActivity() {
     private val binding by viewBinding(ActivityMainBinding::inflate)
 
     private var wasBackJustPressed = false
-    private var mIsPasswordProtectionPending = false
-    private var mWasProtectionHandled = false
     private var mTabsToShow = ArrayList<Int>()
 
     private var mStoredFontSize = 0
@@ -69,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
@@ -81,22 +119,12 @@ class MainActivity : SimpleActivity() {
 
         updateMaterialActivityViews(binding.mainCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = true)
 
-        mIsPasswordProtectionPending = config.isAppPasswordProtectionOn
-
         if (savedInstanceState == null) {
-            handleAppPasswordProtection {
-                mWasProtectionHandled = it
-                if (it) {
-                    initFragments()
-                    mIsPasswordProtectionPending = false
-                    tryInitFileManager()
-                    checkWhatsNewDialog()
-                    checkIfRootAvailable()
-                    checkInvalidFavorites()
-                } else {
-                    finish()
-                }
-            }
+            initFragments()
+            tryInitFileManager()
+            checkWhatsNewDialog()
+            checkIfRootAvailable()
+            checkInvalidFavorites()
         }
     }
 
@@ -128,7 +156,7 @@ class MainActivity : SimpleActivity() {
             }
         }
 
-        if (binding.mainViewPager.adapter == null && mWasProtectionHandled) {
+        if (binding.mainViewPager.adapter == null) {
             initFragments()
         }
     }
@@ -158,6 +186,7 @@ class MainActivity : SimpleActivity() {
                     wasBackJustPressed = false
                 }, BACK_PRESS_TIMEOUT.toLong())
             } else {
+                appLockManager.lock()
                 finish()
             }
         } else {
@@ -241,20 +270,18 @@ class MainActivity : SimpleActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putString(PICKED_PATH, getItemsFragment()?.currentPath ?: "")
-        outState.putBoolean(WAS_PROTECTION_HANDLED, mWasProtectionHandled)
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
-        mWasProtectionHandled = savedInstanceState.getBoolean(WAS_PROTECTION_HANDLED, false)
         val path = savedInstanceState.getString(PICKED_PATH) ?: internalStoragePath
 
         if (binding.mainViewPager.adapter == null) {
             binding.mainViewPager.onGlobalLayout {
-                restorePath(path)
+                openPath(path, true)
             }
         } else {
-            restorePath(path)
+            openPath(path, true)
         }
     }
 
@@ -267,22 +294,6 @@ class MainActivity : SimpleActivity() {
         }
     }
 
-    private fun restorePath(path: String) {
-        if (!mWasProtectionHandled) {
-            handleAppPasswordProtection {
-                mWasProtectionHandled = it
-                if (it) {
-                    mIsPasswordProtectionPending = false
-                    openPath(path, true)
-                } else {
-                    finish()
-                }
-            }
-        } else {
-            openPath(path, true)
-        }
-    }
-
     private fun updateMenuColors() {
         updateStatusbarColor(getProperBackgroundColor())
         binding.mainMenu.updateColors()
@@ -494,10 +505,6 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun openPath(path: String, forceRefresh: Boolean = false) {
-        if (mIsPasswordProtectionPending && !mWasProtectionHandled) {
-            return
-        }
-
         var newPath = path
         val file = File(path)
         if (config.OTGPath.isNotEmpty() && config.OTGPath == path.trimEnd('/')) {

app/src/main/kotlin/org/fossify/filemanager/activities/SimpleActivity.kt

@@ -33,6 +33,8 @@ open class SimpleActivity : BaseSimpleActivity() {
 
     override fun getAppLauncherName() = getString(R.string.app_launcher_name)
 
+    override fun getRepositoryName() = "File-Manager"
+
     @SuppressLint("NewApi")
     fun hasStoragePermission(): Boolean {
         return if (isRPlus()) {

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)
         }

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<MyAppCompatCheckbox>(value).isChecked = showTabs and key != 0