Merge pull request #745 from esensar/feature/678-sdcard-storage-analysis

Add SD card to storage analysis

Author: tibbi

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt

@@ -40,6 +40,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
     private var zoomListener: MyRecyclerView.MyZoomListener? = null
     private var storedItems = ArrayList<ListItem>()
     private var currentViewType = VIEW_TYPE_LIST
+    private var currentVolume = PRIMARY_VOLUME_NAME
 
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
@@ -53,6 +54,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
         }
 
         currentMimeType = intent.getStringExtra(SHOW_MIMETYPE) ?: return
+        currentVolume = intent.getStringExtra(VOLUME_NAME) ?: currentVolume
         binding.mimetypesToolbar.title = getString(
             when (currentMimeType) {
                 IMAGES -> R.string.images
@@ -267,7 +269,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
     private fun getProperFileDirItems(callback: (ArrayList<FileDirItem>) -> Unit) {
         val fileDirItems = ArrayList<FileDirItem>()
         val showHidden = config.shouldShowHidden()
-        val uri = MediaStore.Files.getContentUri("external")
+        val uri = MediaStore.Files.getContentUri(currentVolume)
         val projection = arrayOf(
             MediaStore.Files.FileColumns.MIME_TYPE,
             MediaStore.Files.FileColumns.DATA,

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt

@@ -1,10 +1,29 @@
 package com.simplemobiletools.filemanager.pro.extensions
 
 import android.content.Context
+import android.os.storage.StorageManager
 import com.simplemobiletools.commons.extensions.isPathOnOTG
 import com.simplemobiletools.commons.extensions.isPathOnSD
+import com.simplemobiletools.commons.helpers.isNougatPlus
 import com.simplemobiletools.filemanager.pro.helpers.Config
+import com.simplemobiletools.filemanager.pro.helpers.PRIMARY_VOLUME_NAME
+import java.util.Locale
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
 
 fun Context.isPathOnRoot(path: String) = !(path.startsWith(config.internalStoragePath) || isPathOnOTG(path) || (isPathOnSD(path)))
+
+fun Context.getAllVolumeNames(): List<String> {
+    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)
+            }
+    }
+    return volumeNames
+}

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt

@@ -41,6 +41,9 @@ const val ARCHIVES = "archives"
 const val OTHERS = "others"
 const val SHOW_MIMETYPE = "show_mimetype"
 
+const val VOLUME_NAME = "volume_name"
+const val PRIMARY_VOLUME_NAME = "external_primary"
+
 // what else should we count as an audio except "audio/*" mimetype
 val extraAudioMimeTypes = arrayListOf("application/ogg")
 val extraDocumentMimeTypes = arrayListOf(

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+</vector>

app/src/main/res/drawable/ic_arrow_down_vector.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>