Update - Android

android/build.gradle

@@ -2,14 +2,14 @@ group 'de.appgewaltig.disk_space'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

android/src/main/kotlin/de/appgewaltig/disk_space/DiskSpacePlugin.kt

@@ -1,5 +1,6 @@
 package de.appgewaltig.disk_space
 
+import android.content.Context
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodChannel
@@ -9,21 +10,15 @@ class DiskSpacePlugin: FlutterPlugin {
 
   companion object {
     private var channel: MethodChannel? = null
-    private var handler: MethodHandlerImpl = MethodHandlerImpl()
 
-    @JvmStatic
-    fun registerWith(registrar: PluginRegistry.Registrar) {
-      registerChannel(registrar.messenger())
-    }
-
-    private fun registerChannel(messenger: BinaryMessenger) {
+    private fun registerChannel(messenger: BinaryMessenger, context: Context) {
       channel = MethodChannel(messenger, "disk_space")
-      channel!!.setMethodCallHandler(handler)
+      channel!!.setMethodCallHandler(MethodHandlerImpl(context))
     }
   }
 
   override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    registerChannel(binding.binaryMessenger)
+    registerChannel(binding.binaryMessenger, binding.getApplicationContext())
   }
 
   override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {

android/src/main/kotlin/de/appgewaltig/disk_space/MethodHandlerImpl.kt

@@ -1,11 +1,12 @@
 package de.appgewaltig.disk_space
 
+import android.content.Context
 import android.os.Environment
 import android.os.StatFs
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 
-class MethodHandlerImpl : MethodChannel.MethodCallHandler {
+class MethodHandlerImpl(private val context: Context) : MethodChannel.MethodCallHandler {
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         when(call.method) {
             "getFreeDiskSpace" -> result.success(getFreeDiskSpace())
@@ -16,10 +17,9 @@ class MethodHandlerImpl : MethodChannel.MethodCallHandler {
     }
 
     private fun getFreeDiskSpace(): Double {
-        val stat = StatFs(Environment.getExternalStorageDirectory().path)
+        val stat = StatFs(getFilesPath())
 
-        val bytesAvailable: Long
-        bytesAvailable = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
+        val bytesAvailable: Long = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
             stat.blockSizeLong * stat.availableBlocksLong
         else
             stat.blockSize.toLong() * stat.availableBlocks.toLong()
@@ -28,23 +28,33 @@ class MethodHandlerImpl : MethodChannel.MethodCallHandler {
 
     private fun getFreeDiskSpaceForPath(path: String): Double {
         val stat = StatFs(path)
-
-        val bytesAvailable: Long
-        bytesAvailable = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
+
+        val bytesAvailable: Long = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
             stat.blockSizeLong * stat.availableBlocksLong
         else
             stat.blockSize.toLong() * stat.availableBlocks.toLong()
         return (bytesAvailable / (1024f * 1024f)).toDouble()
     }
 
     private fun getTotalDiskSpace(): Double {
-        val stat = StatFs(Environment.getExternalStorageDirectory().path)
+        val stat = StatFs(getFilesPath())
 
-        val bytesAvailable: Long
-        bytesAvailable = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
+        val bytesAvailable: Long = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
             stat.blockSizeLong * stat.blockCountLong
         else
             stat.blockSize.toLong() * stat.blockCount.toLong()
         return (bytesAvailable / (1024f * 1024f)).toDouble()
     }
+
+    private fun getFilesPath(): String {
+        val state = Environment.getExternalStorageState()
+
+        return if (Environment.MEDIA_MOUNTED == state) {
+            // We can read and write the media
+            context.getExternalFilesDir(null)?.path.toString()
+        } else {
+            // Load another directory, probably local memory
+            context.filesDir?.path.toString()
+        }
+    }
 }

disk_space.iml

@@ -9,10 +9,12 @@
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/example/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"disk_space","path":"/Users/marvinknabe/Entwicklung/flutter/disk_space/","dependencies":[]}],"android":[{"name":"disk_space","path":"/Users/marvinknabe/Entwicklung/flutter/disk_space/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"disk_space","dependencies":[]}],"date_created":"2021-05-27 18:22:29.500956","version":"2.2.0"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"disk_space","path":"C:\\\\Users\\\\ahmed\\\\AndroidStudioProjects\\\\disk_space\\\\","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"C:\\\\Users\\\\ahmed\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.3.1\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"disk_space","path":"C:\\\\Users\\\\ahmed\\\\AndroidStudioProjects\\\\disk_space\\\\","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"C:\\\\Users\\\\ahmed\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_android-2.2.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\ahmed\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_foundation-2.3.1\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\ahmed\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\ahmed\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"disk_space","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-09-21 14:31:22.573296","version":"3.10.6"}

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

example/android/app/src/main/AndroidManifest.xml

@@ -35,13 +35,6 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
         </activity>
-        <activity
-            android:name=".EmbeddingV1Activity"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
         <meta-data
     android:name="flutterEmbedding"
     android:value="2" />

example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

example/lib/main.dart

@@ -25,7 +25,7 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<void> initDiskSpace() async {
-    double diskSpace = 0;
+    double? diskSpace = 0;
 
     diskSpace = await DiskSpace.getFreeDiskSpace;
 
@@ -41,18 +41,18 @@ class _MyAppState extends State<MyApp> {
         (list) async => list ?? [await getApplicationDocumentsDirectory()],
       );
     } else {
-      return [];
+      return;
     }
 
     for (var directory in directories) {
       var space = await DiskSpace.getFreeDiskSpaceForPath(directory.path);
-      directorySpace.addEntries([MapEntry(directory, space)]);
+      directorySpace.addEntries([MapEntry(directory, space ?? 0)]);
     }
 
     if (!mounted) return;
 
     setState(() {
-      _diskSpace = diskSpace;
+      _diskSpace = diskSpace ?? 0;
       _directorySpace = directorySpace;
     });
   }