diff --git a/android/.gitignore b/android/.gitignore
index 3550d76f..2cb5e96e 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -4,3 +4,4 @@ build/
 local.properties
 *.iml
 .cxx/
+.kotlin/
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index af79e2d6..5a4dba39 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
     <application
         android:name=".CloudreveApp"
         android:allowBackup="true"
+        android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
diff --git a/android/app/src/main/java/org/cloudreve/android/api/Dto.kt b/android/app/src/main/java/org/cloudreve/android/api/Dto.kt
index 07b64642..78813968 100644
--- a/android/app/src/main/java/org/cloudreve/android/api/Dto.kt
+++ b/android/app/src/main/java/org/cloudreve/android/api/Dto.kt
@@ -149,6 +149,7 @@ data class UploadSessionResponse(
     val uri: String = "",
     @SerialName("storage_policy") val storagePolicy: StoragePolicy? = null,
     @SerialName("callback_secret") val callbackSecret: String = "",
+    @SerialName("rapid_uploaded") val rapidUploaded: Boolean = false,
 )
 
 @Serializable
diff --git a/android/app/src/main/java/org/cloudreve/android/data/FileRepository.kt b/android/app/src/main/java/org/cloudreve/android/data/FileRepository.kt
index 52831217..c6b6e044 100644
--- a/android/app/src/main/java/org/cloudreve/android/data/FileRepository.kt
+++ b/android/app/src/main/java/org/cloudreve/android/data/FileRepository.kt
@@ -109,22 +109,28 @@ class FileRepository(private val api: ApiClient) {
             mimeType = mime,
         )
 
-        val urls = session.uploadUrls
-        if (urls.isNullOrEmpty()) {
-            // Zero-chunk policies (e.g. rapid-upload hit) need nothing further.
-            return session
-        }
+        if (session.rapidUploaded) return session
 
-        val svc = api.service()
+        val urls = session.uploadUrls
+        // Local/slave policies return no presigned URLs: chunks go to the
+        // conventional POST /api/v4/file/upload/{session}/{index} endpoint and
+        // the server completes the session once every chunk has landed.
+        val conventional = urls.isNullOrEmpty()
         val chunkSize = if (session.chunkSize > 0) session.chunkSize else localFile.length().coerceAtLeast(1)
+        val totalChunks = ((localFile.length() + chunkSize - 1) / chunkSize).toInt().coerceAtLeast(1)
+        val svc = api.service()
         var sent = 0L
         localFile.inputStream().buffered().use { input ->
             val buffer = ByteArray(chunkSize.coerceAtMost(64L * 1024 * 1024).toInt())
-            var index = 0
-            while (true) {
+            for (index in 0 until totalChunks) {
                 val read = input.readNBytes(buffer, 0, buffer.size)
-                if (read <= 0 || index >= urls.size) break
-                val target = resolveUrl(urls[index])
+                if (index == 0 && read == 0 && localFile.length() > 0) break
+                val target = if (conventional) {
+                    session_serverBase() + "/api/v4/file/upload/${session.sessionId}/$index"
+                } else {
+                    if (index >= urls!!.size) break
+                    resolveUrl(urls[index])
+                }
                 val body = buffer.copyOf(read)
                     .toRequestBody(mime.toMediaTypeOrNull())
                 val resp = if (target.contains("/file/upload/")) {
@@ -138,8 +144,8 @@ class FileRepository(private val api: ApiClient) {
                 }
                 resp.body()?.close()
                 sent += read
-                index++
                 onProgress(sent, localFile.length())
+                if (read <= 0) break
             }
         }
 
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index d02506b4..00000000
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <!-- stylized cloud -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M79,62c-1.1,0 -2.2,0.1 -3.3,0.3C72,52 62.4,44 51,44c-10,0 -18.5,6.4 -21.7,15.4C22.9,60.6 19,64.7 19,69.7 19,76.6 25.2,82 32.5,82L79,82c6.6,0 12,-4.9 12,-11S85.6,62 79,62z" />
-</vector>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index a8a8fa55..be438580 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..be438580
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..8a30de1c
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..7ff5c93f
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..8a30de1c
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..33cb9ec3
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..a267f5c3
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..33cb9ec3
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..718af284
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..6851619c
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..718af284
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b664528b
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..35b34bd4
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..b664528b
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..81b80356
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..4703ab90
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..81b80356
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index d0f957c0..f42ada65 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#4A6FA5</color>
+    <color name="ic_launcher_background">#FFFFFF</color>
 </resources>
diff --git a/android/metadata/assets/feature-graphic.png b/android/metadata/assets/feature-graphic.png
new file mode 100644
index 00000000..f2c7fd76
Binary files /dev/null and b/android/metadata/assets/feature-graphic.png differ
diff --git a/android/metadata/assets/icon-512.png b/android/metadata/assets/icon-512.png
new file mode 100644
index 00000000..19fc3b98
Binary files /dev/null and b/android/metadata/assets/icon-512.png differ